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

Ref: #30852

.gitignore

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

Makefile

@@ -3,9 +3,9 @@
 ################################
 
 SOURCE=eole-lemonldap
-VERSION=0.1
-EOLE_VERSION=2.7
-EOLE_RELEASE=2.7.2
+VERSION=2.8.0
+EOLE_VERSION=2.8
+EOLE_RELEASE=2.8.0
 PKGAPPS=non
 #FLASK_MODULE=<APPLICATION>
 

README.md

@@ -4,27 +4,6 @@ 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

debian/control

@@ -0,0 +1,50 @@
+Source: eole-lemonldap-ng
+Section: web
+Priority: optional
+Maintainer: Équipe EOLE <eole@ac-dijon.fr>
+Build-Depends: debhelper-compat (= 12)
+Standards-Version: 4.5.0
+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-ng
+Architecture: all
+Depends: eole-lemonldap-ng-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-ng,
+	 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-ng-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,
+         libemail-sender-perl,
+         libgd-securityimage-perl,
+         libimage-magick-perl,
+         libio-string-perl,
+         liblasso-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: eole-lemonldap-ng
+Source: http://dev-eole.ac-dijon.fr/projects/sso
+
+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-ng.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

@@ -2,6 +2,7 @@
 <creole>
 
     <files>
+
         <file filelist='lemonldap' name='/etc/lemonldap-ng/lemonldap-ng.ini' mkdir='True' rm='True'/>
         <file filelist='lemonldap' name='/var/lib/lemonldap-ng/conf/lmConf-1.json' mkdir='True' rm='True'/>
         <file filelist='lemonldap' name='/etc/default/lemonldap-ng-fastcgi-server' mkdir='True' rm='True'/>
@@ -9,13 +10,12 @@
         <file filelist='lemonldap-nginx' name='/etc/lemonldap-ng/manager-nginx.conf' mkdir='True' rm='True'/>
         <file filelist='lemonldap-nginx' name='/etc/lemonldap-ng/handler-nginx.conf' mkdir='True' rm='True'/>
         <file filelist='lemonldap-nginx' name='/etc/lemonldap-ng/portal-nginx.conf' mkdir='True' rm='True'/>
-        <file filelist='lemonldap-nginx' name='/etc/lemonldap-ng/nginx-lmlog.conf' mkdir='True' rm='True'/>
 
         <file filelist='lemonldap-apache' name='/etc/lemonldap-ng/manager-apache2.X.conf' mkdir='True' rm='True'/>
         <file filelist='lemonldap-apache' name='/etc/lemonldap-ng/handler-apache2.X.conf' mkdir='True' rm='True'/>
         <file filelist='lemonldap-apache' name='/etc/lemonldap-ng/portal-apache2.X.conf' mkdir='True' rm='True'/>
 
-        <service servicelist="sllemon">lemonldap-ng-fastcgi-server</service>
+        <service>lemonldap-ng-fastcgi-server</service>
 
         <service method='apache' servicelist='lemonldap-apache'>manager-apache2</service>
         <service method='apache' servicelist='lemonldap-apache'>portal-apache2</service>
@@ -28,30 +28,18 @@
     </files>
 
     <variables>
-        <family name='eole-sso'>
-            <variable name='eolesso_cas_folder' redefine="True" exists='True'>
-                <value>/cas</value>
-            </variable>
-            <variable name='eolesso_port' redefine="True" exists='True'>
-                <value>443</value>
-            </variable>
-        </family>
         <family name='Services'>
             <variable name='activerLemon' type='oui/non' description="Activer LemonLDAP::NG">
                 <value>non</value>
             </variable>
         </family>
 
-        <family name='LemonLDAP' icon='lemon'>
+        <family name='LemonLDAP'>
 
             <variable name='managerWebName' type='string' description="Nom DNS du manager LemonLDAP-NG"/>
             <variable name='authWebName' type='string' description="Nom DNS du service d'authentification LemonLDAP-NG"/>
             <variable name='reloadWebName' type='string' description="Nom DNS du service Reload de LemonLDAP-NG" mode="expert"/>
 
-	    <variable name='lemon_user_db' type='string' description="Backend pour les comptes utilisateurs" mode="expert">
-                <value>LDAP</value>
-            </variable>
-
             <variable name='ldapScheme' type='string' description="Protocole LDAP à utiliser" mandatory='True'/>
             <variable name='ldapServer' type='string' description="Adresse du Serveur LDAP utilisé par LemonLDAP::NG" mandatory="True"/>
             <variable name='ldapServerPort' type='number' description="Port d'écoute du LDAP utilisé par LemonLDAP::NG" mandatory='True'/>
@@ -59,18 +47,11 @@
             <variable name='ldapBindUserDN' type='string' description="Utilisateur de connection à l'annuaire" mandatory="True"/>
             <variable name='ldapBindUserPassword' type='password' description="Mot de passe de l'utilisateur de connection à l'annuaire" mandatory="True"/>
             <variable name="samlOrganizationName" type='string' description="Nom de l'organisation SAML" mode='expert'/>
-            <variable name='lmldapverify' type='oui/non' description="Vérifier les certificats SSL du serveur LDAP">
-                <value>oui</value>
-            </variable>
 
             <variable name="lemonproc" type='number' description="Nombre de processus dédié à Lemon (équivalent au nombre de processeurs)" mandatory="True">
                 <value>4</value>
             </variable>
 
-            <variable name="lm_loglevel" type='string' description="Verbosité des journaux" mode='expert'>
-                <value>info</value>
-            </variable>
-
             <variable name="lemonAdmin" type='string' description="LemonLDAP Administrator username" mode='expert'>
                 <value>admin</value>
             </variable>
@@ -93,19 +74,7 @@
             <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 par mail">
-                <value>oui</value>
-            </variable>
-            <variable name='llChangePassword' type='oui/non' description="Permettre aux utilisateurs de changer leurs mots de passe depuis LemonLDAP">
-                <value>oui</value>
-            </variable>
-            <variable name='llADPasswordMaxAge' type='number' description="Durée de vie des mots de passe (en secondes)" mode='expert'>
-                <value>5184000</value>
-            </variable>
-            <variable name='llADPasswordExpireWarn' type='number' description="Délai avant affichage d'un message d'alerte sur l'expiration du mot de passe (en secondes)">
-                <value>3456000</value>
-            </variable>
-            <variable name='llResetExpiredPassword' type='oui/non' description="Autoriser le renouvellement des mots de passe expirés">
+            <variable name='llResetPassword' type='oui/non' description="Permettre aux utilisateurs de réinitialiser leurs mots de passe">
                 <value>oui</value>
             </variable>
             <variable name='llResetUrl' type='string' description="Adresse de l'application pour réinitialiser leurs mots de passe" />
@@ -149,34 +118,19 @@
             <param>['ldaps','ldap']</param>
         </check>
 
-        <check name="valid_enum" target="lemon_user_db">
-            <param>['LDAP','AD']</param>
-        </check>
-
-        <check name='valid_enum' target="lm_loglevel">
-            <param>['info','notice','warn','error','debug']</param>
-        </check>
-
         <check name="valid_enum" target="llRegisterDB">
-            <param>['LDAP','AD','Demo','Custom']</param>
+            <param>['LDAP','Demo','Custom']</param>
         </check>
+
         <group master="casAttribute">
             <slave>casLDAPAttribute</slave>
         </group>
 
-        <condition name='disabled_if_not_in' source='lemon_user_db'>
-            <param>AD</param>
-            <target type='variable'>llADPasswordMaxAge</target>
-            <target type='variable'>llADPasswordExpireWarn</target>
-        </condition>
-
         <condition name='disabled_if_in' source='activerLemon'>
             <param>non</param>
             <target type='filelist'>lemonldap</target>
             <target type='filelist'>lemonldap-nginx</target>
             <target type='filelist'>lemonldap-apache</target>
-            <target type='servicelist'>lemonldap-apache</target>
-            <target type='servicelist'>sllemon</target>
             <target type='family'>LemonLDAP</target>
             <target type='service_accesslist'>saLemon</target>
         </condition>
@@ -203,7 +157,6 @@
         <condition name='disabled_if_in' source='llResetPassword'>
             <param>non</param>
             <target type='variable'>llResetUrl</target>
-            <target type='variable'>llResetExpiredPassword</target>
         </condition>
         <check name='valid_enum' target='llSkin'>
             <param>['bootstrap','dark','impact','pastel']</param>
@@ -212,12 +165,10 @@
     </constraints>
 
     <help>
-        <family name='LemonLDAP'>Configuration de la solution d'authentification unique LemonLDAP::NG</family>
         <variable name='activerLemon'>Activer le service LemonLDAP::NG sur ce serveur</variable>
         <variable name='managerWebName'>Nom DNS de l'application de gestion de LemonLDAP::NG ex:manager.example.fr</variable>
         <variable name='authWebName'>Nom DNS de service d'authentification de LemonLDAP::NG ex:auth.example.fr</variable>
-	<variable name='ldapUserBaseDN'>DN de base de l'emplactement des utilisateurs dans l'annuaire (ex: ou=users,o=gouv,c=fr)</variable>
-	<variable name='ldapBindUserDN'>DN de l'utilisateur de connection en lecture à l'annuaire (ex: cn=reader,o=gouv,c=fr)</variable>
+        <variable name='ldapUserBaseDN'>DN de l'utilisateur de connection en lecture à l'annuaire (ex: cn=reader,o=gouv,c=fr)</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>
         <variable name='llCSPTargets'>Liste des domaines à ajouter à la directive form-action.</variable>
     </help>

dicos/71_lemonldap_ng_scribe.xml

@@ -6,12 +6,13 @@
     <variables>
 
         <family name='eole sso'>
-            <variable name='eolesso_adresse' description="Nom de domaine du serveur d'authentification SSO" redefine="True" exists='True' />
+            <variable name='eolesso_adresse' description="Nom de domaine du serveur d'authentification SSO" redefine="True" />
         </family>
 
     </variables>
 
     <constraints>
+
         <fill name='calc_multi_condition' target='activer_sso'>
             <param>oui</param>
             <param type='eole' name='condition_1'>activerLemon</param>
@@ -24,18 +25,6 @@
             <target type='variable'>activer_sso</target>
         </condition>
 
-
-        <fill name='calc_val_first_value' target='eolesso_adresse'>
-            <param type='eole' optional='True' hidden='False'>authWebName</param>
-            <param type='eole' optional='True' hidden='False'>web_url</param>
-            <param type='eole'>nom_domaine_machine</param>
-        </fill>
-
-        <condition name='frozen_if_in' source='activerLemon'>
-            <param>oui</param>
-            <target type='variable'>eolesso_adresse</target>
-        </condition>
-
         <auto name='calc_multi_condition' target='ldapScheme'>
             <param>oui</param>
             <param type='eole' name='condition_1'>ldap_tls</param>
@@ -43,6 +32,10 @@
             <param name='default_mismatch'>ldap</param>
         </auto>
 
+        <auto name='calc_val' target='eolesso_adresse'>
+            <param type='eole'>authWebName</param>
+        </auto>
+
         <auto name='calc_val' target='ldapServer'>
             <param type='eole'>adresse_ip_ldap</param>
         </auto>
@@ -51,22 +44,16 @@
             <param type='eole'>ldap_port</param>
         </auto>
 
-        <auto name='calc_val' target='lemon_user_db'>
-            <param>LDAP</param>
-        </auto>
-
-        <auto name='calc_val' target='llRegisterDB'>
-            <param>LDAP</param>
-        </auto>
         <auto name='calc_val' target='ldapUserBaseDN'>
             <param type='eole'>ldap_base_dn</param>
         </auto>
+
         <auto name='calc_val' target='ldapBindUserDN'>
             <param type='eole'>ldap_reader</param>
         </auto>
 
         <auto name='calc_val' target='ldapBindUserPassword'>
-	        <param type='eole'>ldap_reader_passfile</param>
+            <param type='eole'>ldap_reader_passfile</param>
         </auto>
 
         <auto name='calc_val' target='casFolder'>
@@ -77,4 +64,4 @@
 
     <help />
 
-</creole>
+</creole>

eole-lemonldap-ng.mk

@@ -1,2 +0,0 @@
-creolefuncs_DATA_DIR := $(DESTDIR)/usr/share/creole/funcs
-lemonldap-ng_DATA_DIR          := $(eole_DIR)/lemonldap-ng

eole-lemonldap.mk

@@ -0,0 +1 @@
+creolefuncs_DATA_DIR := $(DESTDIR)/usr/share/creole/funcs

lemonldap-ng/LDAP.pm

@@ -1,102 +0,0 @@
-package Lemonldap::NG::Portal::UserDB::LDAP;
-
-use strict;
-use Mouse;
-use utf8;
-use Lemonldap::NG::Portal::Main::Constants qw(PE_OK);
-
-extends 'Lemonldap::NG::Portal::Lib::LDAP';
-
-our $VERSION = '2.0.6';
-
-has ldapGroupAttributeNameSearch => (
-    is      => 'rw',
-    lazy    => 1,
-    builder => sub {
-        my $attributes = [];
-        @$attributes =
-          split( /\s+/, $_[0]->{conf}->{ldapGroupAttributeNameSearch} )
-          if $_[0]->{conf}->{ldapGroupAttributeNameSearch};
-        push( @$attributes, $_[0]->{conf}->{ldapGroupAttributeNameGroup} )
-          if (  $_[0]->{conf}->{ldapGroupRecursive}
-            and $_[0]->{conf}->{ldapGroupAttributeNameGroup} ne "dn" );
-        return $attributes;
-    }
-);
-
-# RUNNING METHODS
-#
-# getUser is provided by Portal::Lib::LDAP
-
-# Load all parameters included in exportedVars parameter.
-# Multi-value parameters are loaded in a single string with
-# a separator (param multiValuesSeparator)
-# @return Lemonldap::NG::Portal constant
-sub setSessionInfo {
-    my ( $self, $req ) = @_;
-    $req->{sessionInfo}->{_dn} = $req->data->{dn};
-
-    my %vars = ( %{ $self->conf->{exportedVars} },
-        %{ $self->conf->{ldapExportedVars} } );
-    while ( my ( $k, $v ) = each %vars ) {
-
-        # getLdapValue returns an empty string for missing attribute
-        # but we really want to return undef so they don't get stored in session
-        $req->sessionInfo->{$k} =
-          $self->ldap->getLdapValue( $req->data->{ldapentry}, $v ) || undef;
-    }
-
-    PE_OK;
-}
-
-# Load all groups in $groups.
-# @return Lemonldap::NG::Portal constant
-sub setGroups {
-    my ( $self, $req ) = @_;
-    my $groups  = $req->{sessionInfo}->{groups};
-    my $hGroups = $req->{sessionInfo}->{hGroups};
-
-    if ( $self->conf->{ldapGroupBase} ) {
-
-        # Get value for group search
-        my $group_value = $self->ldap->getLdapValue( $req->data->{ldapentry},
-            $self->conf->{ldapGroupAttributeNameUser} );
-
-        if ( $self->conf->{ldapGroupDecodeSearchedValue} ) {
-            utf8::decode($group_value);
-        }
-
-        $self->logger->debug( "Searching LDAP groups in "
-              . $self->conf->{ldapGroupBase}
-              . " for $group_value" );
-
-        # Call searchGroups
-        my $ldapGroups = $self->ldap->searchGroups(
-            $self->conf->{ldapGroupBase},
-            $self->conf->{ldapGroupAttributeName},
-            $group_value,
-            $self->ldapGroupAttributeNameSearch,
-            $req->{ldapGroupDuplicateCheck}
-        );
-
-        foreach ( keys %$ldapGroups ) {
-            my $groupName = $_;
-            $hGroups->{$groupName} = $ldapGroups->{$groupName};
-            my $groupValues = [];
-            foreach ( @{ $self->ldapGroupAttributeNameSearch } ) {
-                next if $_ =~ /^name$/;
-                my $firstValue = $ldapGroups->{$groupName}->{$_}->[0];
-                push @$groupValues, $firstValue;
-            }
-            $groups .= $self->conf->{multiValuesSeparator} if $groups;
-            $groups .= join( '|', @$groupValues );
-        }
-
-    }
-
-    $req->{sessionInfo}->{groups}  = $groups;
-    $req->{sessionInfo}->{hGroups} = $hGroups;
-    PE_OK;
-}
-
-1;

lemonldap-ng/LDAP.pm.patch

@@ -1,20 +0,0 @@
---- /usr/share/perl5/Lemonldap/NG/Portal/UserDB/LDAP.pm.old	2019-12-11 12:05:54.000000000 +0100
-+++ /usr/share/perl5/Lemonldap/NG/Portal/UserDB/LDAP.pm	2021-01-05 10:54:19.188732119 +0100
-@@ -40,10 +40,15 @@
-         %{ $self->conf->{ldapExportedVars} } );
-     while ( my ( $k, $v ) = each %vars ) {
- 
-+        my $value = $self->ldap->getLdapValue( $req->data->{ldapentry}, $v );
-+
-         # getLdapValue returns an empty string for missing attribute
-         # but we really want to return undef so they don't get stored in session
--        $req->sessionInfo->{$k} =
--          $self->ldap->getLdapValue( $req->data->{ldapentry}, $v ) || undef;
-+        # This has to be a string comparison because "0" is a valid attribute
-+        # value. See #2403
-+        $value = undef if ( $value eq "" );
-+
-+        $req->sessionInfo->{$k} = $value;
-     }
- 
-     PE_OK;

postservice/99-lemonldap-ng

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

posttemplate/70-lemonldap-patch

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# vérifie si le patch est déjà appliqué
-grep -q 2403 /usr/share/perl5/Lemonldap/NG/Portal/UserDB/LDAP.pm && exit 0
-
-# copie de sauvegarde
-cp -a /usr/share/perl5/Lemonldap/NG/Portal/UserDB/LDAP.pm /usr/share/eole/lemonldap-ng/
-
-# application du patch
-patch -d / -p 0 < /usr/share/eole/lemonldap-ng/LDAP.pm.patch
-
-exit 0

tmpl/handler-apache2.X.conf

@@ -29,17 +29,6 @@ ErrorDocument 503 https://%%authWebName/lmerror/503
 <VirtualHost %%adresse_ip_eth0:443>
     ServerName %%reloadWebName
 
-    SSLEngine on
-    SSLCertificateFile   %%server_cert
-    SSLCertificateKeyFile %%server_key
-    SSLCertificateChainFile /etc/ssl/certs/ca_local.crt
-    SSLProtocol all -SSLv3 -SSLv2
-    SSLProxyEngine on
-
-    LogLevel %%lm_loglevel
-
-    ErrorLog /var/log/apache2/handler_error.log
-    CustomLog /var/log/apache2/handler_access.log common
     # Configuration reload mechanism (only 1 per physical server is
     # needed): choose your URL to avoid restarting Apache when
     # configuration change

tmpl/handler-nginx.conf

@@ -23,7 +23,8 @@ server {
 }
 
 server {
-  listen 443 ssl;
+  listen 443;
+  ssl on;
 %if %%cert_type == "letsencrypt"
   ssl_certificate %%le_config_dir/live/%%managerWebName/cert.pem;
   ssl_certificate_key %%le_config_dir/live/%%managerWebName/privkey.pem;
@@ -61,7 +62,7 @@ server {
     deny all;
 
     # Uncomment this if you use https only
-    add_header Strict-Transport-Security "max-age=15768000";
+    #add_header Strict-Transport-Security "max-age=15768000";
   }
 
 }

tmpl/lemonldap-ng-fastcgi-server

@@ -1,5 +1,5 @@
 # Number of process (default: 7)
-NPROC=%%lemonproc
+NPROC = %%lemonproc
 
 # Unix socket to listen to
 SOCKET=/run/llng-fastcgi-server/llng-fastcgi.sock

tmpl/lemonldap-ng.ini

@@ -36,7 +36,7 @@
 ;
 ; 1 - Defined logging level
 ;   Set here one of error, warn, notice, info or debug
-logLevel     = %%lm_loglevel
+logLevel     = debug
 ; Note that this has no effect for Apache2 logging: Apache LogLevel is used
 ; instead
 ;
@@ -65,9 +65,9 @@ logLevel     = %%lm_loglevel
 ; 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
 ;
@@ -197,11 +197,11 @@ portalSkin = %%llSkin
 ; Modules displayed
 ;portalDisplayLogout = 1
 portalDisplayResetPassword = %%boolean[%%llResetPassword]
-portalDisplayChangePassword = %%boolean[%%llChangePassword]
+;portalDisplayChangePassword = 1
 ;portalDisplayAppslist = 1
 ;portalDisplayLoginHistory = 1
 ; Require the old password when changing password
-portalRequireOldPassword = %%boolean[%%llChangePassword]
+;portalRequireOldPassword = 1
 ; Attribute displayed as connected user
 ;portalUserAttr = mail
 ; Old menu HTML code

tmpl/lmConf-1.json

@@ -1,30 +1,20 @@
 %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 + '"')
-    %set %%ldap_attributes[%%attr.casLDAPAttribute] = %%attr.casLDAPAttribute
+    %silent %%exported_vars.append('"' + %%attr + '": "' + %%attr + '.casLDAPAttribute"')
+    %silent %%cas_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,
-    "ADPwdMaxAge": %%llADPasswordMaxAge,
-%end if
+    "ADPwdExpireWarning": 0,
+    "ADPwdMaxAge": 0,
     "CAS_authnLevel": 1,
     "CAS_pgtFile": "/tmp/pgt.txt",
     "CAS_proxiedServices": {},
@@ -95,7 +85,7 @@
     },
     "authChoiceModules": {},
     "authChoiceParam": "lmAuth",
-    "authentication": "%%lemon_user_db",
+    "authentication": "LDAP",
     "browserIdAuthnLevel": 1,
     "captchaStorage": "Apache::Session::File",
     "captchaStorageOptions": {
@@ -162,26 +152,14 @@
     "issuerDBSAMLRule": 1,
     "jsRedirect": 0,
     "key": "e\"bTCt3*eU9^\\V%b",
-%if %%llResetPassword == "oui"
-  %if %%llResetExpiredPassword == "oui"
-    %if %%lemon_user_db == "AD"
-    "ldapPpolicyControl": 0,
-    %else
-    "ldapPpolicyControl": 1,
-    %end if
-    "ldapAllowResetExpiredPassword": 1,
-    "ldapChangePasswordAsUser": 1,
-  %else
-    "ldapPpolicyControl": 0,
     "ldapAllowResetExpiredPassword": 0,
-    "ldapChangePasswordAsUser": 1,
-  %end if
-%end if
     "ldapAuthnLevel": 2,
-    "ldapSearchDeref": "find",
     "ldapBase": "%%ldapUserBaseDN",
+    "ldapChangePasswordAsUser": 0,
     "ldapExportedVars": {
-        %%custom_join(%%ldapAttr, ',\n        ')
+        "cn": "cn",
+        "mail": "mail",
+        "uid": "uid"
     },
     "ldapGroupAttributeName": "memberUid",
     "ldapGroupAttributeNameGroup": "dn",
@@ -192,15 +170,9 @@
     "ldapPasswordResetAttribute": "pwdReset",
     "ldapPasswordResetAttributeValue": "TRUE",
     "ldapPort": "%%ldapServerPort",
+    "ldapPpolicyControl": 0,
     "ldapPwdEnc": "utf-8",
     "ldapServer": "%%ldapScheme://%%ldapServer",
-%if %%ldapScheme == "ldaps"
-   %if %%lmldapverify == "oui"
-    "ldapVerify": "Require",
-   %else
-    "ldapVerify": "None",
-   %end if
-%end if
     "ldapSetPassword": 0,
     "ldapTimeout": 120,
     "ldapUsePasswordResetAttribute": 1,
@@ -233,7 +205,7 @@
     "mailTimeout": 0,
 %if %%llResetPassword == "oui"
     %if %%is_empty(%%llResetUrl)
-    "mailUrl": "https://%%authWebName/resetpwd",
+    "mailUrl": "https://%%authWebName/mail.pl",
     %else
     "mailUrl": "%%llResetUrl",
     %end if
@@ -272,7 +244,7 @@
     "openIdSreg_fullname": "cn",
     "openIdSreg_nickname": "uid",
     "openIdSreg_timezone": "_timezone",
-    "passwordDB": "%%lemon_user_db",
+    "passwordDB": "LDAP",
     "persistentStorage": "Apache::Session::File",
     "persistentStorageOptions": {
         "Directory": "/var/lib/lemonldap-ng/psessions",
@@ -282,10 +254,10 @@
     "portalAntiFrame": 1,
     "portalCheckLogins": %%boolean[%%llCheckLogins],
     "portalDisplayAppslist": 1,
-    "portalDisplayChangePassword": "$_auth =~ /^(AD|LDAP|DBI|Demo)$/",
+    "portalDisplayChangePassword": "$_auth =~ /^(LDAP|DBI|Demo)$/",
     "portalDisplayLoginHistory": 1,
     "portalDisplayLogout": 1,
-    "portalDisplayRegister": %%boolean[%%llRegisterAccount],
+    "portalDisplayRegister": 1,
     "portalDisplayResetPassword": %%boolean[%%llResetPassword],
     "portalForceAuthn": 0,
     "portalForceAuthnInterval": 0,
@@ -392,7 +364,7 @@
     "useRedirectOnForbidden": 0,
     "useSafeJail": 1,
     "userControl": "^[\\w\\.\\-@]+$",
-    "userDB": "%%lemon_user_db",
+    "userDB": "LDAP",
     "vhostOptions": {
         "%%managerWebName": {
             "vhostHttps": "1"

tmpl/manager-apache2.X.conf

@@ -13,13 +13,13 @@
 <VirtualHost %%adresse_ip_eth0:443>
     ServerName %%managerWebName
     SSLEngine on
-    SSLCertificateFile    %%server_cert
-    SSLCertificateKeyFile %%server_key
+    SSLCertificateFile    /etc/ssl/certs/eole.crt
+    SSLCertificateKeyFile /etc/ssl/private/eole.key
     SSLCertificateChainFile /etc/ssl/certs/ca_local.crt
     SSLProtocol all -SSLv3 -SSLv2
     SSLProxyEngine on
 
-    LogLevel %%lm_loglevel
+    LogLevel info
     ErrorLog /var/log/apache2/manager_error.log
     CustomLog /var/log/apache2/manager_access.log common
 

tmpl/manager-nginx.conf

@@ -5,7 +5,8 @@ server {
 }
 
 server {
-  listen 443 ssl;
+  listen 443;
+  ssl on;
   %if %%cert_type == "letsencrypt"
   ssl_certificate %%le_config_dir/live/%%managerWebName/cert.pem;
   ssl_certificate_key %%le_config_dir/live/%%managerWebName/privkey.pem;
@@ -69,8 +70,8 @@ server {
 
   # DEBIAN
   # If install was made with USEDEBIANLIBS (official releases), uncomment this
-  location /javascript/ {
-    alias /usr/share/javascript/;
-  }
+  #location /javascript/ {
+  #  alias /usr/share/javascript/;
+  #}
 
 }

tmpl/nginx-lmlog.conf

@@ -1,3 +1,3 @@
-log_format lm_app '$remote_addr - $upstream_http_lm_remote_user [$time_local] '
+log_format lm_combined '$remote_addr - $lmremote_user [$time_local] '
 	'"$request" $status $body_bytes_sent '
-	'"$http_referer" "$http_user_agent" $upstream_http_lm_remote_custom';
+	'"$http_referer" "$http_user_agent"';

tmpl/portal-apache2.X.conf

@@ -13,13 +13,13 @@
 <VirtualHost %%adresse_ip_eth0:443>
     ServerName %%authWebName
     SSLEngine on
-    SSLCertificateFile    %%server_cert
-    SSLCertificateKeyFile %%server_key
+    SSLCertificateFile    /etc/ssl/certs/eole.crt
+    SSLCertificateKeyFile /etc/ssl/private/eole.key
     SSLCertificateChainFile /etc/ssl/certs/ca_local.crt
     SSLProtocol all -SSLv3 -SSLv2
     SSLProxyEngine on
 
-    LogLevel %%lm_loglevel
+    LogLevel info
     ErrorLog /var/log/apache2/portal_error.log
     CustomLog /var/log/apache2/portal_access.log common
 

tmpl/portal-nginx.conf

@@ -15,7 +15,8 @@ server {
 }
 
 server {
-  listen 443 ssl;
+  listen 443;
+  ssl on;
 %if %%cert_type == "letsencrypt"
   ssl_certificate %%le_config_dir/live/%%authWebName/cert.pem;
   ssl_certificate_key %%le_config_dir/live/%%authWebName/privkey.pem;
@@ -82,7 +83,7 @@ server {
 
   # DEBIAN
   # If install was made with USEDEBIANLIBS (official releases), uncomment this
-  location /javascript/ {
-    alias /usr/share/javascript/;
-  }
+  #location /javascript/ {
+  #  alias /usr/share/javascript/;
+  #}
 }