From eb08d32eccfa52afc8effa462cac8e1683c6a5fe Mon Sep 17 00:00:00 2001
From: laramies <laramies@gmail.com>
Date: Tue, 11 Oct 2016 09:57:24 +0100
Subject: [PATCH] Added missing search engines.

Added missing search engines, fixed search engine handling.
---
 README          |  2 ++
 theHarvester.py | 41 ++++++++---------------------------------
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/README b/README
index bffc3c97..e0bf1d48 100644
--- a/README
+++ b/README
@@ -36,6 +36,8 @@ Passive:
 -bingapi: microsoft search engine, through the API (you need to add your Key in
           the discovery/bingsearch.py file)
 
+-dogpile: Dogpile search engine - www.dogpile.com
+
 -pgp: pgp key server - mit.edu
 
 -linkedin: google search engine, specific search for Linkedin users
diff --git a/theHarvester.py b/theHarvester.py
index feda1045..235c6346 100644
--- a/theHarvester.py
+++ b/theHarvester.py
@@ -41,8 +41,9 @@ def usage():
 
     print "Usage: theharvester options \n"
     print "       -d: Domain to search or company name"
-    print """       -b: data source: google, googleCSE, bing, bingapi, pgp, linkedin,
-                        google-profiles, jigsaw, twitter, googleplus, all\n"""
+    print """       -b: data source: baidu, bing, bingapi, dogpile,google, googleCSE,
+                        googleplus, google-profiles, linkedin, pgp, twitter, vhost, 
+                        yahoo, all\n"""
     print "       -s: Start in result number X (default: 0)"
     print "       -v: Verify host name via dns resolution and search for virtual hosts"
     print "       -f: Save the results into an HTML and XML file (both)"
@@ -104,10 +105,9 @@ def start(argv):
             dnstld = True
         elif opt == '-b':
             engine = arg
-            if engine not in ("google","googleCSE" , "linkedin", "pgp", "all", "google-profiles", "bing", "bingapi",
-                              "yandex", "jigsaw", "dogpilesearch", "twitter", "googleplus", "yahoo", "baidu"):
+            if engine not in ("baidu", "bing", "bingapi","dogpile", "google", "googleCSE", "googleplus", "google-profiles","linkedin", "pgp", "twitter", "vhost", "yahoo", "all"):
                 usage()
-                print "Invalid search engine, try with: bing, google, linkedin, pgp, jigsaw, bingapi, google-profiles, dogpilesearch, twitter, googleplus, yahoo, baidu"
+                print "Invalid search engine, try with: baidu, bing, bingapi, dogpile, google, googleCSE, googleplus, google-profiles, linkedin, pgp, twitter, vhost, yahoo, all"
                 sys.exit()
             else:
                 pass
@@ -126,13 +126,6 @@ def start(argv):
         all_emails = search.get_emails()
         all_hosts = search.get_hostnames()
 
-    if engine == "exalead":
-        print "[-] Searching in Exalead:"
-        search = exaleadsearch.search_exalead(word, limit, start)
-        search.process()
-        all_emails = search.get_emails()
-        all_hosts = search.get_hostnames()
-
     elif engine == "bing" or engine == "bingapi":
         print "[-] Searching in Bing:"
         search = bingsearch.search_bing(word, limit, start)
@@ -144,9 +137,9 @@ def start(argv):
         all_emails = search.get_emails()
         all_hosts = search.get_hostnames()
 
-    elif engine == "yandex":  # Not working yet
-        print "[-] Searching in Yandex:"
-        search = yandexsearch.search_yandex(word, limit, start)
+    elif engine == "dogpile":
+        print "[-] Searching in Dogpilesearch.."
+        search = dogpilesearch.search_dogpile(word, limit)
         search.process()
         all_emails = search.get_emails()
         all_hosts = search.get_hostnames()
@@ -158,24 +151,6 @@ def start(argv):
         all_emails = search.get_emails()
         all_hosts = search.get_hostnames()
 
-    elif engine == "jigsaw":
-        print "[-] Searching in Jigsaw.."
-        search = jigsaw.search_jigsaw(word, limit)
-        search.process()
-        people = search.get_people()
-        print "Users from Jigsaw:"
-        print "====================="
-        for user in people:
-            print user
-        sys.exit()
-
-    elif engine == "dogpilesearch":
-        print "[-] Searching in Dogpilesearch.."
-        search = dogpilesearch.search_dogpile(word, limit)
-        search.process()
-        all_emails = search.get_emails()
-        all_hosts = search.get_hostnames()
-
     elif engine == "yahoo":
         print "[-] Searching in Yahoo.."
         search = yahoosearch.search_yahoo(word, limit)