Merge pull request #229 from blshkv/patch-2

Update setup.py
laramies · Apr 8, 2019 · 9f7811d · 9f7811d
2 parents 0788b61 + 31c4815
commit 9f7811d
Show file tree

Hide file tree

Showing 63 changed files with 1,068 additions and 1,053 deletions.
diff --git a/setup.py b/setup.py
@@ -13,19 +13,25 @@
     long_description_content_type="text/markdown",
     url="https://github.com/laramies/theHarvester",
     packages=setuptools.find_packages(),
+    entry_points={
+        'console_scripts': [
+            'theHarvester = theHarvester.__main__:entry_point'
+        ]
+    },
+
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "Operating System :: OS Independent",
     ],
     data_files=[
-        ('wordlists', [
+        ('share/dict/theHarvester', [
             'wordlists/general/common.txt',
             'wordlists/dns-big.txt',
             'wordlists/dns-names.txt',
             'wordlists/dorks.txt',
             'wordlists/names_small.txt'
         ]
          )
-    ]
+    ],
 )
diff --git a/tests/test_myparser.py b/tests/test_myparser.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # coding=utf-8
 
-from parsers import myparser
+from theHarvester.parsers import myparser
 import pytest
 
 

diff --git a/theHarvester.py b/theHarvester.py
diff --git a/parsers/__init__.py → theHarvester/__init__.py b/parsers/__init__.py → theHarvester/__init__.py
diff --git a/theHarvester/__main__.py b/theHarvester/__main__.py
diff --git a/discovery/DNS/Base.py → theHarvester/discovery/DNS/Base.py b/discovery/DNS/Base.py → theHarvester/discovery/DNS/Base.py
@@ -12,7 +12,7 @@
 import socket
 import time
 
-from discovery.DNS import Type, Class, Opcode
+from theHarvester.discovery.DNS import Type, Class, Opcode
 import asyncore
 
 class DNSError(Exception):
@@ -107,7 +107,7 @@ def processUDPReply(self):
 
     def processTCPReply(self):
         import time
-        from discovery.DNS import Lib
+        from theHarvester.discovery.DNS import Lib
         self.f = self.s.makefile('r')
         header = self.f.read(2)
         if len(header) < 2:
@@ -121,7 +121,7 @@ def processTCPReply(self):
         return self.processReply()
 
     def processReply(self):
-        from discovery.DNS import Lib
+        from theHarvester.discovery.DNS import Lib
         self.args['elapsed'] = (self.time_finish - self.time_start) * 1000
         u = Lib.Munpacker(self.reply)
         r = Lib.DnsResult(u, self.args)
@@ -154,7 +154,7 @@ def conn(self):
     def req(self, *name, **args):
         " needs a refactoring "
         import time
-        from discovery.DNS import Lib
+        from theHarvester.discovery.DNS import Lib
         self.argparse(name, args)
         # if not self.args:
         #    raise DNSError,'reinitialize request before reuse'
@@ -222,7 +222,7 @@ def sendUDPRequest(self, server):
     def sendTCPRequest(self, server):
         " do the work of sending a TCP request "
         import time
-        import discovery.DNS.Lib as Lib
+        import theHarvester.discovery.DNS.Lib as Lib
         self.response = None
         for self.ns in server:
             try:

diff --git a/discovery/DNS/Class.py → theHarvester/discovery/DNS/Class.py b/discovery/DNS/Class.py → theHarvester/discovery/DNS/Class.py
diff --git a/discovery/DNS/Lib.py → theHarvester/discovery/DNS/Lib.py b/discovery/DNS/Lib.py → theHarvester/discovery/DNS/Lib.py
@@ -22,8 +22,8 @@
 #             DOMAIN NAMES - IMPLEMENTATION AND SPECIFICATION
 # ------------------------------------------------------------------------
 
-from discovery.DNS import Type, Class, Opcode, Status
-from discovery.DNS.Base import DNSError
+from theHarvester.discovery.DNS import Type, Class, Opcode, Status
+from theHarvester.discovery.DNS.Base import DNSError
 
 class UnpackError(DNSError):
     pass

diff --git a/discovery/DNS/Opcode.py → theHarvester/discovery/DNS/Opcode.py b/discovery/DNS/Opcode.py → theHarvester/discovery/DNS/Opcode.py
diff --git a/discovery/DNS/Status.py → theHarvester/discovery/DNS/Status.py b/discovery/DNS/Status.py → theHarvester/discovery/DNS/Status.py
diff --git a/discovery/DNS/Type.py → theHarvester/discovery/DNS/Type.py b/discovery/DNS/Type.py → theHarvester/discovery/DNS/Type.py
diff --git a/discovery/DNS/__init__.py → theHarvester/discovery/DNS/__init__.py b/discovery/DNS/__init__.py → theHarvester/discovery/DNS/__init__.py
@@ -11,16 +11,16 @@
 
 __version__ = '2.3.1'
 
-from discovery.DNS import Type
-from discovery.DNS import Opcode
-from discovery.DNS import Status
-from discovery.DNS import Class
-from discovery.DNS.Base import DnsRequest, DNSError
-from discovery.DNS.Lib import DnsResult
-from discovery.DNS.Base import *
-from discovery.DNS.Lib import *
+from theHarvester.discovery.DNS import Type
+from theHarvester.discovery.DNS import Opcode
+from theHarvester.discovery.DNS import Status
+from theHarvester.discovery.DNS import Class
+from theHarvester.discovery.DNS.Base import DnsRequest, DNSError
+from theHarvester.discovery.DNS.Lib import DnsResult
+from theHarvester.discovery.DNS.Base import *
+from theHarvester.discovery.DNS.Lib import *
 Error = DNSError
-from discovery.DNS.lazy import *
+from theHarvester.discovery.DNS.lazy import *
 Request = DnsRequest
 Result = DnsResult
 

diff --git a/discovery/DNS/lazy.py → theHarvester/discovery/DNS/lazy.py b/discovery/DNS/lazy.py → theHarvester/discovery/DNS/lazy.py
@@ -7,7 +7,7 @@
 #
 
 # routines for lazy people.
-from discovery.DNS import Base
+from theHarvester.discovery.DNS import Base
 
 def revlookup(name):
     "convenience routine for doing a reverse lookup of an address"

diff --git a/discovery/DNS/win32dns.py → theHarvester/discovery/DNS/win32dns.py b/discovery/DNS/win32dns.py → theHarvester/discovery/DNS/win32dns.py
diff --git a/discovery/IPy.py → theHarvester/discovery/IPy.py b/discovery/IPy.py → theHarvester/discovery/IPy.py
diff --git a/discovery/__init__.py → theHarvester/discovery/__init__.py b/discovery/__init__.py → theHarvester/discovery/__init__.py
diff --git a/discovery/baidusearch.py → theHarvester/discovery/baidusearch.py b/discovery/baidusearch.py → theHarvester/discovery/baidusearch.py
@@ -1,6 +1,6 @@
-from discovery.constants import *
-from lib.core import *
-from parsers import myparser
+from theHarvester.discovery.constants import *
+from theHarvester.lib.core import *
+from theHarvester.parsers import myparser
 import requests
 import time
 

diff --git a/discovery/bingsearch.py → theHarvester/discovery/bingsearch.py b/discovery/bingsearch.py → theHarvester/discovery/bingsearch.py
@@ -1,6 +1,6 @@
-from discovery.constants import *
-from lib.core import *
-from parsers import myparser
+from theHarvester.discovery.constants import *
+from theHarvester.lib.core import *
+from theHarvester.parsers import myparser
 import requests
 import time
 

diff --git a/discovery/censys.py → theHarvester/discovery/censys.py b/discovery/censys.py → theHarvester/discovery/censys.py
@@ -1,5 +1,5 @@
-from lib.core import *
-from parsers import censysparser
+from theHarvester.lib.core import *
+from theHarvester.parsers import censysparser
 import requests
 
 

diff --git a/discovery/constants.py → theHarvester/discovery/constants.py b/discovery/constants.py → theHarvester/discovery/constants.py
diff --git a/discovery/crtsh.py → theHarvester/discovery/crtsh.py b/discovery/crtsh.py → theHarvester/discovery/crtsh.py
@@ -1,6 +1,6 @@
-from discovery.constants import *
-from lib.core import *
-from parsers import myparser
+from theHarvester.discovery.constants import *
+from theHarvester.lib.core import *
+from theHarvester.parsers import myparser
 import requests
 import time
 

diff --git a/discovery/cymon.py → theHarvester/discovery/cymon.py b/discovery/cymon.py → theHarvester/discovery/cymon.py
@@ -1,6 +1,6 @@
-from discovery.constants import *
-from lib.core import *
-from parsers import cymonparser
+from theHarvester.discovery.constants import *
+from theHarvester.lib.core import *
+from theHarvester.parsers import cymonparser
 import requests
 import time
 

diff --git a/discovery/dnsdumpster.py → theHarvester/discovery/dnsdumpster.py b/discovery/dnsdumpster.py → theHarvester/discovery/dnsdumpster.py
@@ -1,5 +1,5 @@
-from lib.core import *
-from parsers import myparser
+from theHarvester.lib.core import *
+from theHarvester.parsers import myparser
 import requests
 
 

diff --git a/discovery/dnssearch.py → theHarvester/discovery/dnssearch.py b/discovery/dnssearch.py → theHarvester/discovery/dnssearch.py
@@ -1,5 +1,5 @@
-import discovery.DNS as DNS
-import discovery.IPy as IPy
+import theHarvester.discovery.DNS as DNS
+import theHarvester.discovery.IPy as IPy
 import os
 import sys
 

diff --git a/discovery/dogpilesearch.py → theHarvester/discovery/dogpilesearch.py b/discovery/dogpilesearch.py → theHarvester/discovery/dogpilesearch.py
@@ -1,6 +1,6 @@
-from discovery.constants import *
-from lib.core import *
-from parsers import myparser
+from theHarvester.discovery.constants import *
+from theHarvester.lib.core import *
+from theHarvester.parsers import myparser
 import requests
 import time
 

diff --git a/discovery/duckduckgosearch.py → theHarvester/discovery/duckduckgosearch.py b/discovery/duckduckgosearch.py → theHarvester/discovery/duckduckgosearch.py
@@ -1,6 +1,6 @@
-from discovery.constants import *
-from lib.core import *
-from parsers import myparser
+from theHarvester.discovery.constants import *
+from theHarvester.lib.core import *
+from theHarvester.parsers import myparser
 import json
 import requests
 import time

diff --git a/discovery/exaleadsearch.py → theHarvester/discovery/exaleadsearch.py b/discovery/exaleadsearch.py → theHarvester/discovery/exaleadsearch.py
@@ -1,6 +1,6 @@
-from discovery.constants import *
-from lib.core import *
-from parsers import myparser
+from theHarvester.discovery.constants import *
+from theHarvester.lib.core import *
+from theHarvester.parsers import myparser
 import re
 import requests
 import time

diff --git a/discovery/googlecertificates.py → theHarvester/discovery/googlecertificates.py b/discovery/googlecertificates.py → theHarvester/discovery/googlecertificates.py
@@ -1,4 +1,4 @@
-from lib.core import *
+from theHarvester.lib.core import *
 import json
 import requests
 

diff --git a/discovery/googlesearch.py → theHarvester/discovery/googlesearch.py b/discovery/googlesearch.py → theHarvester/discovery/googlesearch.py
@@ -1,5 +1,5 @@
-from discovery.constants import *
-from parsers import myparser
+from theHarvester.discovery.constants import *
+from theHarvester.parsers import myparser
 import requests
 import time
 

diff --git a/discovery/huntersearch.py → theHarvester/discovery/huntersearch.py b/discovery/huntersearch.py → theHarvester/discovery/huntersearch.py
@@ -1,6 +1,6 @@
-from discovery.constants import *
-from lib.core import *
-from parsers import myparser
+from theHarvester.discovery.constants import *
+from theHarvester.lib.core import *
+from theHarvester.parsers import myparser
 import requests
 
 

diff --git a/discovery/intelxsearch.py → theHarvester/discovery/intelxsearch.py b/discovery/intelxsearch.py → theHarvester/discovery/intelxsearch.py
@@ -1,6 +1,6 @@
-from discovery.constants import *
-from lib.core import *
-from parsers import intelxparser
+from theHarvester.discovery.constants import *
+from theHarvester.lib.core import *
+from theHarvester.parsers import intelxparser
 import requests
 import time
 

diff --git a/discovery/linkedinsearch.py → theHarvester/discovery/linkedinsearch.py b/discovery/linkedinsearch.py → theHarvester/discovery/linkedinsearch.py
@@ -1,6 +1,6 @@
-from discovery.constants import *
-from lib.core import *
-from parsers import myparser
+from theHarvester.discovery.constants import *
+from theHarvester.lib.core import *
+from theHarvester.parsers import myparser
 import requests
 import time
 

diff --git a/discovery/netcraft.py → theHarvester/discovery/netcraft.py b/discovery/netcraft.py → theHarvester/discovery/netcraft.py
@@ -1,5 +1,5 @@
-from lib.core import *
-from parsers import myparser
+from theHarvester.lib.core import *
+from theHarvester.parsers import myparser
 import requests
 import hashlib
 import urllib.parse as urllib

diff --git a/discovery/port_scanner.py → theHarvester/discovery/port_scanner.py b/discovery/port_scanner.py → theHarvester/discovery/port_scanner.py
diff --git a/discovery/s3_scanner.py → theHarvester/discovery/s3_scanner.py b/discovery/s3_scanner.py → theHarvester/discovery/s3_scanner.py
diff --git a/discovery/securitytrailssearch.py → ...rvester/discovery/securitytrailssearch.py b/discovery/securitytrailssearch.py → ...rvester/discovery/securitytrailssearch.py
@@ -1,6 +1,6 @@
-from discovery.constants import *
-from lib.core import *
-from parsers import securitytrailsparser
+from theHarvester.discovery.constants import *
+from theHarvester.lib.core import *
+from theHarvester.parsers import securitytrailsparser
 import requests
 import sys
 import time

diff --git a/discovery/shodansearch.py → theHarvester/discovery/shodansearch.py b/discovery/shodansearch.py → theHarvester/discovery/shodansearch.py
@@ -1,5 +1,5 @@
-from discovery.constants import *
-from lib.core import *
+from theHarvester.discovery.constants import *
+from theHarvester.lib.core import *
 from shodan import exception
 from shodan import Shodan
 

diff --git a/discovery/takeover.py → theHarvester/discovery/takeover.py b/discovery/takeover.py → theHarvester/discovery/takeover.py
diff --git a/discovery/threatcrowd.py → theHarvester/discovery/threatcrowd.py b/discovery/threatcrowd.py → theHarvester/discovery/threatcrowd.py
@@ -1,5 +1,5 @@
-from lib.core import *
-from parsers import myparser
+from theHarvester.lib.core import *
+from theHarvester.parsers import myparser
 import requests
 
 

diff --git a/discovery/trello.py → theHarvester/discovery/trello.py b/discovery/trello.py → theHarvester/discovery/trello.py
@@ -1,5 +1,5 @@
-from discovery.constants import *
-from parsers import myparser
+from theHarvester.discovery.constants import *
+from theHarvester.parsers import myparser
 import requests
 import time
 

diff --git a/discovery/twittersearch.py → theHarvester/discovery/twittersearch.py b/discovery/twittersearch.py → theHarvester/discovery/twittersearch.py
@@ -1,6 +1,6 @@
-from discovery.constants import *
-from lib.core import *
-from parsers import myparser
+from theHarvester.discovery.constants import *
+from theHarvester.lib.core import *
+from theHarvester.parsers import myparser
 import requests
 import time
 

diff --git a/discovery/virustotal.py → theHarvester/discovery/virustotal.py b/discovery/virustotal.py → theHarvester/discovery/virustotal.py
@@ -1,5 +1,5 @@
-from lib.core import *
-from parsers import myparser
+from theHarvester.lib.core import *
+from theHarvester.parsers import myparser
 import requests
 
 

diff --git a/discovery/wfuzz_search.py → theHarvester/discovery/wfuzz_search.py b/discovery/wfuzz_search.py → theHarvester/discovery/wfuzz_search.py
diff --git a/discovery/yahoosearch.py → theHarvester/discovery/yahoosearch.py b/discovery/yahoosearch.py → theHarvester/discovery/yahoosearch.py
@@ -1,6 +1,6 @@
-from discovery.constants import *
-from lib.core import *
-from parsers import myparser
+from theHarvester.discovery.constants import *
+from theHarvester.lib.core import *
+from theHarvester.parsers import myparser
 import requests
 import time
 

diff --git a/discovery/yandexsearch.py → theHarvester/discovery/yandexsearch.py b/discovery/yandexsearch.py → theHarvester/discovery/yandexsearch.py
@@ -1,6 +1,6 @@
-from discovery.constants import *
-from lib.core import *
-from parsers import myparser
+from theHarvester.discovery.constants import *
+from theHarvester.lib.core import *
+from theHarvester.parsers import myparser
 import re
 import requests
 import time

diff --git a/lib/__init__.py → theHarvester/lib/__init__.py b/lib/__init__.py → theHarvester/lib/__init__.py
diff --git a/lib/core.py → theHarvester/lib/core.py b/lib/core.py → theHarvester/lib/core.py
diff --git a/lib/graphs.py → theHarvester/lib/graphs.py b/lib/graphs.py → theHarvester/lib/graphs.py
diff --git a/lib/hostchecker.py → theHarvester/lib/hostchecker.py b/lib/hostchecker.py → theHarvester/lib/hostchecker.py
diff --git a/lib/htmlExport.py → theHarvester/lib/htmlExport.py b/lib/htmlExport.py → theHarvester/lib/htmlExport.py
@@ -1,5 +1,5 @@
-from lib import graphs
-from lib import markup
+from theHarvester.lib import graphs
+from theHarvester.lib import markup
 import re
 
 

diff --git a/lib/ip-ranges.json → theHarvester/lib/ip-ranges.json b/lib/ip-ranges.json → theHarvester/lib/ip-ranges.json
diff --git a/lib/markup.py → theHarvester/lib/markup.py b/lib/markup.py → theHarvester/lib/markup.py
diff --git a/lib/port_scanner.py → theHarvester/lib/port_scanner.py b/lib/port_scanner.py → theHarvester/lib/port_scanner.py
diff --git a/lib/reportgraph.py → theHarvester/lib/reportgraph.py b/lib/reportgraph.py → theHarvester/lib/reportgraph.py
@@ -1,5 +1,5 @@
+from theHarvester.lib import stash
 from datetime import datetime
-from lib import stash
 import plotly
 import plotly.graph_objs as go
 import plotly.plotly as py

diff --git a/lib/resolvers.txt → theHarvester/lib/resolvers.txt b/lib/resolvers.txt → theHarvester/lib/resolvers.txt
diff --git a/lib/stash.py → theHarvester/lib/stash.py b/lib/stash.py → theHarvester/lib/stash.py
diff --git a/lib/statichtmlgenerator.py → theHarvester/lib/statichtmlgenerator.py b/lib/statichtmlgenerator.py → theHarvester/lib/statichtmlgenerator.py
diff --git a/theHarvester/parsers/__init__.py b/theHarvester/parsers/__init__.py
diff --git a/parsers/censysparser.py → theHarvester/parsers/censysparser.py b/parsers/censysparser.py → theHarvester/parsers/censysparser.py
diff --git a/parsers/cymonparser.py → theHarvester/parsers/cymonparser.py b/parsers/cymonparser.py → theHarvester/parsers/cymonparser.py
diff --git a/parsers/intelxparser.py → theHarvester/parsers/intelxparser.py b/parsers/intelxparser.py → theHarvester/parsers/intelxparser.py
diff --git a/parsers/myparser.py → theHarvester/parsers/myparser.py b/parsers/myparser.py → theHarvester/parsers/myparser.py
diff --git a/parsers/securitytrailsparser.py → theHarvester/parsers/securitytrailsparser.py b/parsers/securitytrailsparser.py → theHarvester/parsers/securitytrailsparser.py