From 346d901a15ac5dfe53d1d68449bdb93881aa7038 Mon Sep 17 00:00:00 2001
From: Thomas CHEMINEAU <thomas.chemineau@gmail.com>
Date: Fri, 4 Jun 2010 13:39:00 +0000
Subject: [PATCH] SAML #89 - adding configuration key to store priv/pub keys
 for signature and encryption

---
 .../lib/Lemonldap/NG/Manager/_Struct.pm       | 24 +++++++++++++++++++
 .../lib/Lemonldap/NG/Manager/_i18n.pm         | 10 ++++++++
 2 files changed, 34 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 9bb2257d3..4774d2d27 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
@@ -613,6 +613,7 @@ sub struct {
             _nodes => [
                 qw(samlEntityID
                   samlServicePrivateKey
+                  n:samlServiceSecurity
                   n:samlNameIDFormatMap
                   n:samlOrganization
                   n:samlSPSSODescriptor
@@ -626,6 +627,25 @@ sub struct {
             samlServicePrivateKey =>
               'filearea:/samlServicePrivateKey:samlServicePrivateKey:filearea',
 
+            # SECURITY NODE
+            samlServiceSecurity => {
+                _nodes => [
+                    qw(samlServicePrivateKeySig
+                       samlServicePublicKeySig
+                       samlServicePrivateKeyEnc
+                       samlServicePublicKeyEnc)
+                ],
+                _help => 'default',
+                samlServicePrivateKeySig =>
+'filearea:/samlServicePrivateKeySig:samlServicePrivateKeySig:filearea',
+                samlServicePublicKeySig  =>
+'filearea:/samlServicePublicKeySig:samlServicePublicKeySig:filearea',
+                samlServicePrivateKeyEnc =>
+'filearea:/samlServicePrivateKeyEnc:samlServicePrivateKeyEnc:filearea',
+                samlServicePublicKeyEnc  =>
+'filearea:/samlServicePublicKeyEnc:samlServicePublicKeyEnc:filearea',
+            },
+
             # NAMEID FORMAT MAP
             samlNameIDFormatMap => {
                 _nodes => [
@@ -1139,6 +1159,10 @@ sub testStruct {
         samlNameIDFormatMapWindows                      => $testNotDefined,
         samlNameIDFormatMapKerberos                     => $testNotDefined,
         samlAttributeAuthorityDescriptorAttributeServiceSOAP => $testNotDefined,
+        samlServicePrivateKeySig                        => $testNotDefined,
+        samlServicePublicKeySig                         => $testNotDefined,
+        samlServicePrivateKeyEnc                        => $testNotDefined,
+        samlServicePublicKeyEnc                         => $testNotdefined,
 
         # SSL
         SSLVar       => $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 672b1d83e..8c4c9397a 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
@@ -301,6 +301,11 @@ sub en {
         samlAttributeAuthorityDescriptor => 'Attribute Authority',
         samlAttributeAuthorityDescriptorAttributeService => 'Attribute Service',
         samlAttributeAuthorityDescriptorAttributeServiceSOAP => 'SOAP',
+        samlServiceSecurity      => 'Security parameters',
+        samlServicePrivateKeySig => 'Private key for signature',
+        samlServicePublicKeySig  => 'Public key for signature',
+        samlServicePrivateKeyEnc => 'Private key for encryption',
+        samlServicePublicKeyEnc  => 'Public key for encryption',
     };
 }
 
@@ -572,6 +577,11 @@ sub fr {
         samlAttributeAuthorityDescriptorAttributeService =>
           'Service d\'attributs',
         samlAttributeAuthorityDescriptorAttributeServiceSOAP => 'SOAP',
+        samlServiceSecurity      => 'Paramètres de sécurité',
+        samlServicePrivateKeySig => 'Clé privée de signature',
+        samlServicePublicKeySig  => 'Clé publique de signature',
+        samlServicePrivateKeyEnc => 'Clé privée de chiffrement',
+        samlServicePublicKeyEnc  => 'Clé publique de chiffrement',
     };
 }