From 977564ae62c26645b669919c95f77a45a06479fa Mon Sep 17 00:00:00 2001 From: ekultek Date: Sat, 21 Oct 2017 16:59:43 -0500 Subject: [PATCH] minor update where running through a file or dork would not allow you to parse webcache or pull all URLs, also updated some whois lookup info --- etc/checksum/md5sum.md5 | 7 +++---- lib/attacks/whois_lookup/whois.py | 20 ++++++++++++++------ lib/core/settings.py | 2 +- zeus.py | 4 ++-- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/etc/checksum/md5sum.md5 b/etc/checksum/md5sum.md5 index 0f1c012..c35998d 100644 --- a/etc/checksum/md5sum.md5 +++ b/etc/checksum/md5sum.md5 @@ -1,7 +1,7 @@ d41d8cd98f00b204e9800998ecf8427e ./checksum.txt caa0444d437bc23ae47436e87e868e3e ./README.md e6c13a69a5290cdb1a8e5e1c4dd19b7d ./requirements.txt -29799e62b65dc912792ba7ac4f3cdeb2 ./zeus.py +12a2391213ee3385376784fefb38635a ./zeus.py 6ad5f22ec4a6f8324bfb1b01ab6d51ec ./etc/scripts/cleanup.sh 155c9482f690f1482f324a7ffd8b8098 ./etc/scripts/fix_pie.sh 642a77905d8bb4e5533e0e9c2137c0fa ./etc/agents.txt @@ -37,15 +37,14 @@ d41d8cd98f00b204e9800998ecf8427e ./lib/attacks/__init__.py 5e5bb575014ebe613db6bf671d008cf8 ./lib/attacks/sqlmap_scan/sqlmap_opts.py d41d8cd98f00b204e9800998ecf8427e ./lib/attacks/whois_lookup/__init__.py 9931efff89b0a4af28249c5937b29b26 ./lib/attacks/whois_lookup/whois.py -f90f0aacbaba8a21011e68657e187ea4 ./lib/attacks/whois_lookup/__init__.pyc -fc11145007c1c3f47cbda44ced93e73f ./lib/attacks/admin_panel_finder/__init__.py +2782c48ef762413f0e7ce7392786ce2d ./lib/attacks/admin_panel_finder/__init__.py 23c1e5e934029f9acc89d2c95e7748e7 ./lib/attacks/xss_scan/__init__.py 7870fc3ce4808b5c57dc32e9b84a90b3 ./lib/attacks/nmap_scan/__init__.py 216999fa0e84866d5c1d96d5676034e4 ./lib/attacks/nmap_scan/nmap_opts.py c5ebb0c56c9ae3b9a72a14e3f05afa16 ./lib/attacks/intel_me/__init__.py 1faa2b5dfad6eb538bbfe42942d2a9da ./lib/core/errors.py d41d8cd98f00b204e9800998ecf8427e ./lib/core/__init__.py -3384f68bbef53c38a0444508604acba9 ./lib/core/settings.py +3e41c556294fba97ac7a686369e0dcc0 ./lib/core/settings.py d41d8cd98f00b204e9800998ecf8427e ./var/google_search/__init__.py d28b1b648539106a488067b951a9dd7c ./var/google_search/search.py d41d8cd98f00b204e9800998ecf8427e ./var/__init__.py diff --git a/lib/attacks/whois_lookup/whois.py b/lib/attacks/whois_lookup/whois.py index b662d65..2f798af 100644 --- a/lib/attacks/whois_lookup/whois.py +++ b/lib/attacks/whois_lookup/whois.py @@ -67,14 +67,14 @@ def human_readable_display(domain, interesting, raw, show_readable=False): if show_readable: contact_dict = dict(interesting[1]) print(" |--[!] Domain: {} (organization '{}')".format(domain, contact_dict["owner"][0]["organization"])) - print(" | |--[x] Found nameservers (total {})".format(len(interesting[0]))) + print(" | |--[!] Found nameservers (total {})".format(len(interesting[0]))) if len(interesting[0]) > 1: for i, server in enumerate(interesting[0], start=1): print(" | | |--[{}]--- {}".format(i, server)) else: print(" | | |--{}".format("".join(interesting[0]))) if contact_dict["owner"][0]["name"] is not None or "": - print(" | |--[x] Contact name found: {}".format(contact_dict["owner"][0]["name"])) + print(" | |--[!] Contact name found: {}".format(contact_dict["owner"][0]["name"])) if contact_dict["owner"][0]["phone"] != "" or None: print(" | | |-- Phone number: {}".format(contact_dict["owner"][0]["phone"])) else: @@ -82,7 +82,7 @@ def human_readable_display(domain, interesting, raw, show_readable=False): else: print(" [x] No contact owner revealed") if len(contact_dict["admin"]) > 0: - print(" | |--[x] Total admins found {}".format(len(contact_dict["admin"]))) + print(" | |--[!] Total admins found {}".format(len(contact_dict["admin"]))) for i, admin in enumerate(contact_dict["admin"]): print(" | | |--[{}]--- {}".format(i, admin)) else: @@ -122,9 +122,17 @@ def whois_lookup_main(domain, **kwargs): else: if verbose: for data in interesting_data: - logger.debug(set_color( - "found '{}'...".format(data), level=10 - )) + if isinstance(data, dict): + for v in data.itervalues(): + if v is not None: + logger.debug(set_color( + "found '{}'...".format(v), level=10 + )) + elif isinstance(data, list): + if len(data) != 0: + logger.debug(set_color( + "found '{}'...".format(data), level=10 + )) try: return human_readable_display(domain, interesting_data, raw_information) except: diff --git a/lib/core/settings.py b/lib/core/settings.py index 4e89864..f0d54ac 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -32,7 +32,7 @@ PATCH_ID = str(subprocess.check_output(["git", "rev-parse", "origin/master"]))[: # clone link CLONE = "https://github.com/ekultek/zeus-scanner.git" # current version -VERSION = "1.0.57" +VERSION = "1.0.57.{}".format(PATCH_ID) # colors to output depending on the version VERSION_TYPE_COLORS = {"dev": 33, "stable": 92, "other": 30} # version string formatting diff --git a/zeus.py b/zeus.py index 4a7270f..9e0120a 100755 --- a/zeus.py +++ b/zeus.py @@ -549,7 +549,7 @@ if __name__ == "__main__": try: search.parse_search_results( dork, search_engine, verbose=opt.runInVerbose, proxy=proxy_to_use, - agent=agent_to_use + agent=agent_to_use, pull_all=opt.noExclude, parse_webcache=opt.parseWebcache ) except Exception as e: logger.exception(set_color( @@ -573,7 +573,7 @@ if __name__ == "__main__": try: search.parse_search_results( random_dork, search_engine, verbose=opt.runInVerbose, - proxy=proxy_to_use, agent=agent_to_use + proxy=proxy_to_use, agent=agent_to_use, pull_all=opt.noExclude, parse_webcache=opt.parseWebcache ) __run_attacks_main()