[freeside-commits] branch FREESIDE_4_BRANCH updated. a1a83e3aa44a09cf7c63d5e21b9937e6fa9b4a17

[Mark Wells]

The branch, FREESIDE_4_BRANCH has been updated
       via  a1a83e3aa44a09cf7c63d5e21b9937e6fa9b4a17 (commit)
      from  803f699c6185f061b741d1c7687a482b9ae57520 (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 a1a83e3aa44a09cf7c63d5e21b9937e6fa9b4a17
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Nov 20 15:23:18 2015 -0800

    remove the config option, #32456

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index a4cc871..641f925 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -4052,13 +4052,13 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
-  {
-    'key'         => 'password-no_reuse',
-    'section'     => 'password',
-    'description' => 'Minimum number of password changes before a password can be reused. By default, passwords can be reused without restriction.',
-    'type'        => 'text',
-  },
-
+#  {
+#    'key'         => 'password-no_reuse',
+#    'section'     => 'password',
+#    'description' => 'Minimum number of password changes before a password can be reused. By default, passwords can be reused without restriction.',
+#    'type'        => 'text',
+#  },
+#
   {
     'key'         => 'datavolume-forcemegabytes',
     'section'     => 'UI',
diff --git a/FS/FS/Password_Mixin.pm b/FS/FS/Password_Mixin.pm
index 393b416..990f735 100644
--- a/FS/FS/Password_Mixin.pm
+++ b/FS/FS/Password_Mixin.pm
@@ -7,13 +7,7 @@ use Authen::Passphrase;
 use Authen::Passphrase::BlowfishCrypt;
 # https://rt.cpan.org/Ticket/Display.html?id=72743
 
-our $DEBUG = 1;
-our $conf;
-FS::UID->install_callback( sub {
-    $conf = FS::Conf->new;
-    # this is safe
-    #eval "use Authen::Passphrase::BlowfishCrypt;";
-});
+our $DEBUG = 0;
 
 our $me = '[' . __PACKAGE__ . ']';
 
@@ -46,9 +40,10 @@ sub is_password_allowed {
 
   # check length and complexity here
 
-  if ( $conf->config('password-no_reuse') =~ /^(\d+)$/ ) {
+  my $no_reuse = 3;
+  # allow override here if we really must
 
-    my $no_reuse = $1;
+  if ( $no_reuse > 0 ) {
 
     # "the last N" passwords includes the current password and the N-1
     # passwords before that.

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

Summary of changes:
 FS/FS/Conf.pm           |   14 +++++++-------
 FS/FS/Password_Mixin.pm |   13 ++++---------
 2 files changed, 11 insertions(+), 16 deletions(-)