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

Bad \Q \E usage (#595)

Browse Source
This commit is contained in:
Xavier Guimard 2016-11-29 05:43:46 +00:00
parent e5fdcbc3fd
commit abb61affe0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/SAML.pm
View File

@ -39,7 +39,7 @@ sub init {
my $saml_acs_get_url = $self->getMetaDataURL(
"samlSPSSODescriptorAssertionConsumerServiceHTTPRedirect");
$self->sloAssConsumerRe(
qr/^\Q($saml_acs_art_url|$saml_acs_post_url|$saml_acs_get_url)\E$/i);
qr/^($saml_acs_art_url|$saml_acs_post_url|$saml_acs_get_url)$/i);
my $saml_slo_soap_url =
$self->getMetaDataURL( "samlSPSSODescriptorSingleLogoutServiceSOAP", 1 );
my $saml_slo_soap_url_ret =
@ -55,12 +55,12 @@ sub init {
$self->getMetaDataURL( "samlSPSSODescriptorSingleLogoutServiceHTTPPost",
2 );
$self->sloRe(
qr/^\Q($saml_slo_soap_url|$saml_slo_soap_url_ret|$saml_slo_get_url|$saml_slo_get_url_ret|$saml_slo_post_url|$saml_slo_post_url_ret)\E$/i
qr/^($saml_slo_soap_url|$saml_slo_soap_url_ret|$saml_slo_get_url|$saml_slo_get_url_ret|$saml_slo_post_url|$saml_slo_post_url_ret)$/i
);
my $saml_ars_url = $self->getMetaDataURL(
"samlSPSSODescriptorArtifactResolutionServiceArtifact");
$self->artRe(qr/^(\Q$saml_ars_url\E)$/i);
$self->artRe(qr/^($saml_ars_url)$/i);
# Load SAML service and SAML IdP list
return ( $self->SUPER::init and $self->loadIDPs );
@ -478,7 +478,7 @@ sub extractFormInfo {
}
if ( $req->urldc
and $self->conf->{portal} !~ /\Q$req->{urldc}\E\/?/ )
and $self->conf->{portal} !~ /$req->{urldc}\/?/ )
{
$req->steps( [] );
return PE_OK;

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

@ -1200,7 +1200,7 @@ sub getAttributeValue {
$value .= $content . $self->conf->{multiValuesSeparator}
if $content;
}
$value =~ s/\Q$self->{conf}->{multiValuesSeparator}\E$//;
$value =~ s/$self->{conf}->{multiValuesSeparator}$//;
# Encode UTF-8 if force_utf8 flag
$value = encode( "utf8", $value ) if $force_utf8;

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Process.pm
View File

@ -341,7 +341,7 @@ sub setLocalGroups {
# Clear values separator at the beginning
if ( $req->{sessionInfo}->{groups} ) {
$req->{sessionInfo}->{groups} =~
s/^\Q$self->conf->{multiValuesSeparator}\E//o;
s/^$self->conf->{multiValuesSeparator}//o;
}
PE_OK;
}