From 242c9ab96e93e1e0cacf3193a982867a2e0d915a Mon Sep 17 00:00:00 2001
From: kakwa <carpentier.pf@gmail.com>
Date: Wed, 13 Mar 2024 00:00:14 +0100
Subject: [PATCH] update test ldap configuration

---
 run_test.sh                                   | 16 ++++++------
 tests/test_env/deploy.sh                      |  1 -
 .../test_env/etc/ldap/slapd.d/cn=config.ldif  | 12 ++++-----
 .../ldap/slapd.d/cn=config/cn=module{0}.ldif  | 12 ++++-----
 .../etc/ldap/slapd.d/cn=config/cn=schema.ldif | 10 +++----
 .../slapd.d/cn=config/olcBackend={0}hdb.ldif  | 12 ---------
 .../cn=config/olcDatabase={-1}frontend.ldif   | 10 +++----
 .../cn=config/olcDatabase={0}config.ldif      | 10 +++----
 ...se={1}hdb.ldif => olcDatabase={1}mdb.ldif} | 26 ++++++++++---------
 9 files changed, 48 insertions(+), 61 deletions(-)
 delete mode 100644 tests/test_env/etc/ldap/slapd.d/cn=config/olcBackend={0}hdb.ldif
 rename tests/test_env/etc/ldap/slapd.d/cn=config/{olcDatabase={1}hdb.ldif => olcDatabase={1}mdb.ldif} (62%)

diff --git a/run_test.sh b/run_test.sh
index c11e759..378a4d0 100755
--- a/run_test.sh
+++ b/run_test.sh
@@ -5,11 +5,11 @@ Gre='\33[0;32m';
 RCol='\33[0m';
 
 cd `dirname $0`
-python setup.py test &&\
-printf "\nPEP 8 compliance check:\n\n"
-pep8 \
-    --repeat \
-    --show-source \
-    --exclude=.venv,.tox,dist,docs,build,*.egg,tests,misc . && \
-    printf "[${Gre}Passed${RCol}] Yeah! everything is clean\n\n" || \
-    printf "[${Red}Failed${RCol}] Oh No! there is some mess to fix\n\n"
+python3 setup.py test #&&\
+#printf "\nPEP 8 compliance check:\n\n"
+#pep8 \
+#    --recurssive ./ \
+#    --show-source \
+#    --exclude=.venv,.tox,dist,docs,build,*.egg,tests,misc . && \
+#    printf "[${Gre}Passed${RCol}] Yeah! everything is clean\n\n" || \
+#    printf "[${Red}Failed${RCol}] Oh No! there is some mess to fix\n\n"
diff --git a/tests/test_env/deploy.sh b/tests/test_env/deploy.sh
index f009070..ea79bbf 100755
--- a/tests/test_env/deploy.sh
+++ b/tests/test_env/deploy.sh
@@ -18,7 +18,6 @@ sudo sed -i "s%template_dir.*%template_dir = '`pwd`/resources/templates/'%" /etc
 sudo sed -i "s%tools.staticdir.dir.*%tools.staticdir.dir = '`pwd`/resources/static/'%" /etc/ldapcherry/ldapcherry.ini
 
 chown -R openldap:openldap /etc/ldap/
-rm /etc/ldap/slapd.d/cn\=config/*mdb*
 /etc/init.d/slapd restart
 ldapadd -c -H ldap://localhost:390  -x -D "cn=admin,dc=example,dc=org" -f /etc/ldap/content.ldif -w password
 if grep -q '127.0.0.1' /etc/hosts && ! grep -q 'ldap.ldapcherry.org' /etc/hosts
diff --git a/tests/test_env/etc/ldap/slapd.d/cn=config.ldif b/tests/test_env/etc/ldap/slapd.d/cn=config.ldif
index 9bbc105..0c87b56 100644
--- a/tests/test_env/etc/ldap/slapd.d/cn=config.ldif
+++ b/tests/test_env/etc/ldap/slapd.d/cn=config.ldif
@@ -1,4 +1,5 @@
 # AUTO-GENERATED FILE - DO NOT EDIT!! Use ldapmodify.
+# CRC32 7a6099db
 dn: cn=config
 objectClass: olcGlobal
 cn: config
@@ -7,12 +8,9 @@ olcLogLevel: none
 olcPidFile: /var/run/slapd/slapd.pid
 olcToolThreads: 1
 structuralObjectClass: olcGlobal
-entryUUID: 2964261c-6754-1033-8d48-1703270f04bd
+entryUUID: 38579c70-750a-103e-8489-9578878139e2
 creatorsName: cn=config
-createTimestamp: 20140503211805Z
-entryCSN: 20140503211805.658522Z#000000#000#000000
+createTimestamp: 20240312221838Z
+entryCSN: 20240312221838.644900Z#000000#000#000000
 modifiersName: cn=config
-modifyTimestamp: 20140503211805Z
-olcTLSCACertificateFile: /etc/ldap/ssl/TEST-cacert.pem
-olcTLSCertificateFile: /etc/ldap/ssl/ldap@dnscherry.org-cert.pem
-olcTLSCertificateKeyFile: /etc/ldap/ssl/ldap@dnscherry.org-key.pem
+modifyTimestamp: 20240312221838Z
diff --git a/tests/test_env/etc/ldap/slapd.d/cn=config/cn=module{0}.ldif b/tests/test_env/etc/ldap/slapd.d/cn=config/cn=module{0}.ldif
index de39d27..2268b19 100644
--- a/tests/test_env/etc/ldap/slapd.d/cn=config/cn=module{0}.ldif
+++ b/tests/test_env/etc/ldap/slapd.d/cn=config/cn=module{0}.ldif
@@ -1,14 +1,14 @@
 # AUTO-GENERATED FILE - DO NOT EDIT!! Use ldapmodify.
-# CRC32 d8758c75
+# CRC32 baf86138
 dn: cn=module{0}
 objectClass: olcModuleList
 cn: module{0}
 olcModulePath: /usr/lib/ldap
-olcModuleLoad: {0}back_hdb
+olcModuleLoad: {0}back_mdb
 structuralObjectClass: olcModuleList
-entryUUID: 2964fd58-6754-1033-8d50-1703270f04bd
+entryUUID: 3857cd3a-750a-103e-8491-9578878139e2
 creatorsName: cn=admin,cn=config
-createTimestamp: 20140503211805Z
-entryCSN: 20140503211805.664149Z#000000#000#000000
+createTimestamp: 20240312221838Z
+entryCSN: 20240312221838.646168Z#000000#000#000000
 modifiersName: cn=admin,cn=config
-modifyTimestamp: 20140503211805Z
+modifyTimestamp: 20240312221838Z
diff --git a/tests/test_env/etc/ldap/slapd.d/cn=config/cn=schema.ldif b/tests/test_env/etc/ldap/slapd.d/cn=config/cn=schema.ldif
index 0826f4d..6fbbe7a 100644
--- a/tests/test_env/etc/ldap/slapd.d/cn=config/cn=schema.ldif
+++ b/tests/test_env/etc/ldap/slapd.d/cn=config/cn=schema.ldif
@@ -1,12 +1,12 @@
 # AUTO-GENERATED FILE - DO NOT EDIT!! Use ldapmodify.
-# CRC32 db8c9607
+# CRC32 fff51a11
 dn: cn=schema
 objectClass: olcSchemaConfig
 cn: schema
 structuralObjectClass: olcSchemaConfig
-entryUUID: 29644a02-6754-1033-8d4b-1703270f04bd
+entryUUID: 3857a42c-750a-103e-848c-9578878139e2
 creatorsName: cn=admin,cn=config
-createTimestamp: 20140503211805Z
-entryCSN: 20140503211805.659557Z#000000#000#000000
+createTimestamp: 20240312221838Z
+entryCSN: 20240312221838.645118Z#000000#000#000000
 modifiersName: cn=admin,cn=config
-modifyTimestamp: 20140503211805Z
+modifyTimestamp: 20240312221838Z
diff --git a/tests/test_env/etc/ldap/slapd.d/cn=config/olcBackend={0}hdb.ldif b/tests/test_env/etc/ldap/slapd.d/cn=config/olcBackend={0}hdb.ldif
deleted file mode 100644
index 5c32962..0000000
--- a/tests/test_env/etc/ldap/slapd.d/cn=config/olcBackend={0}hdb.ldif
+++ /dev/null
@@ -1,12 +0,0 @@
-# AUTO-GENERATED FILE - DO NOT EDIT!! Use ldapmodify.
-# CRC32 94d41de9
-dn: olcBackend={0}hdb
-objectClass: olcBackendConfig
-olcBackend: {0}hdb
-structuralObjectClass: olcBackendConfig
-entryUUID: 2965a6f4-6754-1033-8d51-1703270f04bd
-creatorsName: cn=admin,cn=config
-createTimestamp: 20140503211805Z
-entryCSN: 20140503211805.668489Z#000000#000#000000
-modifiersName: cn=admin,cn=config
-modifyTimestamp: 20140503211805Z
diff --git a/tests/test_env/etc/ldap/slapd.d/cn=config/olcDatabase={-1}frontend.ldif b/tests/test_env/etc/ldap/slapd.d/cn=config/olcDatabase={-1}frontend.ldif
index 2bc52ec..6af16cd 100644
--- a/tests/test_env/etc/ldap/slapd.d/cn=config/olcDatabase={-1}frontend.ldif
+++ b/tests/test_env/etc/ldap/slapd.d/cn=config/olcDatabase={-1}frontend.ldif
@@ -1,5 +1,5 @@
 # AUTO-GENERATED FILE - DO NOT EDIT!! Use ldapmodify.
-# CRC32 511a173e
+# CRC32 e8f0a13c
 dn: olcDatabase={-1}frontend
 objectClass: olcDatabaseConfig
 objectClass: olcFrontendConfig
@@ -10,9 +10,9 @@ olcAccess: {1}to dn.exact="" by * read
 olcAccess: {2}to dn.base="cn=Subschema" by * read
 olcSizeLimit: 500
 structuralObjectClass: olcDatabaseConfig
-entryUUID: 296430d0-6754-1033-8d49-1703270f04bd
+entryUUID: 38579ebe-750a-103e-848a-9578878139e2
 creatorsName: cn=config
-createTimestamp: 20140503211805Z
-entryCSN: 20140503211805.658911Z#000000#000#000000
+createTimestamp: 20240312221838Z
+entryCSN: 20240312221838.644978Z#000000#000#000000
 modifiersName: cn=config
-modifyTimestamp: 20140503211805Z
+modifyTimestamp: 20240312221838Z
diff --git a/tests/test_env/etc/ldap/slapd.d/cn=config/olcDatabase={0}config.ldif b/tests/test_env/etc/ldap/slapd.d/cn=config/olcDatabase={0}config.ldif
index 23c1ccd..5bc998f 100644
--- a/tests/test_env/etc/ldap/slapd.d/cn=config/olcDatabase={0}config.ldif
+++ b/tests/test_env/etc/ldap/slapd.d/cn=config/olcDatabase={0}config.ldif
@@ -1,5 +1,5 @@
 # AUTO-GENERATED FILE - DO NOT EDIT!! Use ldapmodify.
-# CRC32 fc130d0e
+# CRC32 caed0a01
 dn: olcDatabase={0}config
 objectClass: olcDatabaseConfig
 olcDatabase: {0}config
@@ -7,9 +7,9 @@ olcAccess: {0}to * by dn.exact=gidNumber=0+uidNumber=0,cn=peercred,cn=external
  ,cn=auth manage by * break
 olcRootDN: cn=admin,cn=config
 structuralObjectClass: olcDatabaseConfig
-entryUUID: 29644142-6754-1033-8d4a-1703270f04bd
+entryUUID: 3857a274-750a-103e-848b-9578878139e2
 creatorsName: cn=config
-createTimestamp: 20140503211805Z
-entryCSN: 20140503211805.659332Z#000000#000#000000
+createTimestamp: 20240312221838Z
+entryCSN: 20240312221838.645074Z#000000#000#000000
 modifiersName: cn=config
-modifyTimestamp: 20140503211805Z
+modifyTimestamp: 20240312221838Z
diff --git a/tests/test_env/etc/ldap/slapd.d/cn=config/olcDatabase={1}hdb.ldif b/tests/test_env/etc/ldap/slapd.d/cn=config/olcDatabase={1}mdb.ldif
similarity index 62%
rename from tests/test_env/etc/ldap/slapd.d/cn=config/olcDatabase={1}hdb.ldif
rename to tests/test_env/etc/ldap/slapd.d/cn=config/olcDatabase={1}mdb.ldif
index 022b45d..dacc688 100644
--- a/tests/test_env/etc/ldap/slapd.d/cn=config/olcDatabase={1}hdb.ldif
+++ b/tests/test_env/etc/ldap/slapd.d/cn=config/olcDatabase={1}mdb.ldif
@@ -1,7 +1,9 @@
-dn: olcDatabase={1}hdb
+# AUTO-GENERATED FILE - DO NOT EDIT!! Use ldapmodify.
+# CRC32 91d29b33
+dn: olcDatabase={1}mdb
 objectClass: olcDatabaseConfig
-objectClass: olcHdbConfig
-olcDatabase: {1}hdb
+objectClass: olcMdbConfig
+olcDatabase: {1}mdb
 olcDbDirectory: /var/lib/ldap
 olcSuffix: dc=example,dc=org
 olcAccess: {0}to attrs=userPassword,shadowLastChange by self write by anonymou
@@ -13,15 +15,15 @@ olcLastMod: TRUE
 olcRootDN: cn=admin,dc=example,dc=org
 olcRootPW: {SSHA}Fp+rSxe5eFsj0DGITJts4DwdSDFDZG9P
 olcDbCheckpoint: 512 30
-olcDbConfig: {0}set_cachesize 0 2097152 0
-olcDbConfig: {1}set_lk_max_objects 1500
-olcDbConfig: {2}set_lk_max_locks 1500
-olcDbConfig: {3}set_lk_max_lockers 1500
 olcDbIndex: objectClass eq
-structuralObjectClass: olcHdbConfig
-entryUUID: 2965af5a-6754-1033-8d52-1703270f04bd
+olcDbIndex: cn,uid eq
+olcDbIndex: uidNumber,gidNumber eq
+olcDbIndex: member,memberUid eq
+olcDbMaxSize: 1073741824
+structuralObjectClass: olcMdbConfig
+entryUUID: 3857d7ee-750a-103e-8492-9578878139e2
 creatorsName: cn=admin,cn=config
-createTimestamp: 20140503211805Z
-entryCSN: 20140503211805.668708Z#000000#000#000000
+createTimestamp: 20240312221838Z
+entryCSN: 20240312221838.646442Z#000000#000#000000
 modifiersName: cn=admin,cn=config
-modifyTimestamp: 20140503211805Z
+modifyTimestamp: 20240312221838Z