diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-07-10 17:50:14 -0500 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-07-10 17:50:14 -0500 |
commit | 8cd4f195b84c33d64e8d67250e49f3caf9604f07 (patch) | |
tree | 0946d8cc6a4abbe93a39e3c662a543eaf23195f3 /mediagoblin/plugins/basic_auth | |
parent | a66fbf97d277222106002805723723b4b5bef726 (diff) | |
parent | 537ce5973aef0c392be620d24993831812515df5 (diff) | |
download | mediagoblin-8cd4f195b84c33d64e8d67250e49f3caf9604f07.tar.lz mediagoblin-8cd4f195b84c33d64e8d67250e49f3caf9604f07.tar.xz mediagoblin-8cd4f195b84c33d64e8d67250e49f3caf9604f07.zip |
Merge remote-tracking branch 'refs/remotes/rodney757/misc'
Diffstat (limited to 'mediagoblin/plugins/basic_auth')
-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(): |