heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup after merge

Browse Source
This commit is contained in:
Rodney Ewing 2013-05-27 08:39:34 -07:00
parent bcd10ad663
commit cdc6b571e3
4 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mediagoblin/auth/__init__.py
View File

@ -23,8 +23,8 @@ def check_login(user, password):
return False return False
def get_user(form): def get_user(username):
return hook_handle("auth_get_user", form) return hook_handle("auth_get_user", username)
def create_user(register_form): def create_user(register_form):

9
mediagoblin/auth/tools.py
View File

@ -199,15 +199,12 @@ def send_fp_verification_email(user, request):
def check_login_simple(username, password, username_might_be_email=False): def check_login_simple(username, password, username_might_be_email=False):
search = (User.username == username) user = auth.get_user(username)
if username_might_be_email and ('@' in username):
search = or_(search, User.email == username)
user = User.query.filter(search).first()
if not user: if not user:
_log.info("User %r not found", username) _log.info("User %r not found", username)
auth_lib.fake_login_attempt() auth.fake_login_attempt()
return None return None
if not auth_lib.bcrypt_check_password(password, user.pw_hash): if not auth.check_password(password, user.pw_hash):
_log.warn("Wrong password for %r", username) _log.warn("Wrong password for %r", username)
return None return None
_log.info("Logging %r in", username) _log.info("Logging %r in", username)

3
mediagoblin/auth/views.py
View File

@ -22,7 +22,6 @@ from mediagoblin.db.models import User
from mediagoblin.tools.response import render_to_response, redirect, render_404 from mediagoblin.tools.response import render_to_response, redirect, render_404
from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.translate import pass_to_ugettext as _
from mediagoblin.tools.mail import email_debug_message from mediagoblin.tools.mail import email_debug_message
from mediagoblin.auth import lib as auth_lib
from mediagoblin.auth import forms as auth_forms from mediagoblin.auth import forms as auth_forms
from mediagoblin.auth.tools import (send_verification_email, from mediagoblin.auth.tools import (send_verification_email,
register_user, register_user,
@ -301,7 +300,7 @@ def verify_forgot_password(request):
cp_form = auth_forms.ChangePassForm(formdata_vars) cp_form = auth_forms.ChangePassForm(formdata_vars)
if request.method == 'POST' and cp_form.validate(): if request.method == 'POST' and cp_form.validate():
user.pw_hash = auth_lib.bcrypt_gen_password_hash( user.pw_hash = auth.gen_password_hash(
cp_form.password.data) cp_form.password.data)
user.fp_verification_key = None user.fp_verification_key = None
user.fp_token_expire = None user.fp_token_expire = None

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

@ -34,9 +34,7 @@ def check_login(user, password):
return None return None
def get_user(form): def get_user(username):
if 'username' in form.data:
username = form.username.data
user = User.query.filter( user = User.query.filter(
or_( or_(
User.username == username, User.username == username,
@ -46,7 +44,7 @@ def get_user(form):
def create_user(registration_form): def create_user(registration_form):
user = get_user(registration_form) user = get_user(registration_form.username.data)
if not user and 'password' in registration_form: if not user and 'password' in registration_form:
user = User() user = User()
user.username = registration_form.username.data user.username = registration_form.username.data