p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Fixed double parentheses in print method invocations

This commit is contained in:
VakarisZ 2019-10-10 16:41:47 +03:00
parent 8ede629b13
commit fcd43b9fa0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
monkey/infection_monkey/main.py
View File

@ -59,17 +59,17 @@ def main():
config_file = opts.config config_file = opts.config
if os.path.isfile(config_file): if os.path.isfile(config_file):
# using print because config can also change log locations # using print because config can also change log locations
print(("Loading config from %s." % config_file)) print("Loading config from %s." % config_file)
try: try:
with open(config_file) as config_fo: with open(config_file) as config_fo:
json_dict = json.load(config_fo) json_dict = json.load(config_fo)
WormConfiguration.from_kv(json_dict) WormConfiguration.from_kv(json_dict)
except ValueError as e: except ValueError as e:
print(("Error loading config: %s, using default" % (e,))) print("Error loading config: %s, using default" % (e,))
else: else:
print(("Config file wasn't supplied and default path: %s wasn't found, using internal default" % (config_file,))) print("Config file wasn't supplied and default path: %s wasn't found, using internal default" % (config_file,))
print(("Loaded Configuration: %r" % WormConfiguration.hide_sensitive_info(WormConfiguration.as_dict()))) print("Loaded Configuration: %r" % WormConfiguration.hide_sensitive_info(WormConfiguration.as_dict()))
# Make sure we're not in a machine that has the kill file # Make sure we're not in a machine that has the kill file
kill_path = os.path.expandvars( kill_path = os.path.expandvars(

2
monkey/monkey_island/scripts/island_password_hasher.py
View File

@ -16,7 +16,7 @@ def main():
h = SHA3_512.new() h = SHA3_512.new()
h.update(args.string_to_sha) h.update(args.string_to_sha)
print((h.hexdigest())) print(h.hexdigest())
if __name__ == '__main__': if __name__ == '__main__':