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

Allow to use idpName parameter to select IDP (#641)

Browse Source
This commit is contained in:
Clément Oudot 2013-11-05 11:12:36 +00:00
parent 0065f3c510
commit f38607a763
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthSAML.pm
View File

@ -11,7 +11,7 @@ use Lemonldap::NG::Portal::Simple;
use Lemonldap::NG::Portal::_SAML; #inherits use Lemonldap::NG::Portal::_SAML; #inherits
use Lemonldap::NG::Common::Conf::SAML::Metadata; use Lemonldap::NG::Common::Conf::SAML::Metadata;
our $VERSION = '1.2.3'; our $VERSION = '1.3.1';
our @ISA = qw(Lemonldap::NG::Portal::_SAML); our @ISA = qw(Lemonldap::NG::Portal::_SAML);
## @apmethod int authInit() ## @apmethod int authInit()
@ -1148,20 +1148,36 @@ sub authenticate {
sub getIDP { sub getIDP {
my $self = shift; my $self = shift;
my $idp; my $idp;
my $idpName;
my %cookies = fetch CGI::Cookie; my %cookies = fetch CGI::Cookie;
my $idp_cookie = $cookies{ $self->{samlIdPResolveCookie} }; my $idp_cookie = $cookies{ $self->{samlIdPResolveCookie} };
$idp_cookie &&= $idp_cookie->value; $idp_cookie &&= $idp_cookie->value;
# Case 1: Recover IDP from args # Case 1: Recover IDP from idp URL Parameter
unless ( $idp = $self->param("idp") ) { unless ( $idp = $self->param("idp") ) {
# Case 2: Recover IDP from cookie # Case 2: Recover IDP from idpName URL Parameter
if ( $idp = $idp_cookie ) { if ( $idpName = $self->param("idpName") ) {
foreach ( keys %{ $self->{_idpList} } ) {
my $idpConfKey = $self->{_idpList}->{$_}->{confKey};
if ( $idpName eq $idpConfKey ) {
$idp = $_;
$self->lmLog(
"IDP $idp found from idpName URL Parameter ($idpName)",
'debug'
);
last;
}
}
}
# Case 3: Recover IDP from cookie
if ( !$idp and $idp = $idp_cookie ) {
$self->lmLog( "IDP $idp found in IDP resolution cookie", 'debug' ); $self->lmLog( "IDP $idp found in IDP resolution cookie", 'debug' );
} }
# Case 3: check all IDP resolution rules # Case 4: check all IDP resolution rules
# The first match win # The first match win
else { else {
foreach ( keys %{ $self->{_idpList} } ) { foreach ( keys %{ $self->{_idpList} } ) {
@ -1179,7 +1195,7 @@ sub getIDP {
} }
} }
# Case 4: use Common Domain Cookie # Case 5: use Common Domain Cookie
if ( !$idp if ( !$idp
and $self->{samlCommonDomainCookieActivation} and $self->{samlCommonDomainCookieActivation}
and $self->{samlCommonDomainCookieReader} ) and $self->{samlCommonDomainCookieReader} )