aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/auth/lib.py
diff options
context:
space:
mode:
authorRodney Ewing <ewing.rj@gmail.com>2013-05-14 17:14:48 -0700
committerRodney Ewing <ewing.rj@gmail.com>2013-05-24 16:52:48 -0700
commitd54cf48a33d16619f94fa3873f88392b4c77a23e (patch)
treebe586d92ab1ed11f8d8d98693d895c4841b6c49f /mediagoblin/auth/lib.py
parent744f1c83b9c94a82612c981ec56782f3db457357 (diff)
downloadmediagoblin-d54cf48a33d16619f94fa3873f88392b4c77a23e.tar.lz
mediagoblin-d54cf48a33d16619f94fa3873f88392b4c77a23e.tar.xz
mediagoblin-d54cf48a33d16619f94fa3873f88392b4c77a23e.zip
moved bcrypt_check_password to basic_auth/tools from auth/lib
Diffstat (limited to 'mediagoblin/auth/lib.py')
-rw-r--r--mediagoblin/auth/lib.py32
1 files changed, 0 insertions, 32 deletions
diff --git a/mediagoblin/auth/lib.py b/mediagoblin/auth/lib.py
index 6ce23f5b..1a9416fc 100644
--- a/mediagoblin/auth/lib.py
+++ b/mediagoblin/auth/lib.py
@@ -23,38 +23,6 @@ from mediagoblin.tools.template import render_template
from mediagoblin import mg_globals
-def bcrypt_check_password(raw_pass, stored_hash, extra_salt=None):
- """
- Check to see if this password matches.
-
- Args:
- - raw_pass: user submitted password to check for authenticity.
- - stored_hash: The hash of the raw password (and possibly extra
- salt) to check against
- - extra_salt: (optional) If this password is with stored with a
- non-database extra salt (probably in the config file) for extra
- security, factor this into the check.
-
- Returns:
- True or False depending on success.
- """
- if extra_salt:
- raw_pass = u"%s:%s" % (extra_salt, raw_pass)
-
- hashed_pass = bcrypt.hashpw(raw_pass.encode('utf-8'), stored_hash)
-
- # Reduce risk of timing attacks by hashing again with a random
- # number (thx to zooko on this advice, which I hopefully
- # incorporated right.)
- #
- # See also:
- rand_salt = bcrypt.gensalt(5)
- randplus_stored_hash = bcrypt.hashpw(stored_hash, rand_salt)
- randplus_hashed_pass = bcrypt.hashpw(hashed_pass, rand_salt)
-
- return randplus_stored_hash == randplus_hashed_pass
-
-
def bcrypt_gen_password_hash(raw_pass, extra_salt=None):
"""
Generate a salt for this new password.