Use - as hash delimiter instead

This commit is contained in:
2025-11-23 12:04:49 -07:00
parent c5b161487b
commit a5aa45759c
2 changed files with 7 additions and 5 deletions

View File

@@ -234,7 +234,8 @@ def _hash_password(pw: str) -> str:
salt = os.urandom(16)
iterations = 200_000
dk = hashlib.pbkdf2_hmac('sha256', pw.encode('utf-8'), salt, iterations)
return f"pbkdf2_sha256${iterations}${binascii.hexlify(salt).decode()}${binascii.hexlify(dk).decode()}"
# use - as the delimiter to avoid Docker env variable substitution
return f"pbkdf2_sha256-{iterations}-{binascii.hexlify(salt).decode()}-{binascii.hexlify(dk).decode()}"
except Exception:
return ""
@@ -243,7 +244,7 @@ def _verify_password(stored: str, pw: Optional[str]) -> bool:
if not pw or not stored:
return False
try:
algo, iter_s, salt_hex, hash_hex = stored.split("$")
algo, iter_s, salt_hex, hash_hex = stored.split("-")
if algo != 'pbkdf2_sha256':
return False
iterations = int(iter_s)
@@ -901,7 +902,7 @@ async def api_login(request: Request) -> JSONResponse:
stored_password = SETTINGS.admin_password
password_ok = False
if stored_password.startswith("pbkdf2_sha256$"):
if stored_password.startswith("pbkdf2_sha256-"):
password_ok = _verify_password(stored_password, password)
else:
password_ok = (password == stored_password)