Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix generic cracker #22

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

fix generic cracker #22

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
944c13f
remove zap check in generic cracker
vbalyasnyy Jan 9, 2021
c58dd9e
add command line flag for attacked-hashlist
vbalyasnyy Jan 9, 2021
684ddd9
fix generic cracker benchmark result format
vbalyasnyy Jan 9, 2021
caeffdd
add task cmdpars in generic cracker cmd
vbalyasnyy Jan 19, 2021
34bea1a
fix hashlistAlias replace
vbalyasnyy Feb 22, 2021
2019f7c
join chunk main thread
vbalyasnyy Mar 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions htpclient/generic_cracker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ def __init__(self, cracker_id, binary_download):
def run_chunk(self, task, chunk, preprocessor):
args = " crack -s " + str(chunk['skip'])
args += " -l " + str(chunk['length'])
args += " " + task['attackcmd'].replace(task['hashlistAlias'], "../hashlists/" + str(task['hashlistId']))
args += " " + task['attackcmd'].replace(task['hashlistAlias'], "-a ../hashlists/" + str(task['hashlistId']))
args += ' ' + task['cmdpars']

full_cmd = self.callPath + args
if Initialize.get_os() == 1:
full_cmd = full_cmd.replace("/", '\\')
Expand All @@ -43,6 +45,7 @@ def run_chunk(self, task, chunk, preprocessor):
process.wait()
out_thread.join()
err_thread.join()
main_thread.join()
logging.info("finished chunk")

def run_loop(self, process, chunk, task):
Expand Down Expand Up @@ -96,14 +99,10 @@ def run_loop(self, process, chunk, task):
elif ans['response'] != 'SUCCESS':
logging.error("Error from server on solve: " + str(ans))
else:
if ans['zaps']:
with open("files/zap", "wb") as zapfile: # need to check if we are in the main dir here
zapfile.write('\n'.join(ans['zaps']).encode())
zapfile.close()
cracks = cracks_backup
logging.info(
"Progress: " + str(progress / 100) + "% Cracks: " + str(len(cracks)) +
" Accepted: " + str(ans['cracked']) + " Skips: " + str(ans['skipped']) + " Zaps: " + str(len(ans['zaps'])))
" Accepted: " + str(ans['cracked']) + " Skips: " + str(ans['skipped']))
else:
line = line.decode()
if ":" in line:
Expand All @@ -116,7 +115,7 @@ def run_loop(self, process, chunk, task):

def measure_keyspace(self, task, chunk):
task = task.get_task()
full_cmd = self.callPath + " keyspace " + task['attackcmd'].replace("-a " + task['hashlistAlias'] + " ", "")
full_cmd = self.callPath + " keyspace " + task['attackcmd'].replace(task['hashlistAlias'] + " ", "") + ' ' + task['cmdpars']
if Initialize.get_os() == 1:
full_cmd = full_cmd.replace("/", '\\')
try:
Expand All @@ -140,8 +139,8 @@ def run_benchmark(self, task):
ksp = self.keyspace
if ksp == 0:
ksp = task['keyspace']
args = task['attackcmd'].replace(task['hashlistAlias'], "../hashlists/" + str(task['hashlistId']))
full_cmd = self.callPath + " crack " + args + " -s 0 -l " + str(ksp) + " --timeout=" + str(task['bench'])
args = task['attackcmd'].replace(task['hashlistAlias'], "-a ../hashlists/" + str(task['hashlistId']))
full_cmd = self.callPath + " crack " + args + " -s 0 -l " + str(ksp) + " --timeout=" + str(task['bench']) + ' ' + task['cmdpars']
if Initialize.get_os() == 1:
full_cmd = full_cmd.replace("/", '\\')
logging.debug("CALL: " + full_cmd)
Expand All @@ -163,7 +162,10 @@ def run_benchmark(self, task):
req = JsonRequest(query)
req.execute()
return 0
return float(last_valid_status.get_progress()) / 10000
if task['benchType'] == 'speed':
return str(last_valid_status.get_progress()) + ":" + str(last_valid_status.get_speed())
else:
return float(last_valid_status.get_progress()) / 10000
else:
query = copy_and_set_token(dict_clientError, self.config.get_value('token'))
query['taskId'] = task['taskId']
Expand Down