diff options
author | Aditi <aditi.iitr@gmail.com> | 2013-07-16 06:48:33 +0530 |
---|---|---|
committer | Aditi <aditi.iitr@gmail.com> | 2013-07-16 06:48:33 +0530 |
commit | 67d303ffa96a80da3a3cf48d2f9231bc1a087a19 (patch) | |
tree | 8bd1af9ec13fed7c340a6329632bddf2d17e3fb6 /mediagoblin/plugins/basic_auth/__init__.py | |
parent | 7b77f7e490a27de57a4dab5301662ef95d11b213 (diff) | |
parent | 64ad0beea83b1f4b50462bcb67c54156fc9365a5 (diff) | |
download | mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.tar.lz mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.tar.xz mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.zip |
merge with remote master branch of cweb.
Diffstat (limited to 'mediagoblin/plugins/basic_auth/__init__.py')
-rw-r--r-- | mediagoblin/plugins/basic_auth/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mediagoblin/plugins/basic_auth/__init__.py b/mediagoblin/plugins/basic_auth/__init__.py index c16d8855..33a554b0 100644 --- a/mediagoblin/plugins/basic_auth/__init__.py +++ b/mediagoblin/plugins/basic_auth/__init__.py @@ -59,7 +59,10 @@ def gen_password_hash(raw_pass, extra_salt=None): def check_password(raw_pass, stored_hash, extra_salt=None): - return auth_tools.bcrypt_check_password(raw_pass, stored_hash, extra_salt) + if stored_hash: + return auth_tools.bcrypt_check_password(raw_pass, + stored_hash, extra_salt) + return None def auth(): |