wassname/flask-security
1
0
Fork 0
mirror of https://github.com/wassname/flask-security.git synced 2026-06-27 16:10:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Only use password salt if using hmac

Browse Source
This commit is contained in:
Matt Wright
2012-08-20 18:17:29 -04:00
parent 332575e53b
commit 101fa42e55
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flask_security/utils.py
+13 -5
View File
@@ -85,19 +85,27 @@ def get_hmac(msg, salt=None, digestmod=None):
return base64.b64encode(hmac.new(salt, msg, digestmod).digest())
def verify_password(password, password_hash, salt=None, use_hmac=None):
salt = salt or _security.password_salt
def verify_password(password, password_hash, use_hmac=None):
if use_hmac is None:
use_hmac = _security.password_hmac
hmac_value = get_hmac(password, salt) if use_hmac else password
if use_hmac:
hmac_value = get_hmac(password, _security.password_hmac_salt)
else:
hmac_value = password
return _pwd_context.verify(hmac_value, password_hash)
def encrypt_password(password, salt=None, use_hmac=None):
salt = salt or _security.password_salt
if use_hmac is None:
use_hmac = _security.password_hmac
hmac_value = get_hmac(password, salt) if use_hmac else password
if use_hmac:
hmac_value = get_hmac(password, _security.password_hmac_salt)
else:
hmac_value = password
return _pwd_context.encrypt(hmac_value)
tests/functional_tests.py
+1 -1
View File
@@ -203,7 +203,7 @@ class ConfiguredSecurityTests(SecurityTest):
AUTH_CONFIG = {
'SECURITY_PASSWORD_HASH': 'bcrypt',
'SECURITY_PASSWORD_SALT': 'so-salty',
'SECURITY_PASSWORD_HMAC_SALT': 'so-salty',
'SECURITY_PASSWORD_HMAC': True,
'SECURITY_REGISTERABLE': True,
'SECURITY_AUTH_URL': '/custom_auth',