Use new openldap image for itests

Makefile

@@ -72,7 +72,7 @@ itest-env:
 
 .PHONY: clean-itest
 clean-itest:
-	docker compose down -v
+	docker compose down -v --remove-orphans
 
 # Installs pre-commit hooks
 .PHONY: install-hooks

docker-compose.yml

@@ -26,14 +26,17 @@ services:
       I_REALLY_WANT_VOLATILE_STORAGE: 'true'
 
   ldap:
-    image: osixia/openldap
-    volumes:
-      - /var/lib/ldap
-      - /etc/ldap/slapd.d
+    image: bitnami/openldap:latest
     environment:
-      LDAP_READONLY_USER: 'true'
-      LDAP_READONLY_USER_USERNAME: readonly
-      LDAP_READONLY_USER_PASSWORD: readonly
+      LDAP_PORT_NUMBER: 389
+      LDAP_ROOT: dc=example,dc=org
+      LDAP_ADMIN_USERNAME: admin
+      LDAP_ADMIN_PASSWORD: adminpassword
+
+      LDAP_SKIP_DEFAULT_TREE: yes
+      LDAP_CUSTOM_LDIF_DIR: /ldifs
+    volumes:
+      - ./itest/ldif:/ldifs
 
   ldap_admin:
     image: osixia/phpldapadmin

example.config.toml

@@ -2,7 +2,7 @@ vaultwarden_url = "http://vaultwarden:80"
 vaultwarden_admin_token = "admin"
 ldap_host = "ldap"
 ldap_bind_dn = "cn=admin,dc=example,dc=org"
-ldap_bind_password = "admin"
+ldap_bind_password = "adminpassword"
 ldap_search_base_dn = "dc=example,dc=org"
 ldap_search_filter = "(&(objectClass=*)(uid=*))"
 ldap_sync_interval_seconds = 10

itest/config.toml

@@ -1,8 +1,8 @@
 vaultwarden_url = "http://vaultwarden:80"
 vaultwarden_admin_token = "admin"
 ldap_host = "ldap"
-ldap_bind_dn = "cn=readonly,dc=example,dc=org"
-ldap_bind_password = "readonly"
+ldap_bind_dn = "cn=admin,dc=example,dc=org"
+ldap_bind_password = "adminpassword"
 ldap_search_base_dn = "dc=example,dc=org"
 ldap_search_filter = "(&(objectClass=*)(uid=*))"
 ldap_sync_loop = false

itest/docker-compose.itest-env.yml

@@ -14,7 +14,4 @@ services:
 
   vaultwarden: {}
 
-  ldap:
-    command: ["--copy-service"]
-    volumes:
-      - ./itest/ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom
+  ldap: {}

itest/docker-compose.itest.yml

@@ -6,7 +6,4 @@ services:
 
   vaultwarden: {}
 
-  ldap:
-    command: ["--copy-service"]
-    volumes:
-      - ./itest/ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom
+  ldap: {}

itest/ldif/50-seed-user.ldif

@@ -3,6 +3,12 @@
 
 version: 1
 
+dn: dc=example,dc=org
+dc: example
+objectClass: dcObject
+objectClass: organizationalUnit
+ou: Example Org
+
 # Entry 1: Users group
 dn: cn=Users,dc=example,dc=org
 cn: Users