From 416fa64a0d03e658b270d532ec237d95cc6602d7 Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Sat, 18 Sep 2010 16:08:26 +0000
Subject: [PATCH] Set a default value to encryption key

---
 .../lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm | 5 ++++-
 .../lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm   | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

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 8e5902838..5f59a8edb 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
@@ -668,10 +668,11 @@ sub struct {
                 },
 
                 security => {
-                    _nodes      => [qw(userControl portalForceAuthn)],
+                    _nodes      => [qw(userControl portalForceAuthn key)],
                     userControl => 'text:/userControl:userControl:text',
                     portalForceAuthn =>
                       'bool:/portalForceAuthn:portalForceAuthn:bool',
+                    key         => 'text:/key:key:text',
                 },
 
                 redirection => {
@@ -1151,6 +1152,7 @@ sub testStruct {
                 1;
             },
         },
+        key            => $testNotDefined,
         ldapAuthnLevel => $integer,
         ldapBase       => {
             test    => qr/^(?:\w+=.*|)$/,
@@ -1528,6 +1530,7 @@ sub defaultConf {
         issuerDBOpenIDActivation => '0',
         issuerDBOpenIDPath       => '^/openidserver/',
         issuerDBOpenIDRule       => '1',
+        key      => join( '', map { chr( int( rand(94) ) + 33 ) } ( 1 .. 16 ) ),
         ldapBase                 => 'dc=example,dc=com',
         ldapPort                 => '389',
         ldapPwdEnc               => 'utf-8',
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 f532c6e0a..3523de0e5 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
@@ -143,6 +143,7 @@ sub en {
         issuerDBOpenIDActivation     => 'Activation',
         issuerDBOpenIDPath           => 'Path',
         issuerDBOpenIDRule           => 'Use rule',
+        key                          => 'Encryption key',
         ldap                         => 'LDAP',
         ldapAuthnLevel               => 'Authentication level',
         ldapBase                     => 'Users search base',
@@ -492,6 +493,7 @@ sub fr {
         issuerDBOpenIDActivation    => 'Activation',
         issuerDBOpenIDPath          => 'Chemin',
         issuerDBOpenIDRule          => 'Règle d\'utilisation',
+        key                         => 'Clef de chiffrement',
         ldap                        => 'LDAP',
         ldapAuthnLevel              => 'Niveau d\'authentification',
         ldapBase                    => 'Base de recherche des utilisateurs',