Commit 2bbabb66 authored by Clément OUDOT's avatar Clément OUDOT
Browse files

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

parent 073266f3
......@@ -22,7 +22,7 @@ use URI; # Get metadata URL path
#inherits Lemonldap::NG::Common::Conf::SAML::Metadata protected service_metadata
our @ISA = (qw(Lemonldap::NG::Portal::_Browser));
our $VERSION = '1.9.15';
our $VERSION = '1.9.19';
our $samlCache;
our $initGlibDone;
......@@ -262,9 +262,11 @@ sub loadIDPs {
# Check metadata format
if ( ref $idp_metadata eq "HASH" ) {
$self->abort(
"Metadata for IDP $_ is in old format. Please reload them from Manager"
$self->lmLog(
"Metadata for IDP $_ is in old format. Please reload them from Manager",
'error'
);
next;
}
if ( $self->{samlMetadataForceUTF8} ) {
......@@ -276,7 +278,7 @@ sub loadIDPs {
unless ($result) {
$self->lmLog( "Fail to use IDP $_ Metadata", 'error' );
return 0;
next;
}
# Store IDP entityID and Organization Name
......@@ -304,7 +306,7 @@ sub loadIDPs {
$self->lmLog(
"Unable to set encryption mode $encryption_mode on IDP $_",
'error' );
return 0;
next;
}
$self->lmLog( "Set encryption mode $encryption_mode on IDP $_",
......@@ -361,9 +363,11 @@ sub loadSPs {
# Check metadata format
if ( ref $sp_metadata eq "HASH" ) {
$self->abort(
"Metadata for SP $_ is in old format. Please reload them from Manager"
$self->lmLog(
"Metadata for SP $_ is in old format. Please reload them from Manager",
'error'
);
next;
}
if ( $self->{samlMetadataForceUTF8} ) {
......@@ -375,7 +379,7 @@ sub loadSPs {
unless ($result) {
$self->lmLog( "Fail to use SP $_ Metadata", 'error' );
return 0;
next;
}
# Store SP entityID and Organization Name
......@@ -402,7 +406,7 @@ sub loadSPs {
$self->lmLog(
"Unable to set encryption mode $encryption_mode on SP $_",
'error' );
return 0;
next;
}
$self->lmLog( "Set encryption mode $encryption_mode on SP $_",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment