heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

moved bcrypt_gen_password_hash to basic_auth/tools and added gen_password_hash function to auth/__init__

Browse Source
This commit is contained in:
Rodney Ewing
2013-05-14 17:38:18 -07:00
parent d54cf48a33
commit 9c2c9be79d
5 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mediagoblin/plugins/basic_auth/__init__.py
View File

@@ -18,7 +18,6 @@ import uuid
import forms as auth_forms
import tools as auth_tools
from mediagoblin.auth import lib as auth_lib
from mediagoblin.db.models import User
from mediagoblin.tools.translate import pass_to_ugettext as _
from mediagoblin.tools import pluginapi
@@ -47,7 +46,7 @@ def create_user(registration_form):
user = User()
user.username = registration_form.data['username']
user.email = registration_form.data['email']
user.pw_hash = auth_lib.bcrypt_gen_password_hash(
user.pw_hash = auth_tools.bcrypt_gen_password_hash(
registration_form.password.data)
user.verification_key = unicode(uuid.uuid4())
user.save()
@@ -82,6 +81,10 @@ def get_registration_form(request):
return auth_forms.RegistrationForm(request.form)
def gen_password_hash(raw_pass, extra_salt):
return auth_tools.bcrypt_gen_password_hash(raw_pass, extra_salt)
def auth():
return True
@@ -95,4 +98,5 @@ hooks = {
'auth_extra_validation': extra_validation,
'auth_get_login_form': get_login_form,
'auth_get_registration_form': get_registration_form,
'auth_gen_password_hash': gen_password_hash,
}