Merge remote-tracking branch 'upstream/master' into dev

changelog.txt

@@ -1,60 +0,0 @@
-
-Changelog in 3.0:
------------------
-Subdomain takeover checks.
-Port scanning (basic).
-Improved DNS dictionary.
-Shodan DB search fixed.
-Result storage in Sqlite.
-
-Changelog in 2.6:
------------------
-- usage() improvement, CameronNemo.
-- Added Yahoo and Baidu search engines. Thanks to Tatanus.
-- Added check for the existence of Requests library.
-- Fixed email regex to provide cleaner results. Thanks to Peter McAlpine.
-
-Changelog in 2.5:
------------------
-???
-
-Changelog in 2.4:
------------------
-- Fixed Linkedin parser.
-- Fixed 123people.
-- Added Dogpile search engine (Marcus).
-- PEP8 code compliant (Mario).
-- Fixed XML export (Marcus).
-- Expanded TLD list from http://data.iana.org/TLD/tlds-alpha-by-domain.txt (Marcus).
-- Fixed DNS brute force (Tomas).
-- Added Google Custom Search Support. Requires API.
-
-Changelog in 2.3:
------------------
-- Fixed duplicates.
-
-Changelog in 2.2:
------------------
-- Added Jigsaw (www.jigsaw.com).
-- Added 123People (www.123people.com).
-- Added limit to Google searches as the maximum results we can obtain is 1000.
-- Removed SET, service was discontinued by Google.
-- Fixed parser to remove wrong results like emails starting with @.
-
-Changelog in 2.1:
------------------
-- DNS brute forcer.
-- DNS reverse lookups.
-- DNS TDL expansion.
-- Shodan DB integration.
-- HTML report.
-- Specify DNS server.
-
-Changelog in 2.0:
------------------
-- Complete rewrite. More modular and easy to maintain.
-- New sources (Exalead, Google-Profiles, Bing-API).
-- Time delay between request to prevent search engines from blocking a user's IP.
-- You can start the search from the results page that you want, hence you can *resume* a search.
-- Export to XML.
-- All search engines harvesting.

theHarvester/discovery/__init__.py

@@ -20,6 +20,5 @@ __all__ = ['baidusearch',
            'trello',
            'twittersearch',
            'virustotal',
-           'wfuzz_search',
            'yahoosearch',
            'yandexsearch']

theHarvester/discovery/wfuzz_search.py

@@ -1,32 +0,0 @@
-try:
-    import wfuzz
-except ImportError:
-    pass
-
-
-class SearchWfuzz:
-
-    def __init__(self, host):
-        self.host = host
-        self.results = ""
-        self.totalresults = ""
-
-    def do_search(self):
-        print('elo')
-        try:
-            for r in wfuzz.fuzz(url=f'https://{self.host}/FUZZ', hc=[404], payloads=[('file', dict(fn='wordlists/general/common.txt'))]):
-                print(r)
-                self.results += r
-        except Exception as e:
-            print(e)
-        self.totalresults += self.results
-
-    def get_results(self):
-        return self.totalresults
-
-    def do_check(self):
-        return
-
-    def process(self):
-        self.do_search()
-        print('\tSearching Wfuzz')