environments/ppa-mbqj77/deployments/1
Xavier Guimard 10 years ago
parent e8dac0fe6b
commit 103e3da144
  1. 8
      lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm
  2. 3
      lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
  3. 3
      lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_Choice.pm
  4. 3
      lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_LDAP.pm
  5. 12
      lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_SAML.pm

@ -186,7 +186,7 @@ EOF
: ()
} keys(%$attributes)
};
my $defaultAttr = mydump($defaultValues,'defaultValues');
my $defaultAttr = mydump( $defaultValues, 'defaultValues' );
$defaultAttr = "# This file is generated by $module. Don't modify it by hand
package Lemonldap::NG::Common::Conf::DefaultValues;
@ -224,9 +224,9 @@ $defaultAttr}
( $_ => {@r} );
} keys(%$attributes)
};
$managerAttr = mydump($managerAttr,'attributes');
$managerAttr = mydump( $managerAttr, 'attributes' );
my $managerTypes =
mydump( Lemonldap::NG::Manager::Build::Attributes::types(),'types' );
mydump( Lemonldap::NG::Manager::Build::Attributes::types(), 'types' );
$managerAttr = "# This file is generated by $module. Don't modify it by hand
package Lemonldap::NG::Manager::Attributes;
@ -252,7 +252,7 @@ $managerAttr}
}
sub mydump {
my ($obj, $subname) = @_;
my ( $obj, $subname ) = @_;
my $t = Dumper($obj);
$t =~ s/^\s*(?:use strict;|package .*?;|)\n//gm;
$t =~ s/^\$VAR1\s*=/sub $subname {\n return/;

@ -1736,7 +1736,8 @@ sub controlExistingSession {
return $self->{error} if $self->{error} > 0;
# Collect logout services and build hidden iFrames
if ( $self->{logoutServices} and %{ $self->{logoutServices} } ) {
if ( $self->{logoutServices} and %{ $self->{logoutServices} } )
{
$self->lmLog(
"Create iFrames to forward logout to services",

@ -72,7 +72,8 @@ sub new {
# Find modules associated to authChoice
my ( $auth, $userDB, $passwordDB ) =
split( /[;\|]/, $portal->{authChoiceModules}->{ $portal->{_authChoice} } );
split( /[;\|]/,
$portal->{authChoiceModules}->{ $portal->{_authChoice} } );
if ( $auth and $userDB and $passwordDB ) {

@ -229,8 +229,7 @@ sub userBind {
# @param $ad Active Directory mode
# @return Lemonldap::NG::Portal constant
sub userModifyPassword {
my ( $self, $dn, $newpassword, $confirmpassword, $oldpassword, $ad ) =
@_;
my ( $self, $dn, $newpassword, $confirmpassword, $oldpassword, $ad ) = @_;
my $ppolicyControl = $self->{portal}->{ldapPpolicyControl};
my $setPassword = $self->{portal}->{ldapSetPassword};
my $asUser = $self->{portal}->{ldapChangePasswordAsUser};

@ -398,8 +398,7 @@ sub loadSPs {
# @param profile_type login or logout
# @return ( $request, $response, $method, $relaystate, $artifact )
sub checkMessage {
my ( $self, $url, $request_method, $content_type, $profile_type ) =
@_;
my ( $self, $url, $request_method, $content_type, $profile_type ) = @_;
$profile_type ||= "login";
my ( $request, $response, $message, $method, $relaystate, $artifact );
@ -674,8 +673,7 @@ sub addAA {
# @param ca_cert_chain optional ca cert chain
# @return boolean result
sub addProvider {
my ( $self, $server, $role, $metadata, $public_key, $ca_cert_chain ) =
@_;
my ( $self, $server, $role, $metadata, $public_key, $ca_cert_chain ) = @_;
return 0
unless ( $server->isa("Lasso::Server")
@ -1275,8 +1273,7 @@ sub getAssertion {
# @param force_utf8 optional flag to force value in UTF-8
# @return attribute value
sub getAttributeValue {
my ( $self, $name, $format, $friendly_name, $attributes, $force_utf8 ) =
@_;
my ( $self, $name, $format, $friendly_name, $attributes, $force_utf8 ) = @_;
my $value;
# Loop on attributes
@ -2425,8 +2422,7 @@ sub sendLogoutResponseToServiceProvider {
# @param $relayState Relay State for SLO status
# @return int Number of concerned providers.
sub sendLogoutRequestToProvider {
my ( $self, $logout, $providerID, $method, $relay, $relayState ) =
@_;
my ( $self, $logout, $providerID, $method, $relay, $relayState ) = @_;
my $server = $self->{_lassoServer};
my $info;

Loading…
Cancel
Save