From 878029fe482c3b53722e6e8ed3440a93f1ff4d7e Mon Sep 17 00:00:00 2001
From: Pascal Bleser <p.bleser@opencloud.eu>
Date: Thu, 23 Oct 2025 09:33:17 +0200
Subject: [PATCH] upgrade to Stalwart 0.14.0

 * upgrade image version in devtools to 0.14.0

 * fix idmldap configuration to use the cn attribute in order for that
   to also work for groups (groups don't have a uid attribute in the IDM
   built-in LDAP)

 * group resources are now checked against LDAP, changed
   demo-principals.yaml accordingly to refer to a group that exists in
   LDAP as part of the demo data
---
 .../opencloud_full/config/stalwart/idmldap.toml            | 4 ++--
 devtools/deployments/opencloud_full/stalwart.yml           | 2 +-
 services/groupware/demo-principals.yaml                    | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/devtools/deployments/opencloud_full/config/stalwart/idmldap.toml b/devtools/deployments/opencloud_full/config/stalwart/idmldap.toml
index eac1294b87..d9683f6689 100644
--- a/devtools/deployments/opencloud_full/config/stalwart/idmldap.toml
+++ b/devtools/deployments/opencloud_full/config/stalwart/idmldap.toml
@@ -6,7 +6,7 @@ directory.idmldap.attributes.class = "objectClass"
 directory.idmldap.attributes.description = "displayName"
 directory.idmldap.attributes.email = "mail"
 directory.idmldap.attributes.groups = "memberOf"
-directory.idmldap.attributes.name = "uid"
+directory.idmldap.attributes.name = "cn"
 directory.idmldap.attributes.secret = "userPassword"
 directory.idmldap.base-dn = "o=libregraph-idm"
 directory.idmldap.bind.auth.method = "default"
@@ -16,7 +16,7 @@ directory.idmldap.cache.size = 1048576
 directory.idmldap.cache.ttl.negative = "10m"
 directory.idmldap.cache.ttl.positive = "1h"
 directory.idmldap.filter.email = "(&(|(objectClass=person)(objectClass=groupOfNames))(mail=?))"
-directory.idmldap.filter.name = "(&(|(objectClass=person)(objectClass=groupOfNames))(uid=?))"
+directory.idmldap.filter.name = "(&(|(objectClass=person)(objectClass=groupOfNames))(cn=?))"
 directory.idmldap.timeout = "15s"
 directory.idmldap.tls.allow-invalid-certs = true
 directory.idmldap.tls.enable = true
diff --git a/devtools/deployments/opencloud_full/stalwart.yml b/devtools/deployments/opencloud_full/stalwart.yml
index d247925491..0f30550eb6 100644
--- a/devtools/deployments/opencloud_full/stalwart.yml
+++ b/devtools/deployments/opencloud_full/stalwart.yml
@@ -7,7 +7,7 @@ services:
           - ${STALWART_DOMAIN:-stalwart.opencloud.test}
 
   stalwart:
-    image: ghcr.io/stalwartlabs/stalwart:v0.13.4-alpine
+    image: ghcr.io/stalwartlabs/stalwart:v0.14.0-alpine
     hostname: ${STALWART_DOMAIN:-stalwart.opencloud.test}
     networks:
       - opencloud-net
diff --git a/services/groupware/demo-principals.yaml b/services/groupware/demo-principals.yaml
index 459fac466d..9c2c2a2689 100644
--- a/services/groupware/demo-principals.yaml
+++ b/services/groupware/demo-principals.yaml
@@ -4,15 +4,14 @@ lynn:
   quota: 5GB
 mary:
   quota: 500MB
-scientists:
+programmers:
   type: group
-  description: "Science folks"
+  description: Programmers
   emails:
-    - science@example.org
+    - programmers@example.org
   members:
     - alan
     - lynn
-    - mary
 news:
   type: list
   description: "Get your daily science news"