From 825c8d05f0198a3403c630bb0263d09649d72a5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Mon, 15 Mar 2010 15:07:19 +0000
Subject: [PATCH] Manager: SSL parameters

---
 .../lib/Lemonldap/NG/Manager/_Struct.pm           | 15 ++++++++++++---
 .../lib/Lemonldap/NG/Manager/_i18n.pm             |  8 ++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
index 23cc1d96f..875bf4ab2 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
@@ -153,7 +153,7 @@ sub struct {
                     {
                         my $tmp = {
                             ldap => ['ldapParams'],
-                            ssl  => [qw(ldapParams SSLRequired)],
+                            ssl     => [qw(ldapParams sslParams)],
                             openid => ['openIdParams'],
                             twitter => ['twitterParams'],
                         }->{$mod};
@@ -228,7 +228,12 @@ sub struct {
                 },
 
                 # SSL
-                SSLRequired => 'bool:/SSLRequired',
+                sslParams => {
+                    _nodes       => [qw(SSLVar SSLLDAPField SSLRequire)],
+                    SSLVar       => 'text:/SSLVar',
+                    SSLLDAPField => 'text:/SSLLDAPField',
+                    SSLRequire   => 'bool:/SSLRequire',
+                },
 
                 # OpenID
                 openIdParams => {
@@ -796,7 +801,6 @@ sub testStruct {
         singleIP       => $boolean,
         singleUserByIP => $boolean,
         Soap           => $boolean,
-        SSLRequired    => $boolean,
         storePassword  => $boolean,
         syslog         => {
             test => qw/^(?:auth|authpriv|daemon|local\d|user)?$/,
@@ -882,6 +886,11 @@ sub testStruct {
         samlIDPSSODescriptorManageNameIDServiceHTTP     => $testNotDefined,
         samlIDPSSODescriptorManageNameIDServiceSOAP     => $testNotDefined,
 
+        # SSL
+        SSLVar       => $testNotDefined,
+        SSLLDAPField => $testNotDefined,
+        SSLRequire   => $boolean,
+
         # OpenID
         openIdSecret => $testNotDefined,
 
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
index 83cbe1a89..bdf64f7ec 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
@@ -138,6 +138,10 @@ sub en {
         SMTPServer                  => 'SMTP server',
         soap                        => 'SOAP',
         Soap                        => 'Activation',
+        SSLLDAPField                 => 'LDAP attribute used in filter',
+        sslParams                    => 'SSL parameters',
+        SSLRequire                   => 'SSL Required',
+        SSLVar                       => 'Extracted certificate field',
         storePassword               => 'Store user password in session datas',
         syntaxError                 => 'Syntax Error',
         syslog                      => 'Syslog facility',
@@ -311,6 +315,10 @@ sub fr {
         SMTPServer     => 'Serveur SMTP',
         soap           => 'SOAP',
         Soap           => 'Activation',
+        SSLLDAPField   => 'Attribut LDAP pour le filtre',
+        sslParams      => 'Paramètres SSL',
+        SSLRequire     => 'SSL Requis',
+        SSLVar         => 'Champ extrait du certificat',
         storePassword =>
 "Stocke le mot-de-passe de l'utilisateur dans les données de session",
         syntaxError    => 'Erreur de syntaxe',