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

No length check for login form

Browse Source
This commit is contained in:
Jonathan Sandoval 2016-04-07 16:34:00 -05:00
parent bf2f121a83
commit 4106eef3a4
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mediagoblin/auth/tools.py
View File

@ -34,14 +34,19 @@ from mediagoblin import auth
_log = logging.getLogger(__name__) _log = logging.getLogger(__name__)
def normalize_user_or_email_field(allow_email=True, allow_user=True): def normalize_user_or_email_field(allow_email=True, allow_user=True,
""" is_login=False):
Check if we were passed a field that matches a username and/or email """Check if we were passed a field that matches a username and/or email
pattern. pattern.
This is useful for fields that can take either a username or email This is useful for fields that can take either a username or email
address. Use the parameters if you want to only allow a username for address. Use the parameters if you want to only allow a username
instance""" for instance
is_login : bool
If is_login is True, does not check the length of username.
"""
message = _(u'Invalid User name or email address.') message = _(u'Invalid User name or email address.')
nomail_msg = _(u"This field does not take email addresses.") nomail_msg = _(u"This field does not take email addresses.")
nouser_msg = _(u"This field requires an email address.") nouser_msg = _(u"This field requires an email address.")
@ -56,7 +61,8 @@ def normalize_user_or_email_field(allow_email=True, allow_user=True):
else: # lower case user names else: # lower case user names
if not allow_user: if not allow_user:
raise wtforms.ValidationError(nouser_msg) raise wtforms.ValidationError(nouser_msg)
wtforms.validators.Length(min=3, max=30)(form, field) if not is_login:
wtforms.validators.Length(min=3, max=30)(form, field)
wtforms.validators.Regexp(r'^[-_\w]+$')(form, field) wtforms.validators.Regexp(r'^[-_\w]+$')(form, field)
field.data = field.data.lower() field.data = field.data.lower()
if field.data is None: # should not happen, but be cautious anyway if field.data is None: # should not happen, but be cautious anyway

2
mediagoblin/plugins/basic_auth/forms.py
View File

@ -38,7 +38,7 @@ class LoginForm(wtforms.Form):
username = wtforms.StringField( username = wtforms.StringField(
_('Username or Email'), _('Username or Email'),
[wtforms.validators.InputRequired(), [wtforms.validators.InputRequired(),
normalize_user_or_email_field()]) normalize_user_or_email_field(is_login=True)])
password = wtforms.PasswordField( password = wtforms.PasswordField(
_('Password')) _('Password'))
stay_logged_in = wtforms.BooleanField( stay_logged_in = wtforms.BooleanField(