diff options
author | Mark Wells <mark@freeside.biz> | 2015-11-20 15:23:18 -0800 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2015-11-20 15:23:25 -0800 |
commit | a1a83e3aa44a09cf7c63d5e21b9937e6fa9b4a17 (patch) | |
tree | 09ccfed695a4dd0cc74c8873fe1e17b79d95cc4a | |
parent | 803f699c6185f061b741d1c7687a482b9ae57520 (diff) |
remove the config option, #32456
-rw-r--r-- | FS/FS/Conf.pm | 14 | ||||
-rw-r--r-- | FS/FS/Password_Mixin.pm | 13 |
2 files changed, 11 insertions, 16 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index a4cc87199..641f925bc 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 393b41629..990f73595 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. |