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

dicos/70_lemonldap_ng.xml

@@ -36,10 +36,13 @@
 			<variable name="nginxBucketSize" type='number' description="Taille du hash des noms de serveur pour NGINX" mode='expert'>
 				<value>64</value>
 			</variable>
+			<variable name="casAttribute" description="Nom de l'attribut CAS" type="string" mode="expert" multi="True"/>
+			<variable name="casLDAPAttribute" description="Attribut LDAP équivalent" type="string" mode="expert"/>
 		</family>
         <separators>
 		    <separator name="managerWebName">Configuration DNS</separator>
 		    <separator name="ldapScheme">Configuration LDAP</separator>
+		    <separator name="casAttribute">Configuration CAS</separator>
 		</separators>
 	</variables>
 	<constraints>
@@ -62,6 +65,9 @@
 		<check name="valid_enum" target="ldapScheme">
 			<param>['ldaps','ldap']</param>
         </check>
+		<group master="casAttribute">
+			<slave>casLDAPAttribute</slave>
+		</group>
 		<condition name='disabled_if_in' source='activerLemon'>
 			<param>non</param>
 			<target type='filelist'>lemon</target>

tmpl/lmConf-1.js

@@ -158,7 +158,13 @@
     "samlAuthnContextMapPasswordProtectedTransport": 3,
     "ldapUsePasswordResetAttribute": 1,
     "ldapPpolicyControl": 0,
-    "casAttributes": {},
+    "casAttributes": {
+        "uid":"uid",
+%for att in %%casAttribute
+        "%%casAttribute": "%%casAttribute.casLDAPAttribute",
+%end for
+        "mail":"mail"
+    },
     "issuerDBSAMLPath": "^/saml/",
     "samlAttributeAuthorityDescriptorAttributeServiceSOAP": "urn:oasis:names:tc:SAML:2.0:bindings:SOAP;#PORTAL#/saml/AA/SOAP;",
     "portalDisplayAppslist": 1,