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

This package does not exists for 2.x versions

README.md

@@ -10,7 +10,7 @@ LemonLDAP::NG EOLE integration
 
 GenConfig -> Mode Expert -> Dépôts tiers -> Libellé du dépôt
 
-#### LemonLDAP::NG repository (if you use EOLE 2.7.2 this is not needed anymore)
+#### LemonLDAP::NG repository (if you use EOLE 2.8.X this is not needed anymore)
  
 * deb     https://lemonldap-ng.org/deb stable main
 * deb-src https://lemonldap-ng.org/deb stable main

debian/compat

@@ -0,0 +1 @@
+10

debian/control

@@ -0,0 +1,56 @@
+Source: eole-lemonldap
+Section: web
+Priority: optional
+Maintainer: Équipe EOLE <eole@ac-dijon.fr>
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
+Homepage: https://dev-eole.ac-dijon.fr/projects/sso
+Vcs-Git: https://dev-eole.ac-dijon.fr/git/eole-lemonldap-ng.git
+Vcs-Browser: https://dev-eole.ac-dijon.fr/projects/sso/repository
+
+Package: eole-lemonldap
+Architecture: all
+Depends: eole-lemonldap-pkg,
+         ${misc:Depends}
+Description: Dictionnaires et templates pour la configuration d'un serveur LemonLDAP::NG
+ Pour toute information complémentaire, veuillez vous rendre sur le
+ site du projet EOLE.
+
+Package: eole-lemonldap-ng-scribe
+Architecture: all
+Depends: eole-scribe,
+         eole-lemonldap,
+	 libapache2-mod-perl2,
+         ${misc:Depends}
+Description: Dictionnaire pour calculer les valeurs automatiquement sur Scribe
+ .
+ Pour toute information complémentaire, veuillez vous rendre sur le
+ site du projet EOLE.
+
+Package: eole-lemonldap-pkg
+Architecture: all
+Section: metapackages
+Depends: lemonldap-ng,
+         lemonldap-ng-doc,
+         lemonldap-ng-fastcgi-server,
+         lemonldap-ng-handler,
+         liblemonldap-ng-handler-perl,
+         liblemonldap-ng-manager-perl,
+         liblemonldap-ng-portal-perl,
+         libauthen-captcha-perl,
+         libauthen-sasl-perl,
+         libemail-sender-perl,
+         libgd-securityimage-perl,
+         libimage-magick-perl,
+         libio-string-perl,
+         liblasso-perl,
+         libmouse-perl,
+         libnet-ldap-perl,
+         libunicode-string-perl,
+         libmime-tools-perl,
+         libio-socket-timeout-perl,
+         libnet-openid-server-perl,
+         ${misc:Depends}
+Description: Paquet de dépendances pour eole-lemonldap.
+ .
+ Pour toute information complémentaire, veuillez vous rendre sur la forge Cadoles.

debian/copyright

@@ -0,0 +1,37 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: {PROJECT}
+Source: ${URL}
+
+Files: *
+Copyright: 2020 Équipe EOLE <eole@ac-dijon.fr>
+License: CeCILL-C
+
+License: CeCILL-C
+ This software is governed by the CeCILL-C license under French law and
+ abiding by the rules of distribution of free software.  You can  use,
+ modify and or redistribute the software under the terms of the CeCILL-C
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info";.
+ .
+ As a counterpart to the access to the source code and  rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty  and the software's author,  the holder of the
+ economic rights,  and the successive licensors  have only  limited
+ liability.
+ .
+ In this respect, the user's attention is drawn to the risks associated
+ with loading,  using,  modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean  that it is complicated to manipulate,  and  that  also
+ therefore means  that it is reserved for developers  and  experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and,  more generally, to use and operate it in the
+ same conditions as regards security.
+ .
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL-C license and that you accept its terms.
+ .
+ On Eole systems, the complete text of the CeCILL-C License can be found
+ in `/usr/share/common-licenses/CeCILL-2'.

debian/eole-lemonldap-ng-scribe.install

@@ -0,0 +1,2 @@
+usr/share/eole/creole/dicos/71_lemonldap_ng_scribe.xml
+usr/share/eole/postservice/98-lemonldap-ng-scribe-register-hosts

debian/eole-lemonldap.install

@@ -0,0 +1,6 @@
+usr/share/creole/
+usr/share/eole/creole/dicos/70_lemonldap_ng.xml
+usr/share/eole/creole/distrib/
+usr/share/eole/diagnose/
+usr/share/eole/postservice/99-lemonldap-ng
+usr/share/eole/posttemplate/

debian/gbp.conf

@@ -0,0 +1,3 @@
+# Set per distribution debian tag
+[DEFAULT]
+debian-tag = debian/eole/%(version)s

debian/rules

@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+#export DH_OPTIONS=-v
+
+%:
+	dh $@

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

dicos/70_lemonldap_ng.xml

@@ -160,7 +160,6 @@
         <check name="valid_enum" target="llRegisterDB">
             <param>['LDAP','AD','Demo','Custom']</param>
         </check>
-
         <group master="casAttribute">
             <slave>casLDAPAttribute</slave>
         </group>

dicos/71_lemonldap_ng_scribe.xml

@@ -77,4 +77,4 @@
 
     <help />
 
-</creole>
+</creole>

tmpl/lmConf-1.json

@@ -1,25 +1,19 @@
 %set %%boolean = {'oui': 1, 'non': 0}
 %set %%ssoFilters = %%getSSOFilters
-%set %%ldapAttributes = {"uid": "uid", "mail": "mail", "cn":"cn"}
 %set %%exported_vars = ['"UA": "HTTP_USER_AGENT"']
 %set %%cas_attributes = []
-%set %%ldap_attributes = {}
+%set %%ldap_attributes = ['"uid": "uid"', '"mail": "mail"','"cn":"cn"']
 %for %%attr in %%casAttribute
     %silent %%exported_vars.append('"' + %%attr + '": "' + %%attr.casLDAPAttribute + '"')
     %silent %%cas_attributes.append('"' + %%attr + '": "' + %%attr.casLDAPAttribute + '"')
-    %set %%ldap_attributes[%%attr.casLDAPAttribute] = %%attr.casLDAPAttribute
+    %silent %%ldap_attributes.append('"' + %%attr + '": "' + %%attr.casLDAPAttribute + '"')
 %end for
 %for %%key, %%value in %%ssoFilters
     %silent %%exported_vars.append('"' + %%key + '": "' + %%value + '"')
     %silent %%cas_attributes.append('"' + %%key + '": "' + %%value + '"')
-    %set %%ldap_attributes[%%value] = %%value
 %end for
 %silent %%exported_vars.sort()
 %silent %%cas_attributes.sort()
-%set %%ldapAttr = []
-%for %%k, %%v in %%ldap_attributes.items()
-   %silent %%ldapAttr.append('"' + %%k + '": "' + %%v + '"')
-%end for
 {
 %if %%lemon_user_db == "AD"
     "ADPwdExpireWarning": %%llADPasswordExpireWarn,
@@ -181,7 +175,7 @@
     "ldapSearchDeref": "find",
     "ldapBase": "%%ldapUserBaseDN",
     "ldapExportedVars": {
-        %%custom_join(%%ldapAttr, ',\n        ')
+        %%custom_join(%%ldap_attributes, ',\n        ')
     },
     "ldapGroupAttributeName": "memberUid",
     "ldapGroupAttributeNameGroup": "dn",
@@ -196,9 +190,9 @@
     "ldapServer": "%%ldapScheme://%%ldapServer",
 %if %%ldapScheme == "ldaps"
    %if %%lmldapverify == "oui"
-    "ldapVerify": "Require",
+    "ldapVerify": "required",
    %else
-    "ldapVerify": "None",
+    "ldapVerify": "none",
    %end if
 %end if
     "ldapSetPassword": 0,