vividboarder/bitwarden_rs_ldap
1
0
Fork 0
mirror of https://github.com/ViViDboarder/bitwarden_rs_ldap.git synced 2025-01-23 08:44:15 +00:00
Code Issues Releases Wiki Activity

Use new openldap image for itests

Browse Source
This commit is contained in:
ViViDboarder 2025-01-22 10:51:31 -08:00
parent ebdf42bf1e
commit 978d4a2c49
7 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

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

17
docker-compose.yml
View File

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

2
example.config.toml
View File

@ -2,7 +2,7 @@ vaultwarden_url = "http://vaultwarden:80"
vaultwarden_admin_token = "admin" vaultwarden_admin_token = "admin"
ldap_host = "ldap" ldap_host = "ldap"
ldap_bind_dn = "cn=admin,dc=example,dc=org" 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_base_dn = "dc=example,dc=org"
ldap_search_filter = "(&(objectClass=*)(uid=*))" ldap_search_filter = "(&(objectClass=*)(uid=*))"
ldap_sync_interval_seconds = 10 ldap_sync_interval_seconds = 10

4
itest/config.toml
View File

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

5
itest/docker-compose.itest-env.yml
View File

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

5
itest/docker-compose.itest.yml
View File

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

6
itest/ldif/50-seed-user.ldif
View File

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