Fix OIDC: Add default domain name to groups that are not email addresses

2026-06-16 21:51:48 +02:00
parent 8f627fbd69
commit 3f2c5632b8
33 changed files with 83 additions and 64 deletions
--- a/crates/common/Cargo.toml
+++ b/crates/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "common"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"
 build = "build.rs"

--- a/crates/coordinator/Cargo.toml
+++ b/crates/coordinator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "coordinator"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/dav-proto/Cargo.toml
+++ b/crates/dav-proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dav-proto"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/dav/Cargo.toml
+++ b/crates/dav/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dav"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/directory/Cargo.toml
+++ b/crates/directory/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "directory"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/directory/src/backend/oidc/lookup.rs
+++ b/crates/directory/src/backend/oidc/lookup.rs
@@ -213,7 +213,13 @@ impl OpenIdDirectory {
                .as_ref()
                .and_then(|groups_claim| claims.get(groups_claim))
                .map(extract_string_list)
-                .unwrap_or_default(),
+                .unwrap_or_default()
+                .into_iter()
+                .map(|group| match &self.config.default_domain {
+                    Some(domain) if !group.contains('@') => format!("{group}@{domain}"),
+                    _ => group,
+                })
+                .collect(),
            description: self
                .config
                .claim_name
--- a/crates/email/Cargo.toml
+++ b/crates/email/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "email"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/groupware/Cargo.toml
+++ b/crates/groupware/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "groupware"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/http-proto/Cargo.toml
+++ b/crates/http-proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "http_proto"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/http/Cargo.toml
+++ b/crates/http/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "http"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/http/src/request.rs
+++ b/crates/http/src/request.rs
@@ -472,9 +472,11 @@ impl ParseHttp for Server {
                    self.is_http_anonymous_request_allowed(session.remote_ip)
                        .await?;

-                    let path_email = path.find(|segment| segment.contains('@')).map(|segment| {
-                        percent_decode_str(segment).decode_utf8_lossy().into_owned()
-                    });
+                    let path_email = path
+                        .map(|segment| {
+                            percent_decode_str(segment).decode_utf8_lossy().into_owned()
+                        })
+                        .find(|segment| segment.contains('@'));

                    return self
                        .handle_autodiscover_v2_request(req.uri().query(), path_email.as_deref())
--- a/crates/imap-proto/Cargo.toml
+++ b/crates/imap-proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "imap_proto"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/imap/Cargo.toml
+++ b/crates/imap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "imap"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/jmap-proto/Cargo.toml
+++ b/crates/jmap-proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jmap_proto"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/jmap/Cargo.toml
+++ b/crates/jmap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jmap"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/main/Cargo.toml
+++ b/crates/main/Cargo.toml
@@ -7,7 +7,7 @@ homepage = "https://stalw.art"
 keywords = ["imap", "jmap", "smtp", "email", "mail", "webdav", "server"]
 categories = ["email"]
 license = "AGPL-3.0-only OR LicenseRef-SEL"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [[bin]]
--- a/crates/managesieve/Cargo.toml
+++ b/crates/managesieve/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "managesieve"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/migration/Cargo.toml
+++ b/crates/migration/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "migration"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/nlp/Cargo.toml
+++ b/crates/nlp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nlp"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/pop3/Cargo.toml
+++ b/crates/pop3/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pop3"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/registry/Cargo.toml
+++ b/crates/registry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "registry"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/services/Cargo.toml
+++ b/crates/services/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "services"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/smtp/Cargo.toml
+++ b/crates/smtp/Cargo.toml
@@ -7,7 +7,7 @@ homepage = "https://stalw.art/smtp"
 keywords = ["smtp", "email", "mail", "server"]
 categories = ["email"]
 license = "AGPL-3.0-only OR LicenseRef-SEL"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/spam-filter/Cargo.toml
+++ b/crates/spam-filter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spam-filter"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/store/Cargo.toml
+++ b/crates/store/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "store"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/trc/Cargo.toml
+++ b/crates/trc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "trc"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/trc/event-macro/Cargo.toml
+++ b/crates/trc/event-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "event_macro"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [lib]
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "types"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/utils/Cargo.toml
+++ b/crates/utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "utils"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [dependencies]
--- a/crates/utils/proc-macros/Cargo.toml
+++ b/crates/utils/proc-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "proc_macros"
-version = "0.16.9"
+version = "0.16.10"
 edition = "2024"

 [lib]