From fd32110a2bd552f423fa732655d44e2337434c1e Mon Sep 17 00:00:00 2001
From: L1ghtn1ng <townsend891@hotmail.com>
Date: Sat, 11 Jan 2020 19:57:23 +0000
Subject: [PATCH] Update deps and code style updates

---
 Pipfile.lock             | 15 +++++++++++++++
 requirements/base.txt    |  4 ++--
 theHarvester/__main__.py | 20 ++++++--------------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 392c9d4c..97fa1c0c 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -403,6 +403,14 @@
             "index": "pypi",
             "version": "==3.7.9"
         },
+        "importlib-metadata": {
+            "hashes": [
+                "sha256:073a852570f92da5f744a3472af1b61e28e9f78ccf0c9117658dc32b15de7b45",
+                "sha256:d95141fbfa7ef2ec65cfd945e2af7e5a6ddbd7c8d9a25e66ff3be8e3daf9f60f"
+            ],
+            "markers": "python_version < '3.8'",
+            "version": "==1.3.0"
+        },
         "mccabe": {
             "hashes": [
                 "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42",
@@ -549,6 +557,13 @@
                 "sha256:f28b3e8a6483e5d49e7f8949ac1a78314e740333ae305b4ba5defd3e74fb37a8"
             ],
             "version": "==0.1.8"
+        },
+        "zipp": {
+            "hashes": [
+                "sha256:3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e",
+                "sha256:f06903e9f1f43b12d371004b4ac7b06ab39a44adc747266928ae6debfa7b3335"
+            ],
+            "version": "==0.6.0"
         }
     }
 }
diff --git a/requirements/base.txt b/requirements/base.txt
index b82a8c97..39cb8321 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -6,9 +6,9 @@ dnspython==1.16.0
 lxml==4.4.2
 netaddr==0.7.19
 plotly==4.4.1
-PyYaml==5.2
+PyYaml==5.3
 requests==2.22.0
-shodan==1.21.1
+shodan==1.21.2
 texttable==1.6.2
 retrying==1.3.3
 uvloop==0.14.0
\ No newline at end of file
diff --git a/theHarvester/__main__.py b/theHarvester/__main__.py
index 1e7dabd8..4952f50a 100644
--- a/theHarvester/__main__.py
+++ b/theHarvester/__main__.py
@@ -24,20 +24,14 @@ async def start():
     parser.add_argument('-d', '--domain', help='company name or domain to search', required=True)
     parser.add_argument('-l', '--limit', help='limit the number of search results, default=500', default=500, type=int)
     parser.add_argument('-S', '--start', help='start with result number X, default=0', default=0, type=int)
-    parser.add_argument('-g', '--google-dork', help='use Google Dorks for Google search', default=False,
-                        action='store_true')
-    parser.add_argument('-p', '--port-scan', help='scan the detected hosts and check for Takeovers (21,22,80,443,8080)',
-                        default=False, action='store_true')
-    parser.add_argument('-s', '--shodan', help='use Shodan to query discovered hosts', default=False,
-                        action='store_true')
-    parser.add_argument('-v', '--virtual-host', help='verify host name via DNS resolution and search for virtual hosts',
-                        action='store_const', const='basic', default=False)
+    parser.add_argument('-g', '--google-dork', help='use Google Dorks for Google search', default=False, action='store_true')
+    parser.add_argument('-p', '--port-scan', help='scan the detected hosts and check for Takeovers (21,22,80,443,8080)', default=False, action='store_true')
+    parser.add_argument('-s', '--shodan', help='use Shodan to query discovered hosts', default=False, action='store_true')
+    parser.add_argument('-v', '--virtual-host', help='verify host name via DNS resolution and search for virtual hosts', action='store_const', const='basic', default=False)
     parser.add_argument('-e', '--dns-server', help='DNS server to use for lookup')
     parser.add_argument('-t', '--dns-tld', help='perform a DNS TLD expansion discovery, default False', default=False)
-    parser.add_argument('-n', '--dns-lookup', help='enable DNS server lookup, default False', default=False,
-                        action='store_true')
-    parser.add_argument('-c', '--dns-brute', help='perform a DNS brute force on the domain', default=False,
-                        action='store_true')
+    parser.add_argument('-n', '--dns-lookup', help='enable DNS server lookup, default False', default=False, action='store_true')
+    parser.add_argument('-c', '--dns-brute', help='perform a DNS brute force on the domain', default=False, action='store_true')
     parser.add_argument('-f', '--filename', help='save the results to an HTML and/or XML file', default='', type=str)
     parser.add_argument('-b', '--source', help='''baidu, bing, bingapi, certspotter, crtsh, dnsdumpster,
                         dogpile, duckduckgo, github-code, google,
@@ -681,6 +675,4 @@ async def entry_point():
 
 
 if __name__ == '__main__':
-    # import uvloop
-    # uvloop.install()
     asyncio.run(main=entry_point(), debug=True)