[freeside-commits] branch master updated. 6bfd3e59317994ac1911988109fc6add0cf87f13

Jonathan Prykop jonathan at 420.am
Tue Jan 5 20:20:28 PST 2016


The branch, master has been updated
       via  6bfd3e59317994ac1911988109fc6add0cf87f13 (commit)
      from  469c10dcd2bad9c12c83dbd5d4645751382628ba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6bfd3e59317994ac1911988109fc6add0cf87f13
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Tue Jan 5 22:19:26 2016 -0600

    RT#39481: Password Maximum Length

diff --git a/FS/FS/ClientAPI/MyAccount/contact.pm b/FS/FS/ClientAPI/MyAccount/contact.pm
index c893c10..dd3a40b 100644
--- a/FS/FS/ClientAPI/MyAccount/contact.pm
+++ b/FS/FS/ClientAPI/MyAccount/contact.pm
@@ -26,12 +26,7 @@ sub contact_passwd {
 
   my $error = '';
 
-  # use these svc_acct length restrictions??
-  my $conf = new FS::Conf;
-  $error = 'Password too short.'
-    if length($p->{'new_password'}) < ($conf->config('passwordmin') || 6);
-  $error = 'Password too long.'
-    if length($p->{'new_password'}) > ($conf->config('passwordmax') || 8);
+  # length checks now in is_password_allowed
 
   $error ||= $contact->is_password_allowed($p->{'new_password'});
 
diff --git a/FS/FS/Password_Mixin.pm b/FS/FS/Password_Mixin.pm
index 834fd6f..0f75960 100644
--- a/FS/FS/Password_Mixin.pm
+++ b/FS/FS/Password_Mixin.pm
@@ -47,7 +47,7 @@ sub is_password_allowed {
   # options for Data::Password
   $DICTIONARY = 4;   # minimum length of disallowed words
   $MINLEN = $conf->config('passwordmin') || 6;
-  $MAXLEN = $conf->config('passwordmax') || 8;
+  $MAXLEN = $conf->config('passwordmax') || 12;
   $GROUPS = 4;       # must have all 4 'character groups': numbers, symbols, uppercase, lowercase
   # other options use the defaults listed below:
   # $FOLLOWING = 3;    # disallows more than 3 chars in a row, by alphabet or keyboard (ie abcd or asdf)
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 53b12f1..59d1e04 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -72,7 +72,7 @@ FS::UID->install_callback( sub {
   $passwordmin = ( defined($passwordmin) && $passwordmin =~ /\d+/ )
                    ? $passwordmin
                    : 6;
-  $passwordmax = $conf->config('passwordmax') || 8;
+  $passwordmax = $conf->config('passwordmax') || 12;
   $username_letter = $conf->exists('username-letter');
   $username_letterfirst = $conf->exists('username-letterfirst');
   $username_noperiod = $conf->exists('username-noperiod');
diff --git a/httemplate/edit/cust_main/first_pkg/svc_acct.html b/httemplate/edit/cust_main/first_pkg/svc_acct.html
index 8308af4..3644d62 100644
--- a/httemplate/edit/cust_main/first_pkg/svc_acct.html
+++ b/httemplate/edit/cust_main/first_pkg/svc_acct.html
@@ -78,7 +78,7 @@ my $conf = new FS::Conf;
 
 my $ulen = dbdef->table('svc_acct')->column('username')->length;
 my $ulen2 = $ulen+2;
-my $passwordmax = $conf->config('passwordmax') || 8;
+my $passwordmax = $conf->config('passwordmax') || 12;
 my $pmax2 = $passwordmax + 2;
 
 </%init>
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 0cf0c20..ca26c6c 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -553,7 +553,7 @@ my $ulen =
   : dbdef->table('svc_acct')->column('username')->length;
 my $ulen2 = $ulen+2;
 
-my $pmax = max($conf->config('passwordmax') || 13);
+my $pmax = max($conf->config('passwordmax') || 12);
 my $pmax2 = $pmax+2;
 
 my $p1 = popurl(1);

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/ClientAPI/MyAccount/contact.pm              |    7 +------
 FS/FS/Password_Mixin.pm                           |    2 +-
 FS/FS/svc_acct.pm                                 |    2 +-
 httemplate/edit/cust_main/first_pkg/svc_acct.html |    2 +-
 httemplate/edit/svc_acct.cgi                      |    2 +-
 5 files changed, 5 insertions(+), 10 deletions(-)




More information about the freeside-commits mailing list