Hashcat now works

README.md

@@ -33,8 +33,7 @@ Search-That-Hash searches the most popular hash cracking sites and automatically
 
 Couldn't find it in any API? 😢 STH automatically pipes your input into Hashcat 🥳
 
-Make sure to specify a wordlist if you want STH to use HashCat with `-w /path/to/wordlist`. If you are on Windows you must specify the path to your HashCat binary with the arg `-hashcat_binary /path/to/hashcat/exe` as shown above. 😊
-
+Make sure to specify a wordlist if you want STH to use HashCat with `-w /path/to/wordlist`. If you are on Windows you must specify the path to your HashCat binary and folder in config.json 🙂
 # 🔨 Installation
 
 Install Search-That-Hash as fast as you can read this README. No, seriously -- it's that easy 😎

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "search-that-hash"
-version = "0.2.2"
+version = "0.2.5"
 description = "Search hashes quickly before cracking them"
 authors = ["brandon <brandon@skerritt.blog>","jayy <jayy2004@gmx.co.uk>"]
 license = "GPL-3.0-or-later"

search_that_hash/__main__.py

@@ -11,6 +11,8 @@
 import logging
 import coloredlogs
 
+from appdirs import *
+
 
 @click.command()
 @click.option("--text", "-t", type=str, help="Crack a single hash.")

search_that_hash/config_object.py

@@ -1,4 +1,3 @@
-import toml
 from appdirs import *
 import json
 from loguru import logger
@@ -8,6 +7,7 @@
 
 import logging
 import coloredlogs
+import os.path
 
 
 def cli_config(kwargs):
@@ -40,7 +40,7 @@ def api_config(hashes: str, sth_api: str = None):
 
 
 def default_config():
- return {
+ config = {
  "api_keys": {"STH": "rGFbPbSXMF5ldzid2eyA81i6aCa497Z25MNgi8sa"},
  "hashcat": False,
  "api": False,
@@ -52,6 +52,33 @@ def default_config():
  "offline": False,
  }
 
+ defults = {
+
+ "hashes_dot_org":"test",
+ "sth_api":"rGFbPbSXMF5ldzid2eyA81i6aCa497Z25MNgi8sa",
+ "hashcat_exe_name":"hashcat",
+ "hashcat_folder":""
+
+ }
+
+ appname = "Search-That-Hash"
+ appauthor = "HashPals"
+
+ config_json = user_data_dir(appname, appauthor) + "\\config.json"
+
+ if not os.path.isfile(config_json):
+ os.makedirs(user_data_dir(appname, appauthor))
+ with open(config_json, "w+") as file:
+ file.write(json.dumps(defults))
+ file.close()
+
+ with open(config_json) as json_file:
+ json_contents = json.load(json_file)
+ json_file.close()
+
+ config.update(json_contents)
+
+ return config
 
 def create_hash_config(hashes):
  # Gets the results from name-that-hash

search_that_hash/cracker/offline_mod/hashcat.py

@@ -1,111 +1,40 @@
 import subprocess as sp
 
-
 class Hashcat:
  def crack(self, config):
 
  hashcat_dict = str.maketrans({"$": "\\$"})
-
  hash_formatted = config["chash"].translate(hashcat_dict)
-
+ 
  for possible_type in config["hashcat_types"]:
-
- # If its greppable then silence.
+
+ command = f"cd {config['hashcat_folder']} && {config['hashcat_exe_name']} -a 0 -m {possible_type} {hash_formatted} {config['wordlist']}"
+
  if config["greppable"]:
- if config["hashcat_binary"]: # If on windows run from binary folder
- command = f".\\hashcat64.exe -a 0 -m {possible_type} {hash_formatted} {config['wordlist']}"
- try:
- sp.check_call(
- command,
- shell="True",
- cwd=config["hashcat_binary"],
- stdout=sp.DEVNULL,
- stderr=sp.STDOUT,
- )
- except Exception as e:
- if "returned non-zero exit status 1." in e:
- continue
- else:
- return "Failed"
-
- possible_output = str(
- sp.check_output(
- f"{command} --show",
- shell=True,
- cwd=config["hashcat_binary"],
- ).strip()
- ).strip("'")
-
- if not "No hashes loaded." in possible_output:
- return possible_output.split(":")[1]
-
- else:
- command = f"hashcat -a 0 -m {possible_type} {hash_formatted} {config['wordlist']}"
- try:
- sp.check_call(
- command, shell="True", stdout=sp.DEVNULL, stderr=sp.STDOUT
- )
- except Exception as e:
- if "returned non-zero exit status 1." in e:
- continue
- else:
- return "Failed"
-
- possible_output = str(
- sp.check_output(
- f"{command} --show",
- shell=True,
- cwd=config["hashcat_binary"],
- ).strip()
- ).strip("'")
-
- if not "No hashes loaded." in possible_output:
- return possible_output.split(":")[1]
-
+ config["greppable"] = sp.DEVNULL
  else:
- if config["hashcat_binary"]: # On windows? Run from binary folder
- command = f"./hashcat64.exe -a 0 -m {possible_type} {hash_formatted} {config['wordlist']}"
- try:
- sp.check_call(
- command,
- shell="True",
- cwd=config["hashcat_binary"],
- )
- except Exception as e:
- if "returned non-zero exit status 1." in e:
- continue
- else:
- return "Failed"
-
- possible_output = str(
- sp.check_output(
- f"{command} --show",
- shell=True,
- cwd=config["hashcat_binary"],
- ).strip()
- ).strip("'")
-
- if not "No hashes loaded." in possible_output:
- return possible_output.split(":")[1]
-
+ config["greppable"] = None
+ try:
+ sp.check_call(
+ command,
+ shell="True",
+ cwd=config["hashcat_binary"],
+ stdout=config["greppable"],
+ stderr=config["greppable"],
+ )
+ except Exception as e:
+ if "returned non-zero exit status 1." in e:
+ continue
  else:
- command = f"hashcat -a 0 -m {possible_type} {hash_formatted} {config['wordlist']}"
- try:
- sp.check_call(
- command,
- shell="True",
- )
- except Exception as e:
- if "returned non-zero exit status 1." in e:
- continue
- else:
- return "Failed"
-
- possible_output = str(
- sp.check_output(f"{command} --show", shell=True).strip()
- ).strip("'")
-
- if not "No hashes loaded." in possible_output:
- return possible_output.split(":")[1]
+ return "Failed"
+ possible_output = str(
+ sp.check_output(
+ f"{command} --show",
+ shell=True,
+ cwd=config["hashcat_binary"],
+ ).strip()
+ ).strip("'")
+ if not "No hashes loaded." in possible_output:
+ return possible_output.split(":")[1]
 
  return "Failed"

tests/main_test.py

@@ -2,7 +2,7 @@
 from click.testing import CliRunner
 
 from search_that_hash.__main__ import main
-
+import os.path
 
 def test_it_works():
 
@@ -150,3 +150,6 @@ def test_cli_fail_on_grep(): # Fixes #63 issue
  ["-t", "jadjsjhd9239uh80dahjdah8isdh90wq90hj0j9fj9023j0-12j-j-0fasj0a", "-g"],
  )
  assert result.exit_code == 0
+
+def test_if_config_file():
+ assert os.path.isfile(config_json) == True