From d41acf75a278b83430b665ff365708923695a6e5 Mon Sep 17 00:00:00 2001 From: Fry Date: Thu, 28 Sep 2023 10:50:10 +1000 Subject: [PATCH] Nits from PR --- docker/worker/Dockerfile | 2 +- turbinia/lib/utils.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/worker/Dockerfile b/docker/worker/Dockerfile index 61e159140..d4ae66af4 100644 --- a/docker/worker/Dockerfile +++ b/docker/worker/Dockerfile @@ -158,7 +158,7 @@ RUN cd /home/turbinia && echo "" > password.lst RUN cd /home/turbinia && curl -s https://raw.githubusercontent.com/danielmiessler/SecLists/285474cf9bff85f3323c5a1ae436f78acd1cb62c/Passwords/UserPassCombo-Jay.txt >> password.lst RUN cd /home/turbinia && curl -s https://raw.githubusercontent.com/danielmiessler/SecLists/master/Passwords/Common-Credentials/10-million-password-list-top-1000000.txt >> password.lst RUN cp /home/turbinia/password.lst /root/ -RUN echo ':\nd' > /home/turbinia/turbinia.rules +RUN echo ':\nd' > /home/turbinia/turbinia-password-cracking.rules # Copy Kubernetes support tool to home folder COPY --chown=turbinia:turbinia k8s/tools/check-lockfile.py /home/turbinia/check-lockfile.py diff --git a/turbinia/lib/utils.py b/turbinia/lib/utils.py index 96adcfda3..a9d960ac5 100644 --- a/turbinia/lib/utils.py +++ b/turbinia/lib/utils.py @@ -171,7 +171,7 @@ def bruteforce_password_hashes( pot_file = os.path.join((tmp_dir or tempfile.gettempdir()), 'hashcat.pot') password_list_file_path = os.path.expanduser('~/password.lst') - password_rules_file_path = os.path.expanduser('~/turbinia.rules') + password_rules_file_path = os.path.expanduser('~/turbinia-password-cracking.rules') # Fallback if not os.path.isfile(password_list_file_path): @@ -194,6 +194,7 @@ def bruteforce_password_hashes( ] pot_file = os.path.expanduser('~/.john/john.pot') else: + # Ignore warnings & plain word list attack (with rules) cmd = ['hashcat', '--force', '-a', '0'] if extra_args: cmd = cmd + extra_args.split(' ')