Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 897264 - letters_numbers_specialchars password restriction is incorrect

Browse Source 
r=LpSolit, a=sgreen


git-svn-id: svn://10.0.0.236/trunk@264945 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2013-08-13 18:32:06 +00:00
parent 25cf6cbf86
commit 8ff6165081
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
8687
8688

2
mozilla/webtools/bugzilla/Bugzilla/User.pm
View File

@ -2116,7 +2116,7 @@ sub validate_password {
my $complexity_level = Bugzilla->params->{password_complexity};
if ($complexity_level eq 'letters_numbers_specialchars') {
ThrowUserError('password_not_complex')
if ($password !~ /\w/ || $password !~ /\d/ || $password !~ /[[:punct:]]/);
if ($password !~ /[[:alpha:]]/ || $password !~ /\d/ || $password !~ /[[:punct:]]/);
} elsif ($complexity_level eq 'letters_numbers') {
ThrowUserError('password_not_complex')
if ($password !~ /[[:lower:]]/ || $password !~ /[[:upper:]]/ || $password !~ /\d/);

30
mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
View File

@ -1395,21 +1395,21 @@
[%+ constants.USER_PASSWORD_MIN_LENGTH FILTER html %] characters long.
[% ELSIF error == "password_not_complex" %]
[% title = "Password Fails Requirements" %]
[% passregex = Param('password_complexity') %]
The password must contain at least one:
<ul>
[% IF passregex.search('letters') %]
<li>UPPERCASE letter</li>
<li>lowercase letter</li>
[% END %]
[% IF passregex.search('numbers') %]
<li>digit</li>
[% END %]
[% IF passregex.search('specialchars') %]
<li>special character</li>
[% END %]
</ul>
[% title = "Password Fails Requirements" %]
[% passregex = Param('password_complexity') %]
The password must contain at least one:
<ul>
[% IF passregex == 'letters_numbers_specialchars' %]
<li>letter</li>
<li>special character</li>
[% ELSIF passregex.search('letters') %]
<li>UPPERCASE letter</li>
<li>lowercase letter</li>
[% END %]
[% IF passregex.search('numbers') %]
<li>digit</li>
[% END %]
</ul>
[% ELSIF error == "product_access_denied" %]
[% title = "Product Access Denied" %]