Fix ldapVerify values

this attributes and the variables names have to be named with the
same name

.gitignore

@@ -0,0 +1,4 @@
+# Backup and swap files
+*~
+*#
+*.swp

Makefile

@@ -2,10 +2,10 @@
 # Makefile pour XXX-XXX
 ################################
 
-SOURCE=eole-lemonldap-ng
-VERSION=2.8.0
-EOLE_VERSION=2.8
-EOLE_RELEASE=2.8.0
+SOURCE=eole-lemonldap
+VERSION=0.1
+EOLE_VERSION=2.7
+EOLE_RELEASE=2.7.2
 PKGAPPS=non
 #FLASK_MODULE=<APPLICATION>
 

README.md

@@ -4,6 +4,27 @@ LemonLDAP::NG EOLE integration
 
 ## Howto
 
+### Repository configuration
+
+* Add the lemonldap-ng deb respository we need the last version of LemonLDAP.
+
+GenConfig -> Mode Expert -> Dépôts tiers -> Libellé du dépôt
+
+#### 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
+* Key URL : https://lemonldap-ng.org/_media/rpm-gpg-key-ow2 
+
+#### Cadoles Repository
+* deb [ arch=all  ] https://vulcain.cadoles.com 2.7.2-dev main
+* Key URL : https://vulcain.cadoles.com/cadoles.gpg
+
+### Install packages
+
+apt update
+apt install eole-lemonldap
+
 ### Configure LemonLDAP in GenConfig
 
 * Enable lemonldap in "Services" tab

postservice/99-lemonldap-ng

@@ -1,6 +1,12 @@
 #!/bin/bash
 
-[ "$(CreoleGet activerLemon non)" = 'oui' ] || exit 0
+
+[[ $(CreoleGet activerLemon non) == "non" ]] && exit 0
+
+# Updating Configuration cache
+
+cmd="/usr/share/lemonldap-ng/bin/lemonldap-ng-cli update-cache"
+opt="update-cache"
 
 # Updating Configuration cache
 /usr/share/lemonldap-ng/bin/lemonldap-ng-cli update-cache 2>&1

tmpl/lemonldap-ng.ini

@@ -36,7 +36,7 @@
 ;
 ; 1 - Defined logging level
 ;   Set here one of error, warn, notice, info or debug
-logLevel     = debug
+logLevel     = %%lm_loglevel
 ; Note that this has no effect for Apache2 logging: Apache LogLevel is used
 ; instead
 ;
@@ -65,9 +65,9 @@ logLevel     = debug
 ; 2.1 - Using Syslog
 ;
 ;   For Syslog logging, you can also overwrite facilities. Default values:
-;logger             = Lemonldap::NG::Common::Logger::Syslog
-;syslogFacility     = daemon
-;userSyslogFacility = auth
+logger             = Lemonldap::NG::Common::Logger::Syslog
+syslogFacility     = daemon
+userSyslogFacility = auth
 ;
 ; 2.2 - Using Log4perl
 ;

tmpl/lmConf-1.json

@@ -1,17 +1,25 @@
 %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 = {}
 %for %%attr in %%casAttribute
-    %silent %%exported_vars.append('"' + %%attr + '": "' + %%attr + '.casLDAPAttribute"')
-    %silent %%cas_attributes.append('"' + %%attr + '": "' + %%attr + '.casLDAPAttribute"')
+    %silent %%exported_vars.append('"' + %%attr + '": "' + %%attr.casLDAPAttribute + '"')
+    %silent %%cas_attributes.append('"' + %%attr + '": "' + %%attr.casLDAPAttribute + '"')
+    %set %%ldap_attributes[%%attr.casLDAPAttribute] = %%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,
@@ -173,9 +181,7 @@
     "ldapSearchDeref": "find",
     "ldapBase": "%%ldapUserBaseDN",
     "ldapExportedVars": {
-        "cn": "cn",
-        "mail": "mail",
-        "uid": "uid"
+        %%custom_join(%%ldapAttr, ',\n        ')
     },
     "ldapGroupAttributeName": "memberUid",
     "ldapGroupAttributeNameGroup": "dn",
@@ -190,9 +196,9 @@
     "ldapServer": "%%ldapScheme://%%ldapServer",
 %if %%ldapScheme == "ldaps"
    %if %%lmldapverify == "oui"
-    "ldapVerify": "required",
+    "ldapVerify": "Require",
    %else
-    "ldapVerify": "none",
+    "ldapVerify": "None",
    %end if
 %end if
     "ldapSetPassword": 0,
@@ -279,7 +285,7 @@
     "portalDisplayChangePassword": "$_auth =~ /^(AD|LDAP|DBI|Demo)$/",
     "portalDisplayLoginHistory": 1,
     "portalDisplayLogout": 1,
-    "portalDisplayRegister": 1,
+    "portalDisplayRegister": %%boolean[%%llRegisterAccount],
     "portalDisplayResetPassword": %%boolean[%%llResetPassword],
     "portalForceAuthn": 0,
     "portalForceAuthnInterval": 0,