dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not stop if one SP or IDP cannot be loaded (#1516)

Browse Source
This commit is contained in:
Clément OUDOT 2018-10-09 19:36:59 +02:00
parent ba9858a61a
commit b8e10222f4
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm
View File

@ -234,8 +234,6 @@ sub loadIDPs {
# Build IDP list for later use in extractFormInfo # Build IDP list for later use in extractFormInfo
$self->idpList( {} ); $self->idpList( {} );
# TODO: QUESTION: do we have to return 0 (<=> block initialization) if one
# IdP load fails ?
foreach ( keys %{ $self->conf->{samlIDPMetaDataXML} } ) { foreach ( keys %{ $self->conf->{samlIDPMetaDataXML} } ) {
$self->logger->debug("Get Metadata for IDP $_"); $self->logger->debug("Get Metadata for IDP $_");
@ -247,7 +245,7 @@ sub loadIDPs {
$self->logger->error( $self->logger->error(
"Metadata for IDP $_ is in old format. Please reload them from Manager" "Metadata for IDP $_ is in old format. Please reload them from Manager"
); );
return 0; next;
} }
if ( $self->conf->{samlMetadataForceUTF8} ) { if ( $self->conf->{samlMetadataForceUTF8} ) {
@ -259,7 +257,7 @@ sub loadIDPs {
unless ($result) { unless ($result) {
$self->logger->error("Fail to use IDP $_ Metadata"); $self->logger->error("Fail to use IDP $_ Metadata");
return 0; next;
} }
# Store IDP entityID and Organization Name # Store IDP entityID and Organization Name
@ -284,8 +282,9 @@ sub loadIDPs {
{ {
$self->logger->error( $self->logger->error(
"Unable to set encryption mode $encryption_mode on IDP $_"); "Unable to set encryption mode $encryption_mode on IDP $_");
return 0; next;
} }
$self->logger->debug("Set encryption mode $encryption_mode on IDP $_");
my $cond = $self->conf->{samlIDPMetaDataOptions}->{$_} my $cond = $self->conf->{samlIDPMetaDataOptions}->{$_}
->{samlIDPMetaDataOptionsResolutionRule}; ->{samlIDPMetaDataOptionsResolutionRule};
@ -294,11 +293,10 @@ sub loadIDPs {
unless ( $cond = $self->p->HANDLER->buildSub($cond) ) { unless ( $cond = $self->p->HANDLER->buildSub($cond) ) {
$self->logger->error( 'SAML IdP rule error: ' $self->logger->error( 'SAML IdP rule error: '
. $self->p->HANDLER->tsv->{jail}->error ); . $self->p->HANDLER->tsv->{jail}->error );
return 0; next;
} }
$self->idpRules->{$entityID} = $cond; $self->idpRules->{$entityID} = $cond;
} }
$self->logger->debug("Set encryption mode $encryption_mode on IDP $_");
$self->logger->debug("IDP $_ added"); $self->logger->debug("IDP $_ added");
} }
@ -332,7 +330,7 @@ sub loadSPs {
$self->logger->error( $self->logger->error(
"Metadata for SP $_ is in old format. Please reload them from Manager" "Metadata for SP $_ is in old format. Please reload them from Manager"
); );
return 0; next;
} }
if ( $self->conf->{samlMetadataForceUTF8} ) { if ( $self->conf->{samlMetadataForceUTF8} ) {
@ -344,7 +342,7 @@ sub loadSPs {
unless ($result) { unless ($result) {
$self->logger->error("Fail to use SP $_ Metadata"); $self->logger->error("Fail to use SP $_ Metadata");
return 0; next;
} }
# Store SP entityID and Organization Name # Store SP entityID and Organization Name
@ -368,8 +366,9 @@ sub loadSPs {
{ {
$self->logger->error( $self->logger->error(
"Unable to set encryption mode $encryption_mode on SP $_"); "Unable to set encryption mode $encryption_mode on SP $_");
return 0; next;
} }
$self->logger->debug("Set encryption mode $encryption_mode on SP $_");
my $rule = $self->conf->{samlSPMetaDataOptions}->{$_} my $rule = $self->conf->{samlSPMetaDataOptions}->{$_}
->{samlSPMetaDataOptionsRule}; ->{samlSPMetaDataOptionsRule};
@ -378,13 +377,11 @@ sub loadSPs {
unless ( $rule = $self->p->HANDLER->buildSub($rule) ) { unless ( $rule = $self->p->HANDLER->buildSub($rule) ) {
$self->logger->error( 'SAML SP rule error: ' $self->logger->error( 'SAML SP rule error: '
. $self->p->HANDLER->tsv->{jail}->error ); . $self->p->HANDLER->tsv->{jail}->error );
return 0; next;
} }
$self->spRules->{$entityID} = $rule; $self->spRules->{$entityID} = $rule;
} }
$self->logger->debug("Set encryption mode $encryption_mode on SP $_");
$self->logger->debug("SP $_ added"); $self->logger->debug("SP $_ added");
} }