From 16435b7444a887b718f68f9fe771fed0236d643d Mon Sep 17 00:00:00 2001
From: Thomas CHEMINEAU <thomas.chemineau@gmail.com>
Date: Mon, 14 Jun 2010 12:51:17 +0000
Subject: [PATCH] SAML #97 - Add config parameter into the manager for private
 key password

---
 .../lib/Lemonldap/NG/Manager/_Struct.pm                | 10 ++++++++++
 .../lib/Lemonldap/NG/Manager/_i18n.pm                  |  4 ++++
 2 files changed, 14 insertions(+)

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 8d2265419..b427a434d 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
@@ -634,17 +634,23 @@ sub struct {
             samlServiceSecurity => {
                 _nodes => [
                     qw(samlServicePrivateKeySig
+                       samlServicePrivateKeySigPwd
                        samlServicePublicKeySig
                        samlServicePrivateKeyEnc
+                       samlServicePrivateKeyEncPwd
                        samlServicePublicKeyEnc)
                 ],
                 _help => 'default',
                 samlServicePrivateKeySig =>
 'filearea:/samlServicePrivateKeySig:samlServicePrivateKeySig:filearea',
+                samlServicePrivateKeySigPwd =>
+'text:/samlServicePrivateKeySigPwd',
                 samlServicePublicKeySig  =>
 'filearea:/samlServicePublicKeySig:samlServicePublicKeySig:filearea',
                 samlServicePrivateKeyEnc =>
 'filearea:/samlServicePrivateKeyEnc:samlServicePrivateKeyEnc:filearea',
+                samlServicePrivateKeyEncPwd =>
+'text:/samlServicePrivateKeyEncPwd',
                 samlServicePublicKeyEnc  =>
 'filearea:/samlServicePublicKeyEnc:samlServicePublicKeyEnc:filearea',
             },
@@ -1153,8 +1159,10 @@ sub testStruct {
         samlNameIDFormatMapKerberos                     => $testNotDefined,
         samlAttributeAuthorityDescriptorAttributeServiceSOAP => $testNotDefined,
         samlServicePrivateKeySig                        => $testNotDefined,
+        samlServicePrivateKeySigPwd                     => $testNotDefined,
         samlServicePublicKeySig                         => $testNotDefined,
         samlServicePrivateKeyEnc                        => $testNotDefined,
+        samlServicePrivateKeyEncPwd                     => $testNotDefined,
         samlServicePublicKeyEnc                         => $testNotDefined,
 
         # SSL
@@ -1381,8 +1389,10 @@ sub defaultConf {
           . $portal
           . '/saml/AA/SOAP;',
         samlServicePrivateKeySig                        => '',
+        samlServicePrivateKeySigPwd                     => '',
         samlServicePublicKeySig                         => '',
         samlServicePrivateKeyEnc                        => '',
+        samlServicePrivateKeyEncPwd                     => '',
         samlServicePublicKeyEnc                         => '',
 
     };
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 11427186b..25f245c0a 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
@@ -303,8 +303,10 @@ sub en {
         samlAttributeAuthorityDescriptorAttributeServiceSOAP => 'SOAP',
         samlServiceSecurity      => 'Security parameters',
         samlServicePrivateKeySig => 'Private key for signature',
+        samlServicePrivateKeySigPwd => 'Password of the private key for signature',
         samlServicePublicKeySig  => 'Public key for signature',
         samlServicePrivateKeyEnc => 'Private key for encryption',
+        samlServicePrivateKeyEncPwd => 'Password of the private key for encryption',
         samlServicePublicKeyEnc  => 'Public key for encryption',
     };
 }
@@ -579,8 +581,10 @@ sub fr {
         samlAttributeAuthorityDescriptorAttributeServiceSOAP => 'SOAP',
         samlServiceSecurity      => 'Paramètres de sécurité',
         samlServicePrivateKeySig => 'Clé privée de signature',
+        samlServicePrivateKeySigPwd => 'Mot de passe de la clé privée de signature',
         samlServicePublicKeySig  => 'Clé publique de signature',
         samlServicePrivateKeyEnc => 'Clé privée de chiffrement',
+        samlServicePrivateKeyEncPwd => 'Mot de passe de la clé privée de chiffrement',
         samlServicePublicKeyEnc  => 'Clé publique de chiffrement',
     };
 }