Commit 11857d9f authored by Xavier Guimard's avatar Xavier Guimard

make tidy

parent 81a364cc
...@@ -257,7 +257,7 @@ sub getApacheSession { ...@@ -257,7 +257,7 @@ sub getApacheSession {
$self->error( $apacheSession->error ); $self->error( $apacheSession->error );
return undef; return undef;
} }
$self->logger->debug("Get session $id from Common::Session::REST") if ( $id ); $self->logger->debug("Get session $id from Common::Session::REST") if ($id);
return $apacheSession; return $apacheSession;
} }
......
...@@ -107,7 +107,7 @@ sub statusInit { ...@@ -107,7 +107,7 @@ sub statusInit {
exec $perl_exec, '-MLemonldap::NG::Handler::Lib::Status', exec $perl_exec, '-MLemonldap::NG::Handler::Lib::Status',
# Insert @INC in Perl path # Insert @INC in Perl path
map( {"-I$_"} @INC ), map( { "-I$_" } @INC ),
# Command to launch # Command to launch
'-e', '&Lemonldap::NG::Handler::Lib::Status::run()', '-e', '&Lemonldap::NG::Handler::Lib::Status::run()',
......
...@@ -197,7 +197,7 @@ sub defaultValuesInit { ...@@ -197,7 +197,7 @@ sub defaultValuesInit {
cookieExpiration cookieName customFunctions httpOnly cookieExpiration cookieName customFunctions httpOnly
securedCookie timeout timeoutActivity securedCookie timeout timeoutActivity
timeoutActivityInterval useRedirectOnError useRedirectOnForbidden timeoutActivityInterval useRedirectOnError useRedirectOnForbidden
useSafeJail whatToTrace handlerInternalCache useSafeJail whatToTrace handlerInternalCache
) )
); );
......
...@@ -21,7 +21,7 @@ ok( ...@@ -21,7 +21,7 @@ ok(
cookieName => 'lemonldap', cookieName => 'lemonldap',
securedCookie => 0, securedCookie => 0,
https => 0, https => 0,
userLogger => 'Lemonldap::NG::Common::Logger::Null', userLogger => 'Lemonldap::NG::Common::Logger::Null',
} }
), ),
'initialization' 'initialization'
......
...@@ -29,7 +29,7 @@ sub init { ...@@ -29,7 +29,7 @@ sub init {
cookieName => 'lemonldap', cookieName => 'lemonldap',
securedCookie => 0, securedCookie => 0,
https => 0, https => 0,
logger => 'Lemonldap::NG::Common::Logger::Std', logger => 'Lemonldap::NG::Common::Logger::Std',
%$prms %$prms
); );
ok( ok(
......
...@@ -8,17 +8,17 @@ sub types { ...@@ -8,17 +8,17 @@ sub types {
'array' => { 'array' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'authParamsText' => { 'authParamsText' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'blackWhiteList' => { 'blackWhiteList' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'bool' => { 'bool' => {
'msgFail' => '__notABoolean__', 'msgFail' => '__notABoolean__',
...@@ -36,17 +36,17 @@ sub types { ...@@ -36,17 +36,17 @@ sub types {
split( /\n/, $@, 0 ) ) split( /\n/, $@, 0 ) )
); );
return $err ? ( 1, "__badExpression__: $err" ) : 1; return $err ? ( 1, "__badExpression__: $err" ) : 1;
} }
}, },
'catAndAppList' => { 'catAndAppList' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'file' => { 'file' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'hostname' => { 'hostname' => {
'form' => 'text', 'form' => 'text',
...@@ -80,48 +80,48 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a- ...@@ -80,48 +80,48 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
if $_ =~ /exportedvars$/i and defined $conf->{$_}{$val}; if $_ =~ /exportedvars$/i and defined $conf->{$_}{$val};
} }
return 1, "__unknownAttrOrMacro__: $val"; return 1, "__unknownAttrOrMacro__: $val";
} }
}, },
'longtext' => { 'longtext' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'menuApp' => { 'menuApp' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'menuCat' => { 'menuCat' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'oidcmetadatajson' => { 'oidcmetadatajson' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'oidcmetadatajwks' => { 'oidcmetadatajwks' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'oidcOPMetaDataNode' => { 'oidcOPMetaDataNode' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'oidcRPMetaDataNode' => { 'oidcRPMetaDataNode' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'password' => { 'password' => {
'msgFail' => '__malformedValue__', 'msgFail' => '__malformedValue__',
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'pcre' => { 'pcre' => {
'form' => 'text', 'form' => 'text',
...@@ -132,7 +132,7 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a- ...@@ -132,7 +132,7 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
} }
}; };
return $@ ? ( 0, "__badRegexp__: $@" ) : 1; return $@ ? ( 0, "__badRegexp__: $@" ) : 1;
} }
}, },
'PerlModule' => { 'PerlModule' => {
'form' => 'text', 'form' => 'text',
...@@ -142,17 +142,17 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a- ...@@ -142,17 +142,17 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
'portalskin' => { 'portalskin' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'portalskinbackground' => { 'portalskinbackground' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'post' => { 'post' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'RSAPrivateKey' => { 'RSAPrivateKey' => {
'test' => sub { 'test' => sub {
...@@ -160,7 +160,7 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a- ...@@ -160,7 +160,7 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
m[^(?:(?:\-+\s*BEGIN\s+(?:RSA\s+)?PRIVATE\s+KEY\s*\-+\r?\n)?(?:Proc-Type:.*\r?\nDEK-Info:.*\r?\n[\r\n]*)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\n\-+\s*END\s+(?:RSA\s+)PRIVATE\s+KEY\s*\-+)?[\r\n]*)?$]s m[^(?:(?:\-+\s*BEGIN\s+(?:RSA\s+)?PRIVATE\s+KEY\s*\-+\r?\n)?(?:Proc-Type:.*\r?\nDEK-Info:.*\r?\n[\r\n]*)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\n\-+\s*END\s+(?:RSA\s+)PRIVATE\s+KEY\s*\-+)?[\r\n]*)?$]s
? 1 ? 1
: ( 1, '__badPemEncoding__' ); : ( 1, '__badPemEncoding__' );
} }
}, },
'RSAPublicKey' => { 'RSAPublicKey' => {
'test' => sub { 'test' => sub {
...@@ -168,7 +168,7 @@ m[^(?:(?:\-+\s*BEGIN\s+(?:RSA\s+)?PRIVATE\s+KEY\s*\-+\r?\n)?(?:Proc-Type:.*\r?\n ...@@ -168,7 +168,7 @@ m[^(?:(?:\-+\s*BEGIN\s+(?:RSA\s+)?PRIVATE\s+KEY\s*\-+\r?\n)?(?:Proc-Type:.*\r?\n
m[^(?:(?:\-+\s*BEGIN\s+PUBLIC\s+KEY\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\n\-+\s*END\s+PUBLIC\s+KEY\s*\-+)?[\r\n]*)?$]s m[^(?:(?:\-+\s*BEGIN\s+PUBLIC\s+KEY\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\n\-+\s*END\s+PUBLIC\s+KEY\s*\-+)?[\r\n]*)?$]s
? 1 ? 1
: ( 1, '__badPemEncoding__' ); : ( 1, '__badPemEncoding__' );
} }
}, },
'RSAPublicKeyOrCertificate' => { 'RSAPublicKeyOrCertificate' => {
'test' => sub { 'test' => sub {
...@@ -176,37 +176,37 @@ m[^(?:(?:\-+\s*BEGIN\s+PUBLIC\s+KEY\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\ ...@@ -176,37 +176,37 @@ m[^(?:(?:\-+\s*BEGIN\s+PUBLIC\s+KEY\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\
m[^(?:(?:\-+\s*BEGIN\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\n\-+\s*END\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+)?[\r\n]*)?$]s m[^(?:(?:\-+\s*BEGIN\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\n\-+\s*END\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+)?[\r\n]*)?$]s
? 1 ? 1
: ( 1, '__badPemEncoding__' ); : ( 1, '__badPemEncoding__' );
} }
}, },
'rule' => { 'rule' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'samlAssertion' => { 'samlAssertion' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'samlAttribute' => { 'samlAttribute' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'samlIDPMetaDataNode' => { 'samlIDPMetaDataNode' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'samlService' => { 'samlService' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'samlSPMetaDataNode' => { 'samlSPMetaDataNode' => {
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'select' => { 'select' => {
'test' => sub { 'test' => sub {
...@@ -216,19 +216,19 @@ m[^(?:(?:\-+\s*BEGIN\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\ ...@@ -216,19 +216,19 @@ m[^(?:(?:\-+\s*BEGIN\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\
return $test return $test
? 1 ? 1
: ( 1, "Invalid value '$_[0]' for this select" ); : ( 1, "Invalid value '$_[0]' for this select" );
} }
}, },
'subContainer' => { 'subContainer' => {
'keyTest' => qr/\w/, 'keyTest' => qr/\w/,
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'text' => { 'text' => {
'msgFail' => '__malformedValue__', 'msgFail' => '__malformedValue__',
'test' => sub { 'test' => sub {
1; 1;
} }
}, },
'trool' => { 'trool' => {
'msgFail' => '__authorizedValues__: -1, 0, 1', 'msgFail' => '__authorizedValues__: -1, 0, 1',
...@@ -1054,7 +1054,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][ ...@@ -1054,7 +1054,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
split( /\n/, $@, 0 ) ) split( /\n/, $@, 0 ) )
); );
return $err ? ( 1, "__badExpression__: $err" ) : 1; return $err ? ( 1, "__badExpression__: $err" ) : 1;
} }
}, },
'type' => 'keyTextContainer' 'type' => 'keyTextContainer'
}, },
...@@ -1227,7 +1227,7 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0- ...@@ -1227,7 +1227,7 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
and defined $conf->{$_}{$val}; and defined $conf->{$_}{$val};
} }
return 1, "__unknownAttrOrMacro__: $val"; return 1, "__unknownAttrOrMacro__: $val";
} }
}, },
'type' => 'doubleHash' 'type' => 'doubleHash'
}, },
...@@ -1510,7 +1510,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][ ...@@ -1510,7 +1510,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
split( /\n/, $@, 0 ) ) split( /\n/, $@, 0 ) )
); );
return $err ? ( 1, "__badExpression__: $err" ) : 1; return $err ? ( 1, "__badExpression__: $err" ) : 1;
} }
}, },
'type' => 'ruleContainer' 'type' => 'ruleContainer'
}, },
......
...@@ -1526,7 +1526,7 @@ sub attributes { ...@@ -1526,7 +1526,7 @@ sub attributes {
grep { $_ =~ /Undefined subroutine/ ? () : $_ } grep { $_ =~ /Undefined subroutine/ ? () : $_ }
split( /\n/, $@ ) ); split( /\n/, $@ ) );
return $err ? ( 1, "__badExpression__: $err" ) : (1); return $err ? ( 1, "__badExpression__: $err" ) : (1);
} }
}, },
documentation => 'Virtualhost headers', documentation => 'Virtualhost headers',
flags => 'h', flags => 'h',
......
...@@ -69,7 +69,9 @@ sub diff { ...@@ -69,7 +69,9 @@ sub diff {
} }
elsif ( exists $conf[1]->{$key} ) { elsif ( exists $conf[1]->{$key} ) {
if ( $conf[0]->{$key} ne $conf[1]->{$key} ) { if ( $conf[0]->{$key} ne $conf[1]->{$key} ) {
$self->logger->debug( "Key $key has changed : " . $conf[0]->{$key} . " -> " . $conf[1]->{$key} ); $self->logger->debug( "Key $key has changed : "
. $conf[0]->{$key} . " -> "
. $conf[1]->{$key} );
$res[0]->{$key} = $conf[0]->{$key}; $res[0]->{$key} = $conf[0]->{$key};
$res[1]->{$key} = $conf[1]->{$key}; $res[1]->{$key} = $conf[1]->{$key};
} }
......
...@@ -69,7 +69,7 @@ has confChanged => ( ...@@ -69,7 +69,7 @@ has confChanged => (
); );
# Properties required during build # Properties required during build
has refConf => ( is => 'ro', isa => 'HashRef', required => 1 ); has refConf => ( is => 'ro', isa => 'HashRef', required => 1 );
has req => ( is => 'ro', required => 1 ); has req => ( is => 'ro', required => 1 );
has newConf => ( is => 'rw', isa => 'HashRef' ); has newConf => ( is => 'rw', isa => 'HashRef' );
has tree => ( is => 'rw', isa => 'ArrayRef' ); has tree => ( is => 'rw', isa => 'ArrayRef' );
...@@ -158,7 +158,7 @@ sub _scanNodes { ...@@ -158,7 +158,7 @@ sub _scanNodes {
hdebug("Looking to $name"); hdebug("Looking to $name");
# subnode # subnode
my $subNodes = $leaf->{nodes} // $leaf->{_nodes}; my $subNodes = $leaf->{nodes} // $leaf->{_nodes};
my $subNodesCond = $leaf->{nodes_cond} // $leaf->{_nodes_cond}; my $subNodesCond = $leaf->{nodes_cond} // $leaf->{_nodes_cond};
################################## ##################################
...@@ -1060,15 +1060,15 @@ sub _unitTest { ...@@ -1060,15 +1060,15 @@ sub _unitTest {
or $attr->{type} =~ /Container$/ ) or $attr->{type} =~ /Container$/ )
{ {
my $keyMsg = $attr->{keyMsgFail} // $type->{keyMsgFail}; my $keyMsg = $attr->{keyMsgFail} // $type->{keyMsgFail};
my $msg = $attr->{msgFail} // $type->{msgFail}; my $msg = $attr->{msgFail} // $type->{msgFail};
$res = 0 $res = 0
unless ( unless (
$self->_execTest( $self->_execTest(
{ {
keyTest => $attr->{keyTest} // $type->{keyTest}, keyTest => $attr->{keyTest} // $type->{keyTest},
keyMsgFail => $attr->{keyMsgFail} keyMsgFail => $attr->{keyMsgFail}
// $type->{keyMsgFail}, // $type->{keyMsgFail},
test => $attr->{test} // $type->{test}, test => $attr->{test} // $type->{test},
msgFail => $attr->{msgFail} // $type->{msgFail}, msgFail => $attr->{msgFail} // $type->{msgFail},
}, },
$conf->{$key}, $conf->{$key},
......
...@@ -24,7 +24,7 @@ delete $forms{restore}; ...@@ -24,7 +24,7 @@ delete $forms{restore};
my ( @types, $attr, $tree, $ctrees ); my ( @types, $attr, $tree, $ctrees );
ok( $tree = Lemonldap::NG::Manager::Build::Tree::tree(), 'Get tree' ); ok( $tree = Lemonldap::NG::Manager::Build::Tree::tree(), 'Get tree' );
ok( $ctrees = Lemonldap::NG::Manager::Build::CTrees::cTrees(), 'Get cTrees' ); ok( $ctrees = Lemonldap::NG::Manager::Build::CTrees::cTrees(), 'Get cTrees' );
ok( $attr = Lemonldap::NG::Manager::Build::Attributes::attributes(), ok( $attr = Lemonldap::NG::Manager::Build::Attributes::attributes(),
'Get attributes' ); 'Get attributes' );
$count += 4; $count += 4;
......
...@@ -49,7 +49,7 @@ my @notManagedAttributes = ( ...@@ -49,7 +49,7 @@ my @notManagedAttributes = (
# Other ini-only prms # Other ini-only prms
'configStorage', 'status', 'localStorageOptions', 'localStorage', 'configStorage', 'status', 'localStorageOptions', 'localStorage',
'max2FDevices', 'max2FDevicesNameLength', 'checkTime', 'max2FDevices', 'max2FDevicesNameLength', 'checkTime',
'mySessionAuthorizedRWKeys', 'handlerInternalCache' 'mySessionAuthorizedRWKeys', 'handlerInternalCache'
); );
......
...@@ -11,8 +11,8 @@ sub new { ...@@ -11,8 +11,8 @@ sub new {
eval $self->{p}->loadModule( $self->{conf}->{customAuth} ); eval $self->{p}->loadModule( $self->{conf}->{customAuth} );
($@) ($@)
? return $self->{p}->loadModule( $self->{conf}->{customAuth} ) ? return $self->{p}->loadModule( $self->{conf}->{customAuth} )
: die 'Unable to load Auth module ' . $self->{conf}->{customAuth}; : die 'Unable to load Auth module ' . $self->{conf}->{customAuth};
} }
sub getDisplayType { sub getDisplayType {
...@@ -28,7 +28,7 @@ sub getDisplayType { ...@@ -28,7 +28,7 @@ sub getDisplayType {
{ {
$self->logger->debug("CustomAuth $logo.png found"); $self->logger->debug("CustomAuth $logo.png found");
return "logo"; return "logo";
}; }
return "standardform"; return "standardform";
} }
......
...@@ -16,7 +16,7 @@ extends 'Lemonldap::NG::Portal::Main::Auth', ...@@ -16,7 +16,7 @@ extends 'Lemonldap::NG::Portal::Main::Auth',
# INTERFACE # INTERFACE
has opList => ( is => 'rw', default => sub { [] } ); has opList => ( is => 'rw', default => sub { [] } );
has opNumber => ( is => 'rw', default => 0 ); has opNumber => ( is => 'rw', default => 0 );
has path => ( is => 'rw', default => 'oauth2' ); has path => ( is => 'rw', default => 'oauth2' );
......
...@@ -793,7 +793,7 @@ sub extractFormInfo { ...@@ -793,7 +793,7 @@ sub extractFormInfo {
my $res = $self->p->deleteSession($req); my $res = $self->p->deleteSession($req);
return ( return (
$res eq PE_LOGOUT_OK ? PE_SENDRESPONSE : $res ); $res eq PE_LOGOUT_OK ? PE_SENDRESPONSE : $res );
} }
] ]
); );
......
...@@ -63,8 +63,8 @@ sub setAuthSessionInfo { ...@@ -63,8 +63,8 @@ sub setAuthSessionInfo {
} }
sub getDisplayType { sub getDisplayType {
my ( $self ) = @_; my ($self) = @_;
return ( $self->{conf}->{sslByAjax} ? "sslform" : "logo") ; return ( $self->{conf}->{sslByAjax} ? "sslform" : "logo" );
} }
1; 1;
...@@ -1540,7 +1540,8 @@ sub _convertOldFormatConsents { ...@@ -1540,7 +1540,8 @@ sub _convertOldFormatConsents {
# Update persistent session # Update persistent session
$self->p->updatePersistentSession( $req, $self->p->updatePersistentSession( $req,
{ _oidcConsents => to_json( \@oidcConsents ) } ) if $count; { _oidcConsents => to_json( \@oidcConsents ) } )
if $count;
return $count; return $count;
} }
......
...@@ -39,12 +39,11 @@ sub init { ...@@ -39,12 +39,11 @@ sub init {
} }
foreach my $name ( keys %{ $self->conf->{authChoiceModules} } ) { foreach my $name ( keys %{ $self->conf->{authChoiceModules} } ) {
my @mods my @mods =
= split( /[;\|]/, $self->conf->{authChoiceModules}->{$name} ); split( /[;\|]/, $self->conf->{authChoiceModules}->{$name} );
my $module my $module = '::'
= '::' . [ 'Auth', 'UserDB', 'Password' ]->[$type] . '::'
. [ 'Auth', 'UserDB', 'Password' ]->[$type] . '::' . $mods[$type];
. $mods[$type];
my $over; my $over;
if ( $mods[5] ) { if ( $mods[5] ) {
eval { $over = JSON::from_json( $mods[5] ) }; eval { $over = JSON::from_json( $mods[5] ) };
...@@ -56,12 +55,11 @@ sub init { ...@@ -56,12 +55,11 @@ sub init {
$self->modules->{$name} = $module; $self->modules->{$name} = $module;
$self->logger->debug( $self->logger->debug(
[qw(Authentication User Password)]->[$type] [qw(Authentication User Password)]->[$type]
. " module $name selected" ); . " module $name selected" );
} }
else {