prehistoric-systems/Zeus-Scanner
1
0
Fork 0
mirror of https://github.com/Ekultek/Zeus-Scanner.git synced 2026-03-11 08:55:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

patch for issue #22, will not shutdown if the provided URL is not valid with an error message instead of throwing an exception

Browse source
This commit is contained in:
ekultek 2017-10-01 08:06:03 -05:00
parent f87f63d3b0
commit 4cf72fc97b
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/settings.py
View file

@ -22,7 +22,7 @@ except NameError:
# clone link
CLONE = "https://github.com/ekultek/zeus-scanner.git"
# current version <major.minor.commit.patch ID>
VERSION = "1.0.24"
VERSION = "1.0.25.b683"
# colors to output depending on the version
VERSION_TYPE_COLORS = {"dev": 33, "stable": 92, "other": 30}
# version string formatting

26
zeus.py
View file

@ -486,11 +486,12 @@ if __name__ == "__main__":
request_issue_creation()
elif opt.spiderWebSite:
problem_identifiers = ["http://", "https://"]
if not URL_REGEX.match(opt.spiderWebSite):
err_msg = "URL did not match a true URL{}..."
if "www" in opt.spiderWebSite:
err_msg = err_msg.format(" issue seems to be that 'www' is in the URL, "
"replace with http(s)://")
if not any(m in opt.spiderWebSite for m in problem_identifiers):
err_msg = err_msg.format(" issue seems to be that http:// "
"or https:// is not present in the URL")
else:
err_msg = err_msg.format("")
raise InvalidInputProvided(
@ -555,11 +556,20 @@ if __name__ == "__main__":
"it will cause Zeus to crash...", level=30
))
except Exception as e:
logger.exception(set_color(
"ran into exception '{}' exception has been saved to log file...".format(e), level=50
))
fix_log_file()
request_issue_creation()
if "url did not match a true url" in str(e).lower():
logger.error(set_color(
"you did not provide a URL that is capable of being processed, "
"the URL provided to the spider needs to contain protocol as well "
"ie. 'http://google.com' (it is advised not to add the GET parameter), "
"fix the URL you want to scan and try again...", level=40
))
shutdown()
else:
logger.exception(set_color(
"ran into exception '{}' exception has been saved to log file...".format(e), level=50
))
fix_log_file()
request_issue_creation()
fix_log_file()
shutdown()