From 25e674d4b72a2d7106f8990301cd7d9c525aa673 Mon Sep 17 00:00:00 2001
From: ekultek <thomas.perkins23@icloud.com>
Date: Sat, 4 Nov 2017 08:25:30 -0500
Subject: [PATCH] patch for an issue where the attacks would fail due to
 non-extracted webcache URLs

---
 etc/checksum/md5sum.md5 |  4 ++--
 lib/core/settings.py    |  2 +-
 zeus.py                 | 24 ++++++++++++++----------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/etc/checksum/md5sum.md5 b/etc/checksum/md5sum.md5
index 0cea3f9..bcb70f5 100644
--- a/etc/checksum/md5sum.md5
+++ b/etc/checksum/md5sum.md5
@@ -1,4 +1,4 @@
-cfaee70f681421c937e735346b61fd5e  ./zeus.py
+c6b20b66e81047fad538e527689c1ea8  ./zeus.py
 6ad5f22ec4a6f8324bfb1b01ab6d51ec  ./etc/scripts/cleanup.sh
 155c9482f690f1482f324a7ffd8b8098  ./etc/scripts/fix_pie.sh
 0e435c641bc636ac0b3d54e032d9cf6a  ./etc/scripts/install_nmap.sh
@@ -44,7 +44,7 @@ f746d2867f493104a78d0540cf50c03f  ./lib/attacks/intel_me/__init__.py
 c8fe372b08e7e27fe4e21f5f730f22ec  ./lib/attacks/clickjacking_scan/__init__.py
 1faa2b5dfad6eb538bbfe42942d2a9da  ./lib/core/errors.py
 d41d8cd98f00b204e9800998ecf8427e  ./lib/core/__init__.py
-6d80ab9bf54a4a4412719b1268334cff  ./lib/core/settings.py
+45902686b2821e127333d2965d4c846a  ./lib/core/settings.py
 d41d8cd98f00b204e9800998ecf8427e  ./var/google_search/__init__.py
 fe2fb9df1a0c525ca69cca3bbe6e8acc  ./var/google_search/search.py
 d41d8cd98f00b204e9800998ecf8427e  ./var/__init__.py
diff --git a/lib/core/settings.py b/lib/core/settings.py
index 38b5608..0ee09a2 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -41,7 +41,7 @@ PATCH_ID = str(subprocess.check_output(["git", "rev-parse", "origin/master"]))[:
 # clone link
 CLONE = "https://github.com/ekultek/zeus-scanner.git"
 # current version <major.minor.commit.patch ID>
-VERSION = "1.1.16.{}".format(PATCH_ID)
+VERSION = "1.1.17.{}".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 bb37dfc..090fd7e 100755
--- a/zeus.py
+++ b/zeus.py
@@ -358,7 +358,6 @@ if __name__ == "__main__":
             "dork": URL_LOG_PATH,
             "spider": SPIDER_LOG_PATH
         }
-
         options = (opt.useRandomDork, opt.dorkToUse, opt.dorkFileToUse, opt.fileToEnumerate)
         to_use = which_log_to_use["dork"] if any(arg for arg in options) is True else which_log_to_use["spider"]
         try:
@@ -380,15 +379,20 @@ if __name__ == "__main__":
         if any(options):
             with open(urls_to_use) as urls:
                 for url in urls.readlines():
-                    __run_attacks(
-                        url.strip(),
-                        sqlmap=opt.runSqliScan, nmap=opt.runPortScan,
-                        intel=opt.intelCheck, xss=opt.runXssScan,
-                        whois=opt.performWhoisLookup, admin=opt.adminPanelFinder,
-                        clickjacking=opt.performClickjackingScan,
-                        verbose=opt.runInVerbose, batch=opt.runInBatch,
-                        auto_start=opt.autoStartSqlmap
-                    )
+                    if "webcache" in url:
+                        logger.warning(set_color(
+                            "ran into unextracted webcache URL skipping..."
+                        ))
+                    else:
+                        __run_attacks(
+                            url.strip(),
+                            sqlmap=opt.runSqliScan, nmap=opt.runPortScan,
+                            intel=opt.intelCheck, xss=opt.runXssScan,
+                            whois=opt.performWhoisLookup, admin=opt.adminPanelFinder,
+                            clickjacking=opt.performClickjackingScan,
+                            verbose=opt.runInVerbose, batch=opt.runInBatch,
+                            auto_start=opt.autoStartSqlmap
+                        )
 
 
     proxy_to_use, agent_to_use = config_headers(