From 7e970a932b84df7c7ef21f1f9ca362605c84be44 Mon Sep 17 00:00:00 2001 From: Wilbur Jaywright Date: Mon, 25 Nov 2024 21:35:55 -0500 Subject: [PATCH] Revert "Implement native MD5 authentication" This reverts commit dcf176755d9ea2513d9a52409138c1951fe35224. Undid ALL work on #20 in main branch --- src/rumchat_actor/utils.py | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/src/rumchat_actor/utils.py b/src/rumchat_actor/utils.py index a46f17f..cbdd892 100644 --- a/src/rumchat_actor/utils.py +++ b/src/rumchat_actor/utils.py @@ -50,26 +50,9 @@ def get_safe_filename(clip_save_path, filename, extension = static.Clip.save_ext safe_filename = filename + f"({increment})" return safe_filename -def calc_password_hashes(password, salts): - """Hash a password given the salts using custom MD5 implementation""" - md5 = MD5Ex() - stretched1 = md5.hash_stretch(password, salts[0], 128) - stretched2 = md5.hash_stretch(password, salts[2], 128) - final_hash1 = md5.hash(stretched1 + salts[1]) - return [final_hash1, stretched2, salts[1]] - -class MD5Ex: - def __init__(self): - self.hex = list("0123456789abcdef") - - def hash(self, message: str) -> str: - if isinstance(message, str): - message = message.encode('utf-8') - return hashlib.md5(message).hexdigest() - - def hash_stretch(self, password: str, salt: str, iterations: int = 1024) -> str: - message = (salt + password).encode('utf-8') - current = self.hash(message) - for _ in range(iterations): - current = self.hash(current + password) - return current +# def calc_password_hashes(password, salts): +# """Hash a password given the salts""" +# with open(pjoin(Path(__file__).parent, pjoin("dom_scripts", "md5Ex.js")), 'r') as f: +# js = f.read() +# +# return eval_js(js)(password, salts)