Commit 80f5d06e authored by dcoutadeur dcoutadeur's avatar dcoutadeur dcoutadeur
Browse files

perl tidy

parent 6533b0a3
...@@ -212,7 +212,9 @@ sub getConf { ...@@ -212,7 +212,9 @@ sub getConf {
# Create cipher object # Create cipher object
unless ( $args->{raw} ) { unless ( $args->{raw} ) {
eval { $res->{cipher} = Lemonldap::NG::Common::Crypto->new( $res->{key} ); }; eval {
$res->{cipher} = Lemonldap::NG::Common::Crypto->new( $res->{key} );
};
if ($@) { if ($@) {
$msg .= "Bad key: $@. \n"; $msg .= "Bad key: $@. \n";
} }
......
...@@ -475,7 +475,7 @@ sub _casMetaDataNodes { ...@@ -475,7 +475,7 @@ sub _casMetaDataNodes {
# Return all exported attributes if asked # Return all exported attributes if asked
if ( $query =~ if ( $query =~
/^(?:cas${type}MetaDataExportedVars|casSrvMetaDataOptionsProxiedServices)$/ /^(?:cas${type}MetaDataExportedVars|casSrvMetaDataOptionsProxiedServices)$/
) )
{ {
my $pk = eval { $self->getConfKey( $req, $query )->{$partner} } // {}; my $pk = eval { $self->getConfKey( $req, $query )->{$partner} } // {};
......
...@@ -105,7 +105,8 @@ sub unset_header_in { ...@@ -105,7 +105,8 @@ sub unset_header_in {
my $h = shift; my $h = shift;
my $h2 = lc $h; my $h2 = lc $h;
$h2 =~ s/-/_/g; $h2 =~ s/-/_/g;
$request->env->{'psgi.r'}->headers_in->unset($h) if ( $h1 eq $h2 ); $request->env->{'psgi.r'}->headers_in->unset($h)
if ( $h1 eq $h2 );
return 1; return 1;
} }
); );
......
...@@ -104,10 +104,12 @@ sub init { ...@@ -104,10 +104,12 @@ sub init {
} }
$self->menuLinks( [] ); $self->menuLinks( [] );
if ( my $portal = if (
my $portal =
$conf->{cfgNum} $conf->{cfgNum}
? Lemonldap::NG::Handler::PSGI::Main->tsv->{portal}->() ? Lemonldap::NG::Handler::PSGI::Main->tsv->{portal}->()
: $conf->{portal} ) : $conf->{portal}
)
{ {
push @{ $self->menuLinks }, push @{ $self->menuLinks },
{ {
......
...@@ -370,9 +370,10 @@ sub attributes { ...@@ -370,9 +370,10 @@ sub attributes {
documentation => 'Show error if session is expired', documentation => 'Show error if session is expired',
}, },
portalErrorOnMailNotFound => { portalErrorOnMailNotFound => {
type => 'bool', type => 'bool',
default => 0, default => 0,
documentation => 'Show error if mail is not found in password reset process', documentation =>
'Show error if mail is not found in password reset process',
}, },
portalOpenLinkInNewWindow => { portalOpenLinkInNewWindow => {
type => 'bool', type => 'bool',
...@@ -2699,7 +2700,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?: ...@@ -2699,7 +2700,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
oidcRPMetaDataOptionsBypassConsent => oidcRPMetaDataOptionsBypassConsent =>
{ type => 'bool', help => 'openidconnectclaims.html', default => 0 }, { type => 'bool', help => 'openidconnectclaims.html', default => 0 },
oidcRPMetaDataOptionsPostLogoutRedirectUris => { type => 'text', }, oidcRPMetaDataOptionsPostLogoutRedirectUris => { type => 'text', },
oidcRPMetaDataOptionsLogoutUrl => { oidcRPMetaDataOptionsLogoutUrl => {
type => 'url', type => 'url',
documentation => 'Logout URL', documentation => 'Logout URL',
}, },
......
...@@ -172,19 +172,20 @@ sub tree { ...@@ -172,19 +172,20 @@ sub tree {
title => 'dbiPassword', title => 'dbiPassword',
help => 'authdbi.html#password', help => 'authdbi.html#password',
form => 'simpleInputContainer', form => 'simpleInputContainer',
nodes => ['dbiAuthPasswordHash', nodes => [
{ 'dbiAuthPasswordHash',
title => 'dbiDynamicHash', {
help => 'authdbi.html#password', title => 'dbiDynamicHash',
form => 'simpleInputContainer', help => 'authdbi.html#password',
nodes => [ form => 'simpleInputContainer',
'dbiDynamicHashEnabled', nodes => [
'dbiDynamicHashValidSchemes', 'dbiDynamicHashEnabled',
'dbiDynamicHashValidSaltedSchemes', 'dbiDynamicHashValidSchemes',
'dbiDynamicHashNewPasswordScheme' 'dbiDynamicHashValidSaltedSchemes',
] 'dbiDynamicHashNewPasswordScheme'
} ]
] }
]
} }
] ]
}, },
......
...@@ -473,10 +473,13 @@ sub _scanNodes { ...@@ -473,10 +473,13 @@ sub _scanNodes {
} }
} }
elsif ( $target =~ elsif ( $target =~
/^(?:$casSrvMetaDataNodeKeys|$casAppMetaDataNodeKeys)/o ) /^(?:$casSrvMetaDataNodeKeys|$casAppMetaDataNodeKeys)/o
)
{ {
$self->set( $optKey, [ $oldName, $key ], $self->set(
$target, $leaf->{data} ); $optKey, [ $oldName, $key ],
$target, $leaf->{data}
);
} }
else { else {
push @{ $self->errors }, push @{ $self->errors },
......
...@@ -315,8 +315,8 @@ sub tests { ...@@ -315,8 +315,8 @@ sub tests {
my %entityIds; my %entityIds;
foreach my $spId ( keys %{ $conf->{samlSPMetaDataXML} } ) { foreach my $spId ( keys %{ $conf->{samlSPMetaDataXML} } ) {
unless ( unless (
$conf->{samlSPMetaDataXML}->{$spId}->{samlSPMetaDataXML} $conf->{samlSPMetaDataXML}->{$spId}->{samlSPMetaDataXML} =~
=~ /entityID=(['"])(.+?)\1/si ) /entityID=(['"])(.+?)\1/si )
{ {
push @msg, "$spId SAML metadata has no EntityID"; push @msg, "$spId SAML metadata has no EntityID";
$res = 0; $res = 0;
......
...@@ -78,7 +78,8 @@ sub extractFormInfo { ...@@ -78,7 +78,8 @@ sub extractFormInfo {
# another backend (Combination) # another backend (Combination)
# switch to another backend # switch to another backend
elsif ( defined $req->param('kerberos') ) { elsif ( defined $req->param('kerberos') ) {
$self->userLogger->warn('Kerberos authentication has failed, back to portal'); $self->userLogger->warn(
'Kerberos authentication has failed, back to portal');
return PE_BADCREDENTIALS; return PE_BADCREDENTIALS;
} }
...@@ -110,16 +111,11 @@ sub extractFormInfo { ...@@ -110,16 +111,11 @@ sub extractFormInfo {
$ENV{KRB5_KTNAME} = $self->keytab; $ENV{KRB5_KTNAME} = $self->keytab;
my $gss_client_name; my $gss_client_name;
my $status = GSSAPI::Context::accept( my $status = GSSAPI::Context::accept(
my $server_context, my $server_context, GSS_C_NO_CREDENTIAL,
GSS_C_NO_CREDENTIAL, $data, GSS_C_NO_CHANNEL_BINDINGS,
$data, $gss_client_name, undef,
GSS_C_NO_CHANNEL_BINDINGS, my $gss_output_token, my $out_flags,
$gss_client_name, my $out_time, my $gss_delegated_cred
undef,
my $gss_output_token,
my $out_flags,
my $out_time,
my $gss_delegated_cred
); );
unless ($status) { unless ($status) {
$self->logger->error('Unable to accept security context'); $self->logger->error('Unable to accept security context');
......
...@@ -331,7 +331,7 @@ sub validateST { ...@@ -331,7 +331,7 @@ sub validateST {
my $proxy_url; my $proxy_url;
if (%$proxied) { if (%$proxied) {
$proxy_url = $self->p->fullUrl($req); $proxy_url = $self->p->fullUrl($req);
die if($proxy_url =~ /casProxy=1/); die if ( $proxy_url =~ /casProxy=1/ );
$proxy_url .= ( $proxy_url =~ /\?/ ? '&' : '?' ) . 'casProxy=1'; $proxy_url .= ( $proxy_url =~ /\?/ ? '&' : '?' ) . 'casProxy=1';
if ( $self->conf->{authChoiceParam} if ( $self->conf->{authChoiceParam}
and my $tmp = $req->param( $self->conf->{authChoiceParam} ) ) and my $tmp = $req->param( $self->conf->{authChoiceParam} ) )
......
...@@ -95,30 +95,29 @@ sub get_password { ...@@ -95,30 +95,29 @@ sub get_password {
my $table = $self->conf->{dbiAuthTable}; my $table = $self->conf->{dbiAuthTable};
my $loginCol = $self->conf->{dbiAuthLoginCol}; my $loginCol = $self->conf->{dbiAuthLoginCol};
my $passwordCol = $self->conf->{dbiAuthPasswordCol}; my $passwordCol = $self->conf->{dbiAuthPasswordCol};
my @rows = (); my @rows = ();
eval { eval {
my $sth = $dbh->prepare( my $sth =
"SELECT $passwordCol FROM $table WHERE $loginCol=?" $dbh->prepare( "SELECT $passwordCol FROM $table WHERE $loginCol=?" );
); $sth->execute($user);
$sth->execute( $user);
@rows = $sth->fetchrow_array(); @rows = $sth->fetchrow_array();
}; };
if ($@) { if ($@) {
$self->lmLog( "DBI error while getting password: $@", 'error' ); $self->lmLog( "DBI error while getting password: $@", 'error' );
return ""; return "";
} }
if ( @rows == 1 ) { if ( @rows == 1 ) {
$self->logger->debug( "Successfully got password from database" ); $self->logger->debug("Successfully got password from database");
return $rows[0]; return $rows[0];
} }
else { else {
$self->userLogger->warn( "Unable to check password for $user" ); $self->userLogger->warn("Unable to check password for $user");
return ""; return "";
} }
} }
## @method protected Lemonldap::NG::Portal::_DBI hash_password_from_database ## @method protected Lemonldap::NG::Portal::_DBI hash_password_from_database
## (ref dbh, string dbmethod, string dbsalt, string password) ## (ref dbh, string dbmethod, string dbsalt, string password)
# Hash the given password calling the dbmethod function in database # Hash the given password calling the dbmethod function in database
...@@ -128,17 +127,18 @@ sub get_password { ...@@ -128,17 +127,18 @@ sub get_password {
# @param password the password to hash # @param password the password to hash
# @return hashed password # @return hashed password
sub hash_password_from_database { sub hash_password_from_database {
# Remark: database function must get hexadecimal input # Remark: database function must get hexadecimal input
# and send back hexadecimal output # and send back hexadecimal output
my $self = shift; my $self = shift;
my $dbh = shift; my $dbh = shift;
my $dbmethod = shift; my $dbmethod = shift;
my $dbsalt = shift; my $dbsalt = shift;
my $password = shift; my $password = shift;
# convert password to hexa # convert password to hexa
my $passwordh = unpack "H*", $password; my $passwordh = unpack "H*", $password;
my @rows = (); my @rows = ();
eval { eval {
my $sth = $dbh->prepare("SELECT $dbmethod('$passwordh$dbsalt')"); my $sth = $dbh->prepare("SELECT $dbmethod('$passwordh$dbsalt')");
...@@ -146,67 +146,71 @@ sub hash_password_from_database { ...@@ -146,67 +146,71 @@ sub hash_password_from_database {
@rows = $sth->fetchrow_array(); @rows = $sth->fetchrow_array();
}; };
if ($@) { if ($@) {
$self->lmLog( "DBI error while hashing with '$dbmethod' hash function: $@", 'error' ); $self->lmLog(
$self->userLogger->warn( "Unable to check password" ); "DBI error while hashing with '$dbmethod' hash function: $@",
'error' );
$self->userLogger->warn("Unable to check password");
return ""; return "";
} }
if ( @rows == 1 ) { if ( @rows == 1 ) {
$self->logger->debug( "Successfully hashed password with $dbmethod hash function in database" ); $self->logger->debug(
"Successfully hashed password with $dbmethod hash function in database"
);
# convert salt to binary # convert salt to binary
my $dbsaltb = pack 'H*', $dbsalt; my $dbsaltb = pack 'H*', $dbsalt;
# convert result to binary # convert result to binary
my $res = pack 'H*', $rows[0]; my $res = pack 'H*', $rows[0];
return encode_base64($res . $dbsaltb ,''); return encode_base64( $res . $dbsaltb, '' );
} }
else { else {
$self->userLogger->warn( "Unable to check password with '$dbmethod'" ); $self->userLogger->warn("Unable to check password with '$dbmethod'");
return ""; return "";
} }
# Return encode_base64(SQL_METHOD(password + salt) + salt) # Return encode_base64(SQL_METHOD(password + salt) + salt)
} }
## @method protected Lemonldap::NG::Portal::_DBI get_salt(string dbhash) ## @method protected Lemonldap::NG::Portal::_DBI get_salt(string dbhash)
# Return salt from salted hash password # Return salt from salted hash password
# @param dbhash hash password # @param dbhash hash password
# @return extracted salt # @return extracted salt
sub get_salt { sub get_salt {
my $self = shift; my $self = shift;
my $dbhash = shift; my $dbhash = shift;
my $dbsalt; my $dbsalt;
# get rid of scheme ({sha256}) # get rid of scheme ({sha256})
$dbhash =~ s/^\{[^}]+\}(.*)$/$1/; $dbhash =~ s/^\{[^}]+\}(.*)$/$1/;
# get binary hash # get binary hash
my $decoded = &decode_base64($dbhash); my $decoded = &decode_base64($dbhash);
# get last 8 bytes # get last 8 bytes
$dbsalt = substr $decoded, -8; $dbsalt = substr $decoded, -8;
# get hexadecimal version of salt # get hexadecimal version of salt
$dbsalt = unpack "H*", $dbsalt; $dbsalt = unpack "H*", $dbsalt;
return $dbsalt; return $dbsalt;
} }
## @method protected Lemonldap::NG::Portal::_DBI gen_salt() ## @method protected Lemonldap::NG::Portal::_DBI gen_salt()
# Generate 8 bytes of hexadecimal random salt # Generate 8 bytes of hexadecimal random salt
# @return generated salt # @return generated salt
sub gen_salt { sub gen_salt {
my $self = shift; my $self = shift;
my $dbsalt; my $dbsalt;
my @set = ('0' ..'9', 'A' .. 'F'); my @set = ( '0' .. '9', 'A' .. 'F' );
$dbsalt = join '' => map $set[rand @set], 1 .. 16; $dbsalt = join '' => map $set[ rand @set ], 1 .. 16;
return $dbsalt; return $dbsalt;
} }
## @method protected Lemonldap::NG::Portal::_DBI dynamic_hash_password(ref dbh, ## @method protected Lemonldap::NG::Portal::_DBI dynamic_hash_password(ref dbh,
## string user, string password, string table, string loginCol, string passwordCol) ## string user, string password, string table, string loginCol, string passwordCol)
# Return hashed password for use in SQL statement # Return hashed password for use in SQL statement
...@@ -218,76 +222,88 @@ sub gen_salt { ...@@ -218,76 +222,88 @@ sub gen_salt {
# @param passwordCol name of the row containing the password # @param passwordCol name of the row containing the password
# @return hashed password # @return hashed password
sub dynamic_hash_password { sub dynamic_hash_password {
my $self = shift; my $self = shift;
my $dbh = shift; my $dbh = shift;
my $user = shift; my $user = shift;
my $password = shift; my $password = shift;
my $table = shift; my $table = shift;
my $loginCol = shift; my $loginCol = shift;
my $passwordCol = shift; my $passwordCol = shift;
# Authorized hash schemes and salted hash schemes # Authorized hash schemes and salted hash schemes
my @validSchemes = split / /, $self->conf->{dbiDynamicHashValidSchemes}; my @validSchemes = split / /, $self->conf->{dbiDynamicHashValidSchemes};
my @validSaltedSchemes = split / /, $self->conf->{dbiDynamicHashValidSaltedSchemes}; my @validSaltedSchemes = split / /,
$self->conf->{dbiDynamicHashValidSaltedSchemes};
my $dbhash; # hash currently stored in database
my $dbscheme; # current hash scheme stored in database my $dbhash; # hash currently stored in database
my $dbmethod; # static hash method corresponding to a database function my $dbscheme; # current hash scheme stored in database
my $dbsalt; # current salt stored in database my $dbmethod; # static hash method corresponding to a database function
my $hash; # hash to compute from user password my $dbsalt; # current salt stored in database
my $hash; # hash to compute from user password
# Search hash from database # Search hash from database
$self->logger->debug( "Hash scheme is to be found in database" ); $self->logger->debug("Hash scheme is to be found in database");
$dbhash = $self->get_password($dbh, $user, $table, $loginCol, $passwordCol); $dbhash =
$self->get_password( $dbh, $user, $table, $loginCol, $passwordCol );
# Get the scheme # Get the scheme
$dbscheme = $dbhash; $dbscheme = $dbhash;
$dbscheme =~ s/^\{([^}]+)\}.*/$1/; $dbscheme =~ s/^\{([^}]+)\}.*/$1/;
$dbscheme = "" if $dbscheme eq $dbhash; $dbscheme = "" if $dbscheme eq $dbhash;
# no hash scheme => assume clear text # no hash scheme => assume clear text
if($dbscheme eq "") { if ( $dbscheme eq "" ) {
$self->logger->info( "Password has no hash scheme" ); $self->logger->info("Password has no hash scheme");
return "?"; return "?";
} }
# salted hash scheme # salted hash scheme
elsif(grep( /^$dbscheme$/, @validSaltedSchemes )) { elsif ( grep( /^$dbscheme$/, @validSaltedSchemes ) ) {
$self->logger->info( "Valid salted hash scheme: $dbscheme found for user $user" ); $self->logger->info(
"Valid salted hash scheme: $dbscheme found for user $user");
# extract non salted hash scheme # extract non salted hash scheme
$dbmethod = $dbscheme; $dbmethod = $dbscheme;
$dbmethod =~ s/^s//i; $dbmethod =~ s/^s//i;
# extract the salt # extract the salt
$dbsalt = $self->get_salt($dbhash); $dbsalt = $self->get_salt($dbhash);
$self->logger->debug( "Get salt from password: $dbsalt"); $self->logger->debug("Get salt from password: $dbsalt");
# Hash password with given hash scheme and salt # Hash password with given hash scheme and salt
$hash = $self->hash_password_from_database($dbh, $dbmethod, $dbsalt, $password); $hash =
$self->hash_password_from_database( $dbh, $dbmethod, $dbsalt,
$password );
$hash = "{$dbscheme}$hash"; $hash = "{$dbscheme}$hash";
return "'$hash'"; return "'$hash'";
} }
# static hash scheme # static hash scheme
elsif(grep( /^$dbscheme$/, @validSchemes )) { elsif ( grep( /^$dbscheme$/, @validSchemes ) ) {
$self->logger->info( "Valid hash scheme: $dbscheme found for user $user" ); $self->logger->info(
"Valid hash scheme: $dbscheme found for user $user");
# Hash given password with given hash scheme and no salt # Hash given password with given hash scheme and no salt
$hash = $self->hash_password_from_database($dbh, $dbscheme, "", $password); $hash =