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

debian/compat

@@ -0,0 +1 @@
+7

debian/control

@@ -0,0 +1,14 @@
+Source: eole-cadolesldap
+Section: web
+Priority: optional
+Maintainer: CADOLES <contact@cadoles.com>
+Build-Depends: debhelper (>= 7.0.50)
+Standards-Version: 3.8.4 
+Homepage: https://forge.cadoles.com/Cadoles/cadolesldap
+Vcs-Git: https://forge.cadoles.com/Cadoles/cadolesldap.git
+Vcs-Browser: https://forge.cadoles.com/Cadoles/cadolesldap.git
+
+Package: eole-cadolesldap
+Architecture: all
+Depends: ${misc:Depends}, eole-annuaire
+Description: Templates cadolesldap.

debian/copyright

@@ -0,0 +1,44 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: {PROJECT}
+Source: {URL}
+
+Files: *
+Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
+License: {UPSTREAM LICENSE}
+
+Files: debian/*
+Copyright: Cadoles <contact@cadoles.com>
+License: CeCILL-2
+
+License: {UPSTREAM LICENSE}
+ {TEXT OF THE LICENSE}
+
+License: CeCILL-2
+ This software is governed by the CeCILL-2 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-2
+ 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-2 license and that you accept its terms.
+ .
+ On Eole systems, the complete text of the CeCILL-2 License can be found
+ in '/usr/share/common-licenses/CeCILL-2-en'.

debian/gbp.conf

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

debian/rules

@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@
+
+override_dh_install:
+	dh_install -peole-draaf --exclude=slapd.conf.patch \
+							--exclude=cas.inc.php.tmpl.patch \
+							--exclude=25-bdd-admin \
+							--exclude=25_bdd_server.xml
+	dh_install -pdraaf-apps
+	dh_install -pdraaf-lemontheme
+	dh_install -pdraaf-envoletheme
+	dh_install -pdraaf-ldap
+	dh_install -pdraaf-patchsso
+	dh_install -pdraaf-bdd

debian/source/format

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

ldap/patchs/slapd.conf.patch

@@ -1,50 +1,26 @@
 --- distrib/slapd.conf	2019-06-04 11:18:04.000000000 +0200
-+++ modif/slapd.conf	2021-01-12 11:06:19.496162295 +0100
-@@ -23,11 +23,19 @@
++++ modif/slapd.conf	2020-03-24 09:10:44.724586266 +0100
+@@ -23,6 +23,7 @@
  %elif %%ldap_schema == 'zephir'
  include        /etc/ldap/schema/openldap.schema
  %end if
 +include        /etc/ldap/schema/cadoles.schema
-
+ 
  ## Support du TLS
-+%if %%cert_type == "manuel"
-+TLSCertificateFile      %%server_cert
-+TLSCertificateKeyFile   %%server_key
-+TLSCACertificateFile    %%server_pem
-+%else
  TLSCertificateFile      /etc/ldap/ssl/certs/openldap.crt
- TLSCertificateKeyFile   /etc/ldap/ssl/private/openldap.key
- TLSCACertificateFile    /etc/ssl/certs/ca.crt
-+%end if
-+
- TLSVerifyClient         never
- TLSCipherSuite SECURE256:+SIGN-ALL:-VERS-SSL3.0:!AES-128-CBC:!3DES-CBC:!DES-CBC:!ARCFOUR-128:!ARCFOUR-40:!RC2-40:!CAMELLIA-128-CBC:!NULL
-
-@@ -46,6 +54,7 @@
+@@ -46,6 +47,7 @@
  %if %%ldap_replication == 'oui' or %%ldap_replication_client == 'oui'
  moduleload      syncprov
  %end if
 +moduleload      memberof
-
+ 
  # Sample security restrictions
  #    Require integrity protection (prevent hijacking)
-@@ -80,6 +89,7 @@
-
- # compatibilite EAD1 et appli PHP
- allow   bind_v2
-+allow   bind_anon_dn
-
- database    bdb
- # The base of your directory
-@@ -216,6 +226,10 @@
- syncprov-sessionlog 100
- %end if
-
-+overlay memberof
-+memberof-group-oc cadolesGroup
-+memberof-member-ad cadolesMember
-+
+@@ -219,3 +221,7 @@
  %if %%ldap_replication_client == 'oui'
  include /etc/ldap/replication.conf
  %end if
-
++
++overlay memberof
++memberof-group-oc cadolesGroup
++memberof-member-ad cadolesMember

ldap/schema/eole/cadoles.schema-2.ldif

@@ -1,96 +0,0 @@
-DN:
-changeType: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
--
-
-dn: CN=cadolesPerson,CN=Schema,CN=Configuration,{DNCONFIG}
-changeType: add
-objectClass: top
-objectClass: classSchema
-governsID: 2.16.840.1.113732.3.1.1
-schemaIdGuid:: BS9z8eJKvYZ+lS8OJgeC1g==
-cn: cadolesPerson
-name: cadolesPerson
-lDAPDisplayName: cadolesPerson
-description: Description Personne Cadoles
-subClassOf: top
-objectClassCategory: 3
-mayContain: givensName
-mayContain: usualname
-mayContain: birthdate
-mayContain: birthcountry
-mayContain: birthplace
-mayContain: gender
-mayContain: job
-mayContain: position
-mayContain: belongingpopulation
-mayContain: authlevel
-defaultObjectCategory: CN=cadolesPerson,CN=Schema,CN=Configuration,{DNCONFIG}
-
-DN:
-changeType: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
--
-
-dn: CN=cadolesSiren,CN=Schema,CN=Configuration,{DNCONFIG}
-changeType: add
-objectClass: top
-objectClass: classSchema
-governsID: 2.16.840.1.113732.3.1.2
-schemaIdGuid:: 7pJbNueSjwpq7TsL2aiW1w==
-cn: cadolesSiren
-name: cadolesSiren
-lDAPDisplayName: cadolesSiren
-description: Siren
-subClassOf: top
-objectClassCategory: 3
-mayContain: siren
-mayContain: niveau01
-defaultObjectCategory: CN=cadolesSiren,CN=Schema,CN=Configuration,{DNCONFIG}
-
-DN:
-changeType: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
--
-
-dn: CN=cadolesSiret,CN=Schema,CN=Configuration,{DNCONFIG}
-changeType: add
-objectClass: top
-objectClass: classSchema
-governsID: 2.16.840.1.113732.3.1.3
-schemaIdGuid:: BOOf/nwBuCFehtpsyYrLjA==
-cn: cadolesSiret
-name: cadolesSiret
-lDAPDisplayName: cadolesSiret
-description: Siret
-subClassOf: top
-objectClassCategory: 3
-mayContain: siret
-mayContain: postalAddress
-mayContain: niveau02
-defaultObjectCategory: CN=cadolesSiret,CN=Schema,CN=Configuration,{DNCONFIG}
-
-DN:
-changeType: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
--
-
-dn: CN=cadolesGroup,CN=Schema,CN=Configuration,{DNCONFIG}
-changeType: add
-objectClass: top
-objectClass: classSchema
-governsID: 2.16.840.1.113732.3.1.4
-schemaIdGuid:: IPc/rPzhpAjekHrvXgdI8w==
-cn: cadolesGroup
-name: cadolesGroup
-lDAPDisplayName: cadolesGroup
-description: Descirption Groupe Cadoles
-subClassOf: top
-objectClassCategory: 3
-mayContain: cadolesMember
-defaultObjectCategory: CN=cadolesGroup,CN=Schema,CN=Configuration,{DNCONFIG}
-

ldap/schema/eole/cadoles.schema.ldif

@@ -297,3 +297,100 @@ description: Label Etablissement
 attributeSyntax: 2.5.5.12
 oMSyntax: 64
 isSingleValued: TRUE
+
+DN:
+changeType: modify
+add: schemaUpdateNow
+schemaUpdateNow: 1
+-
+
+dn: CN=cadolesPerson,CN=Schema,CN=Configuration,{DNCONFIG}
+changeType: add
+objectClass: top
+objectClass: classSchema
+governsID: 2.16.840.1.113732.3.1.1
+schemaIdGuid:: BS9z8eJKvYZ+lS8OJgeC1g==
+cn: cadolesPerson
+name: cadolesPerson
+lDAPDisplayName: cadolesPerson
+description: Description Personne Cadoles
+subClassOf: top
+objectClassCategory: 3
+mayContain: givensName
+mayContain: usualname
+mayContain: birthdate
+mayContain: birthcountry
+mayContain: birthplace
+mayContain: gender
+mayContain: job
+mayContain: position
+mayContain: belongingpopulation
+mayContain: authlevel
+defaultObjectCategory: CN=cadolesPerson,CN=Schema,CN=Configuration,{DNCONFIG}
+
+DN:
+changeType: modify
+add: schemaUpdateNow
+schemaUpdateNow: 1
+-
+
+dn: CN=cadolesSiren,CN=Schema,CN=Configuration,{DNCONFIG}
+changeType: add
+objectClass: top
+objectClass: classSchema
+governsID: 2.16.840.1.113732.3.1.2
+schemaIdGuid:: 7pJbNueSjwpq7TsL2aiW1w==
+cn: cadolesSiren
+name: cadolesSiren
+lDAPDisplayName: cadolesSiren
+description: Siren
+subClassOf: top
+objectClassCategory: 3
+mayContain: siren
+mayContain: niveau01
+defaultObjectCategory: CN=cadolesSiren,CN=Schema,CN=Configuration,{DNCONFIG}
+
+DN:
+changeType: modify
+add: schemaUpdateNow
+schemaUpdateNow: 1
+-
+
+dn: CN=cadolesSiret,CN=Schema,CN=Configuration,{DNCONFIG}
+changeType: add
+objectClass: top
+objectClass: classSchema
+governsID: 2.16.840.1.113732.3.1.3
+schemaIdGuid:: BOOf/nwBuCFehtpsyYrLjA==
+cn: cadolesSiret
+name: cadolesSiret
+lDAPDisplayName: cadolesSiret
+description: Siret
+subClassOf: top
+objectClassCategory: 3
+mayContain: siret
+mayContain: postalAddress
+mayContain: niveau02
+defaultObjectCategory: CN=cadolesSiret,CN=Schema,CN=Configuration,{DNCONFIG}
+
+DN:
+changeType: modify
+add: schemaUpdateNow
+schemaUpdateNow: 1
+-
+
+dn: CN=cadolesGroup,CN=Schema,CN=Configuration,{DNCONFIG}
+changeType: add
+objectClass: top
+objectClass: classSchema
+governsID: 2.16.840.1.113732.3.1.4
+schemaIdGuid:: IPc/rPzhpAjekHrvXgdI8w==
+cn: cadolesGroup
+name: cadolesGroup
+lDAPDisplayName: cadolesGroup
+description: Descirption Groupe Cadoles
+subClassOf: top
+objectClassCategory: 3
+mayContain: cadolesMember
+defaultObjectCategory: CN=cadolesGroup,CN=Schema,CN=Configuration,{DNCONFIG}
+

postservice/91-cadolesldap

@@ -1,69 +0,0 @@
-#!/bin/bash
-
-#
-# Initialisation of LDAP Directory
-#
-
-
-#
-# Run command as particular user
-#
-function runAs() {
-    USER=${1}
-    shift
-    CMD="su ${USER} -s /bin/bash -c ${@}"
-
-    eval ${CMD}
-    return ${?}
-}
-
-function addLDAPschema()
-{
-   LDIF="/etc/cadolesldap/init/cadolesldap.ldif"
-   USER="openldap"
-   CMD="\"slapadd -l ${LDIF} -f \"/etc/ldap/slapd.conf\"\""
-
-   service slapd stop
-   runAs ${USER} ${CMD}
-   result=$((result+${?}))
-   service slapd start
-   return ${result}
-}
-
-function addADSchema()
-{
-   /usr/share/eole/sbin/cadoles_add_schema.sh
-   return ${?} 
-}
-
-function main()
-{
-   MODE=${1}
-   result=0
-
-
-   if [[ ${MODE} == "instance" ]]
-   then
-      if [[ $(CreoleGet eole_module) == "seth" ]]
-      then
-         addADSchema
-	 return ${?}
-      else
-         addLDAPschema
-	 return ${?}
-      fi
-   fi
-}
-
-if [[ $(CreoleGet eole_module eolebase) != "seth" ]]
-then
-   exit 0
-fi
-
-if [[ $(CreoleGet activer_cadolesldap non) == "oui" ]]
-then
-   main $@
-   exit ${?}
-else
-   exit 0
-fi

posttemplate/91-cadolesldap

@@ -55,11 +55,6 @@ function main()
    fi
 }
 
-if [[ $(CreoleGet eole_module eolebase) == "seth" ]]
-then
-   exit 0
-fi
-
 if [[ $(CreoleGet activer_cadolesldap non) == "oui" ]]
 then
    main $@

scripts/cadoles_add_schema.sh

@@ -33,23 +33,23 @@ RETURNED=$(ldbsearch --option="dsdb:schema update allowed"=true -H /var/lib/samb
 
 if [ "$RETURNED" = "# returned 0 records" ]; then
     # Import schema
-    SCHEMAS="cadoles.schema cadoles.schema-2"
+    SCHEMAS="cadoles.schema"
     PRIVATE_DIR=/etc/eole/private
 
     for schema in $SCHEMAS
     do
-        updateSchemaDN "{DNCONFIG}" "${DN}" /etc/ldap/schema/eole/${schema}.ldif
-        if [[ $? -ne 0 ]]
-        then
+	updateSchemaDN "{DNCONFIG}" "${DN}" /etc/ldap/schema/eole/${schema}.ldif
+	if [[ $? -ne 0 ]]
+	then
            echo "Error updating DN for ${schema}"
            break
         fi
         ldbmodify -H /var/lib/samba/private/sam.ldb /etc/ldap/schema/eole/${schema}.ldif --option="dsdb:schema update allowed"=true
-        if [[ $? -ne 0 ]]
-        then
-            echo "Error updating Schema ${schema} !!"
-            break
-    	fi
+	if [[ $? -ne 0 ]]
+	then
+           echo "Error updating Schema ${schema} !!"
+           break
+	fi
     done
 fi