minor fix

This commit is contained in:
ekultek 2017-09-09 15:43:03 -05:00
parent a4cb2646c1
commit 7dc6d9b510
2 changed files with 25 additions and 4 deletions

View file

@ -17,7 +17,7 @@ import bin.unzip_gecko
# clone link
CLONE = "https://github.com/ekultek/zeus-scanner.git"
# current version <major.minor.commit.patch ID>
VERSION = "1.0.5.b0e"
VERSION = "1.0.6.b0e"
# colors to output depending on the version
VERSION_TYPE_COLORS = {"dev": 33, "stable": 92, "other": 30}
# version string formatting
@ -279,4 +279,14 @@ def get_random_dork(filename="{}/etc/dorks.txt"):
grab a random dork from the file
"""
with open(filename.format(os.getcwd())) as dorks:
return random.choice(dorks.readlines())
return random.choice(dorks.readlines())
def update_zeus():
can_update = True if ".git" in os.listdir(os.getcwd()) else False
if can_update:
return os.system("git pull origin master")
else:
logger.fatal(set_color(
"no git repository found in directory, unable to update automatically..."
))

15
zeus.py
View file

@ -1,6 +1,5 @@
#!/usr/bin/env python
import os
import time
import optparse
import subprocess
@ -26,7 +25,8 @@ from lib.settings import (
URL_LOG_PATH,
replace_http,
prompt,
get_random_dork
get_random_dork,
update_zeus
)
if __name__ == "__main__":
@ -87,6 +87,8 @@ if __name__ == "__main__":
help="Show the arguments that the sqlmap API understands")
misc.add_option("--batch", dest="runInBatch", action="store_true",
help="Skip the questions and run in default batch mode")
misc.add_option("--update", dest="updateZeus", action="store_true",
help="Update to the latest development version")
parser.add_option_group(mandatory)
parser.add_option_group(attacks)
@ -114,6 +116,15 @@ if __name__ == "__main__":
)
shutdown()
# update the program
if opt.updateZeus:
logger.info(set_color(
"update in progress..."
))
update_zeus()
shutdown()
def __find_running_opts():
"""
display the running options if verbose is used