Ignore error when loading SAML module in AuthChoice (#618)
This commit is contained in:
parent
ebcb10fe69
commit
b7af9ae92c
|
@ -473,19 +473,20 @@ sub new {
|
||||||
return $self;
|
return $self;
|
||||||
}
|
}
|
||||||
|
|
||||||
##@method boolean loadModule(string module)
|
##@method boolean loadModule(string module, boolean ignoreError)
|
||||||
# Load a module into portal namespace
|
# Load a module into portal namespace
|
||||||
# @param module module name
|
# @param module module name
|
||||||
|
# @param ignoreError set to 1 if error should not appear in logs
|
||||||
# @return boolean
|
# @return boolean
|
||||||
sub loadModule {
|
sub loadModule {
|
||||||
my ( $self, $module ) = splice @_;
|
my ( $self, $module, $ignoreError ) = splice @_;
|
||||||
|
|
||||||
return 1 unless $module;
|
return 1 unless $module;
|
||||||
|
|
||||||
# Load module test
|
# Load module test
|
||||||
eval "require $module";
|
eval "require $module";
|
||||||
if ($@) {
|
if ($@) {
|
||||||
$self->lmLog( "$module load error: $@", 'error' );
|
$self->lmLog( "$module load error: $@", 'error' ) unless $ignoreError;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ package Lemonldap::NG::Portal::_Choice;
|
||||||
|
|
||||||
use Lemonldap::NG::Portal::Simple;
|
use Lemonldap::NG::Portal::Simple;
|
||||||
|
|
||||||
our $VERSION = '1.2.0';
|
our $VERSION = '1.3.0';
|
||||||
|
|
||||||
## @cmethod Lemonldap::NG::Portal::_Choice new(Lemonldap::NG::Portal::Simple portal)
|
## @cmethod Lemonldap::NG::Portal::_Choice new(Lemonldap::NG::Portal::Simple portal)
|
||||||
# Constructor
|
# Constructor
|
||||||
|
@ -41,7 +41,7 @@ sub new {
|
||||||
my $samlModule = 'Lemonldap::NG::Portal::AuthSAML';
|
my $samlModule = 'Lemonldap::NG::Portal::AuthSAML';
|
||||||
my $samlForce = 0;
|
my $samlForce = 0;
|
||||||
eval {
|
eval {
|
||||||
$portal->loadModule($samlModule);
|
$portal->loadModule( $samlModule, 1 );
|
||||||
$authForce = $samlModule . '::authForce';
|
$authForce = $samlModule . '::authForce';
|
||||||
$samlForce = $portal->$authForce;
|
$samlForce = $portal->$authForce;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user