Bug with samlIDPMetaDataOptions upload and use make tidy

modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm

@@ -187,37 +187,37 @@ sub getLocalConf {
     # First, search if this file has been parsed
     unless ( $cfg = $configFiles->{$file} ) {
 
-    # If default configuration cannot be read
+        # If default configuration cannot be read
-    # - Error if configuration section is requested
+        # - Error if configuration section is requested
-    # - Silent exit for other section requests
+        # - Silent exit for other section requests
-    unless ( -r $file ) {
+        unless ( -r $file ) {
-        if ( $section eq CONFSECTION ) {
+            if ( $section eq CONFSECTION ) {
                 $msg =
                   "Cannot read $file to get configuration access parameters.";
+                return 0;
+            }
             return 0;
         }
-            return 0;
-    }
 
-    # Parse ini file
+        # Parse ini file
         $cfg = Config::IniFiles->new( -file => $file, -allowcontinue => 1 );
 
-    unless ( defined $cfg ) {
+        unless ( defined $cfg ) {
-        $msg = "Local config error: " . @Config::IniFiles::errors;
+            $msg = "Local config error: " . @Config::IniFiles::errors;
-        return 0;
+            return 0;
-    }
+        }
 
-    # Check if default section exists
+        # Check if default section exists
-    unless ( $cfg->SectionExists(DEFAULTSECTION) ) {
+        unless ( $cfg->SectionExists(DEFAULTSECTION) ) {
             $msg = "Default section (" . DEFAULTSECTION . ") is missing.";
-        return 0;
+            return 0;
-    }
+        }
 
-    # Check if configuration section exists
+        # Check if configuration section exists
-    if ( $section eq CONFSECTION and !$cfg->SectionExists(CONFSECTION) ) {
+        if ( $section eq CONFSECTION and !$cfg->SectionExists(CONFSECTION) ) {
             $msg = "Configuration section (" . CONFSECTION . ") is missing.";
-        return 0;
+            return 0;
-    }
+        }
         $configFiles->{$file} = $cfg;
     }
 

modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm

@@ -37,7 +37,7 @@ our @EXPORT;
 
 # Shared variables
 our (
-    $locationRegexp,       $locationCondition, $defaultCondition,
+    $locationRegexp,     $locationCondition,   $defaultCondition,
     $locationProtection, $defaultProtection,   $forgeHeaders,
     $apacheRequest,      $locationCount,       $cookieName,
     $datas,              $globalStorage,       $globalStorageOptions,
@@ -567,12 +567,12 @@ sub conditionSub {
             eval 'use Apache2::Filter' unless ( $INC{"Apache2/Filter.pm"} );
             return (
                 sub {
-                $apacheRequest->add_output_filter(
+                    $apacheRequest->add_output_filter(
-                    sub {
+                        sub {
-                        return $class->redirectFilter( $u, @_ );
+                            return $class->redirectFilter( $u, @_ );
-                    }
+                        }
-                );
+                    );
-                1;
+                    1;
                 },
                 1
             );
@@ -582,18 +582,18 @@ sub conditionSub {
             my $u = $1 || $class->portal();
             return (
                 sub {
-                $class->localUnlog;
+                    $class->localUnlog;
-                $apacheRequest->add_output_filter(
+                    $apacheRequest->add_output_filter(
-                    sub {
+                        sub {
-                        return $class->redirectFilter(
+                            return $class->redirectFilter(
-                            $class->portal() . "?url="
+                                $class->portal() . "?url="
-                              . $class->encodeUrl($u)
+                                  . $class->encodeUrl($u)
-                              . "&logout=1",
+                                  . "&logout=1",
-                            @_
+                                @_
-                        );
+                            );
-                    }
+                        }
-                );
+                    );
-                1;
+                    1;
                 },
                 1
             );

modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Uploader.pm

@@ -139,10 +139,13 @@ sub confUpload {
     }    # END LOOP
 
     # 1.4 Loading unchanged parameters (ajax nodes not open)
+    $self->lmLog( "Save unchanged parameters", 'debug' );
     foreach ( @{ $result->getChildrenByTagName('ignore') } ) {
         my $node = $_->getAttribute('value');
         $node =~ s/^.*node=(.*?)(?:&.*)?\}$/$1/;
+        $self->lmLog( "Unchanged node $node", 'debug' );
         foreach my $k ( $self->findAllConfKeys( $self->corresp($node) ) ) {
+            $self->lmLog( "Unchanged key $k (node $node)", 'debug' );
             my $v = $self->keyToH( $k, $self->conf );
             $v = $self->keyToH( $k, $self->defaultConf ) unless ( defined $v );
             if ( defined $v ) {
@@ -307,6 +310,7 @@ sub findAllConfKeys {
     }
     foreach my $n ( @{ $h->{_nodes} } ) {
         $n =~ s/^.*?:(.*?)(?:\:.*)?$/$1/;
+        $self->lmLog( "findAllConfKey: got node $n", 'debug' );
         if ( ref( $h->{$n} ) ) {
             push @res, $self->findAllConfKeys( $h->{$n} );
         }

modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm

@@ -294,9 +294,9 @@ sub struct {
             _nodes => [
 'nhash:/samlIDPMetaDataExportedAttributes:samlIDPMetaDataNode:samlMetaData'
             ],
-            _upload => ['/samlIDPMetaDataXML'],
+            _upload => [ '/samlIDPMetaDataXML', '/samlIDPMetaDataOptions' ],
             _help   => 'default',
-            _call   => '$(\'#newsamlmetadatab\').show();',
+            _call => '$(\'#newsamlmetadatab\').show();',
         },
 
         samlServiceMetaData => {
@@ -818,6 +818,16 @@ sub defaultConf {
         samlIDPMetaDataXML => { 'authentic' => {} },
         samlIDPMetaDataExportedAttributes =>
           { 'authentic' => { 'uid' => '0;uid;;' } },
+        samlIDPMetaDataOptions => {
+            'authentic' => {
+                'samlIDPMetaDataOptionsNameIDFormat'      => '',
+                'samlIDPMetaDataOptionsForceAuthn'        => '0',
+                'samlIDPMetaDataOptionsAllowProxiedAuthn' => '1',
+                'samlIDPMetaDataOptionsSSOBinding'        => '',
+                'samlIDPMetaDataOptionsSLOBinding'        => '',
+                'samlIDPMetaDataOptionsResolutionRule'    => '',
+            }
+        },
         samlServicePrivateKey       => '',
         samlEntityID                => 'http://auth.example.com/saml/metadata',
         samlOrganizationDisplayName => 'Example',

modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm

@@ -125,12 +125,12 @@ sub en {
         virtualHosts                => 'Virtual Hosts',
         whatToTrace                 => "REMOTE_USER environment variable",
 
-        saml                              => 'SAML',
+        saml                               => 'SAML',
-        samlServicePrivateKey             => 'Private Key',
+        samlServicePrivateKey              => 'Private Key',
-        samlIDPMetaDataNode               => 'Identity providers',
+        samlIDPMetaDataNode                => 'Identity providers',
-        samlIDPMetaDataXML                => 'Metadata XML',
+        samlIDPMetaDataXML                 => 'Metadata XML',
-        samlIDPMetaDataExportedAttributes => 'Exported attributes',
+        samlIDPMetaDataExportedAttributes  => 'Exported attributes',
-        samlIDPMetaDataOptions            => 'Options',
+        samlIDPMetaDataOptions             => 'Options',
         samlIDPMetaDataOptionsNameIDFormat => 'NameID format',
         samlIDPMetaDataOptionsForceAuthn   => 'Force authentication',
         samlIDPMetaDataOptionsAllowProxiedAuthn =>
@@ -138,13 +138,13 @@ sub en {
         samlIDPMetaDataOptionsSSOBinding     => 'SSO binding',
         samlIDPMetaDataOptionsSLOBinding     => 'SLO binding',
         samlIDPMetaDataOptionsResolutionRule => 'Resolution rule',
-        samlServiceMetaData               => 'SAML 2 Service',
+        samlServiceMetaData                  => 'SAML 2 Service',
-        samlEntityID                      => 'Entity Identifier',
+        samlEntityID                         => 'Entity Identifier',
-        samlOrganization                  => 'Organization',
+        samlOrganization                     => 'Organization',
-        samlOrganizationDisplayName       => 'Display Name',
+        samlOrganizationDisplayName          => 'Display Name',
-        samlOrganizationName              => 'Name',
+        samlOrganizationName                 => 'Name',
-        samlOrganizationURL               => 'URL',
+        samlOrganizationURL                  => 'URL',
-        samlSPSSODescriptor               => 'Service Provider',
+        samlSPSSODescriptor                  => 'Service Provider',
         samlSPSSODescriptorAuthnRequestsSigned =>
           'Signed Authentication Request',
         samlSPSSODescriptorProtocolSupportEnumeration => 'Protocol',
@@ -270,12 +270,12 @@ sub fr {
         virtualHosts => 'Hôtes virtuels',
         whatToTrace  => "Variable d'environnement REMOTE_USER",
 
-        saml                              => 'SAML',
+        saml                               => 'SAML',
-        samlServicePrivateKey             => 'Clé privée',
+        samlServicePrivateKey              => 'Clé privée',
-        samlIDPMetaDataNode               => 'Fournisseurs d\'identités',
+        samlIDPMetaDataNode                => 'Fournisseurs d\'identités',
-        samlIDPMetaDataXML                => 'XML Metadata',
+        samlIDPMetaDataXML                 => 'XML Metadata',
-        samlIDPMetaDataExportedAttributes => 'Attributs exportés',
+        samlIDPMetaDataExportedAttributes  => 'Attributs exportés',
-        samlIDPMetaDataOptions            => 'Options',
+        samlIDPMetaDataOptions             => 'Options',
         samlIDPMetaDataOptionsNameIDFormat => 'Format NameID',
         samlIDPMetaDataOptionsForceAuthn   => 'Authentification forcée',
         samlIDPMetaDataOptionsAllowProxiedAuthn =>
@@ -283,13 +283,13 @@ sub fr {
         samlIDPMetaDataOptionsSSOBinding     => 'Méthode SSO',
         samlIDPMetaDataOptionsSLOBinding     => 'Méthode SLO',
         samlIDPMetaDataOptionsResolutionRule => 'Règle de résolution',
-        samlServiceMetaData               => 'Service SAML 2',
+        samlServiceMetaData                  => 'Service SAML 2',
-        samlEntityID                      => 'Identifiant d\'entité',
+        samlEntityID                         => 'Identifiant d\'entité',
-        samlOrganization                  => 'Organisation',
+        samlOrganization                     => 'Organisation',
-        samlOrganizationDisplayName       => 'Nom affiché',
+        samlOrganizationDisplayName          => 'Nom affiché',
-        samlOrganizationName              => 'Nom',
+        samlOrganizationName                 => 'Nom',
-        samlOrganizationURL               => 'URL',
+        samlOrganizationURL                  => 'URL',
-        samlSPSSODescriptor               => 'Fournisseur de service',
+        samlSPSSODescriptor                  => 'Fournisseur de service',
         samlSPSSODescriptorAuthnRequestsSigned =>
           'Requête d\'authentification signé',
         samlSPSSODescriptorProtocolSupportEnumeration => 'Protocole',

modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthSAML.pm

@@ -855,7 +855,7 @@ sub extractFormInfo {
     my $nameIDFormat =
       $self->{samlIDPMetaDataOptions}->{$idp}
       ->{samlIDPMetaDataOptionsNameIDFormat};
-    $nameIDFormat ||= "transient"; # Default to transient
+    $nameIDFormat ||= "transient";    # Default to transient
     $nameIDFormat = $self->getNameIDFormat($nameIDFormat) if $nameIDFormat;
 
     # IDP HTTP method
@@ -1027,7 +1027,7 @@ sub authenticate {
 # Logout SP
 # @return nothing
 sub authLogout {
-    my $self = shift;
+    my $self        = shift;
     my $idp         = $self->{sessionInfo}->{_idp};
     my $IDPentityID = $self->{sessionInfo}->{_idpEntityID};
     my $method;