Merge branch 'master' into dist/eole/2.6.2/master

dicos/70_lemonldap_ng.xml

@@ -7,6 +7,7 @@
 		<file filelist='lemon' name='/etc/nginx/sites-available/portal-nginx.conf' mkdir='True' rm='True'/>
 		<file filelist='lemon' name='/etc/nginx/sites-available/test-nginx.conf' mkdir='True' rm='True'/>
 		<file filelist='lemon' name='/var/lib/lemonldap-ng/conf/lmConf-1.js' mkdir='True' rm='True'/>
+		<file filelist='lemon' name='/etc/lemonldap-ng/lemonldap-ng.ini' mkdir='True' rm='True'/>
 		<file filelist='lemonCAS' name='/usr/share/php/configCAS/cas.inc.php' source='cas.inc.php.tmpl' mkdir='True'/>
 		<file filelist='lemonCAS' name='/usr/share/php/CAS/eoleCASConfig.php' source='eoleCASConfig.php.tmpl' mkdir='True'/>
 		<file filelist='lemonCAS' name='/etc/pam_cas.conf' source="pam_cas_auth.conf"/>
@@ -51,11 +52,26 @@
 			<variable name='ssoDebug' type='string' description="Activer le Debug pour la lib php-CAS" mode="expert">
 				<value>non</value>
 			</variable>
+			<variable name='llSkin' type='string' description="Skin utilisé par LemonLDAP::NG">
+				<value>bootstrap</value>
+			</variable>
+			<variable name='llCheckLogins' type='oui/non' description="Permettre aux utilisateurs d'afficher l'historique de connection">
+				<value>non</value>
+			</variable>
+			<variable name='llResetPassword' type='oui/non' description="Permettre aux utilisateurs de réinitialiser leurs mots de passe">
+				<value>oui</value>
+			</variable>
+			<variable name='llRegisterAccount' type='oui/non' description="Permettre aux utilisateurs de créer un compte">
+				<value>oui</value>
+			</variable>
+			<variable name='llRegisterDB' type='string' description="Base de comptes pour l'enregistrement"/>
+			<variable name='llRegisterURL' type='string' description="Adresse de l'application de création de compte"/>
 		</family>
         <separators>
 		    <separator name="managerWebName">Configuration DNS</separator>
 		    <separator name="ldapScheme">Configuration LDAP</separator>
 		    <separator name="casAttribute">Configuration CAS</separator>
+		    <separator name="llSkin">Personnalisation de la mire SSO</separator>
 		</separators>
 	</variables>
 	<constraints>
@@ -77,6 +93,9 @@
 		</fill>
 		<check name="valid_enum" target="ldapScheme">
 			<param>['ldaps','ldap']</param>
+        </check>
+		<check name="valid_enum" target="llRegisterDB">
+			<param>['LDAP','Demo','Custom']</param>
         </check>
 		<group master="casAttribute">
 			<slave>casLDAPAttribute</slave>
@@ -88,6 +107,18 @@
 			<target type='family'>LemonLDAP</target>
 			<target type='service_accesslist'>saLemon</target>
 		</condition>
+		<condition name='disabled_if_in' source='llRegisterAccount'>
+			<param>non</param>
+			<target type='variable'>llRegisterDB</target>
+		</condition>
+		<condition name='disabled_if_not_in' source='llRegisterDB'>
+			<param>Custom</param>
+			<target type='variable'>llRegisterURL</target>
+		</condition>
+		<check name='valid_enum' target='llSkin'>
+			<param>['bootstrap','dark','impact','pastel']</param>
+			<param name="checkval">False</param>
+		</check>
 	</constraints>
 	<help>
 		<variable name='activerLemon'>Activer l'hébergement d'une place de marché HTTP pour OpenNebula</variable>
@@ -95,5 +126,6 @@
 		<variable name='authWebName'>Nom DNS de service d'authentification de LemonLDAP::NG ex:auth.cadoles.com</variable>
 		<variable name='ldapUserBaseDN'>DN de l'utilisateur de connection en lecture à l'annuaire (ex: cn=reader,o=gouv,c=fr)</variable>
 		<variable name='nginxBucketSize'>server_names_hash_bucket_size Taille du hash des noms de serveur pour NGINX</variable>
+		<variable name='llCheckLogins'>Affiche une case à cocher sur la mire SSO qui permet a l'utilisateur de voir l'historique de connection de son compte avant d'être redirigé vers le service demandé</variable>
 	</help>
 </creole>

tmpl/lemonldap-ng.ini

@@ -112,10 +112,14 @@ localStorageOptions={                             \
 
 ; PORTAL CUSTOMIZATION
 ; Name of the skin
-;portalSkin = pastel
+portalSkin = %%llSkin
 ; Modules displayed
 ;portalDisplayLogout = 1
-;portalDisplayResetPassword = 1
+%if %%llResetPassword == "oui"
+portalDisplayResetPassword = 1
+%else
+portalDisplayResetPassword = 0
+%end if
 ;portalDisplayChangePassword = 1
 ;portalDisplayAppslist = 1
 ;portalDisplayLoginHistory = 1

tmpl/lmConf-1.js

@@ -39,7 +39,9 @@
         "%%managerWebName": {}
     },
     "vhostOptions": {
-        "%%managerWebName": {},
+        "%%managerWebName": {
+            "vhostHttps" : "1"
+        },
         "test1.%%nom_domaine_local": {},
         "test2.%%nom_domaine_local": {}
     },
@@ -195,7 +197,11 @@
     "mailSubject": "[LemonLDAP::NG] Your new password",
     "nginxCustomHandlers": {},
     "samlSPSSODescriptorAuthnRequestsSigned": 1,
+%if %%llResetPassword == "oui"
     "portalDisplayResetPassword": 1,
+%else
+    "portalDisplayResetPassword": 0,
+%end if
     "openIdSreg_timezone": "_timezone",
     "infoFormMethod": "get",
     "openIdAuthnLevel": 1,
@@ -212,7 +218,11 @@
     "slaveAuthnLevel": 2,
     "samlIDPSSODescriptorSingleLogoutServiceHTTPPost": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST;#PORTAL#/saml/singleLogout;#PORTAL#/saml/singleLogoutReturn",
     "Soap": 1,
-    "registerDB": "Demo",
+%if %%llRegisterDB == "Custom"
+    "registerDB": "Null",
+%else
+    "registerDB": "%%llRegisterDB",
+%end if
     "locationRules": {
         "%%managerWebName": {
             "default": "$uid eq \"%%lemonAdmin\""
@@ -342,7 +352,11 @@
     "activeTimer": 1,
     "cda": 0,
     "samlServicePublicKeySig": "",
+%if %%llCheckLogins == "oui"
     "portalCheckLogins": 1,
+%else
+    "portalCheckLogins": 0,
+%end if
     "CAS_authnLevel": 1,
     "macros": {
         "_whatToTrace": "$_auth eq 'SAML' ? \"$_user\\@$_idpConfKey\" : \"$_user\""
@@ -388,7 +402,11 @@
     "oidcOPMetaDataOptions": null,
     "samlSPSSODescriptorWantAssertionsSigned": 1,
     "samlOrganizationName": "%%samlOrganizationName",
+%if %%llRegisterDB == "Custom"
+    "registerUrl": "%%llRegisterURL",
+%else
     "registerUrl": "https://%%authWebName/register.pl",
+%end if
     "casAccessControlPolicy": "none",
     "multiValuesSeparator": ";",
     "ldapPort": %%ldapServerPort