From 5286e0903239763bfbf7546a931bf3f5de09e06d Mon Sep 17 00:00:00 2001 From: Pascal Bleser Date: Thu, 2 Jul 2026 11:05:40 +0200 Subject: [PATCH] groupware: slightly improve the implementation of e77250b7c4 --- pkg/jmap/http.go | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkg/jmap/http.go b/pkg/jmap/http.go index 054fd4172c..9edc9227a8 100644 --- a/pkg/jmap/http.go +++ b/pkg/jmap/http.go @@ -104,22 +104,20 @@ func NewMasterAuthHttpJmapClientAuthenticator(masterUser string, masterPassword var _ HttpJmapClientAuthenticator = &MasterAuthHttpJmapClientAuthenticator{} func (h *MasterAuthHttpJmapClientAuthenticator) Authenticate(ctx context.Context, username string, _ *log.Logger, req *http.Request) Error { - if username == h.masterUser { - req.SetBasicAuth(username, h.masterPassword) - } else { - masterUsername := username + "%" + h.masterUser - req.SetBasicAuth(masterUsername, h.masterPassword) + u := username + if username != h.masterUser { + u = username + "%" + h.masterUser } + req.SetBasicAuth(u, h.masterPassword) return nil } func (h *MasterAuthHttpJmapClientAuthenticator) AuthenticateWS(ctx context.Context, username string, _ *log.Logger, headers http.Header) Error { - if username == h.masterUser { - headers.Add("Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(username+":"+h.masterPassword))) - } else { - masterUsername := username + "%" + h.masterUser - headers.Add("Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(masterUsername+":"+h.masterPassword))) + u := username + if username != h.masterUser { + u = username + "%" + h.masterUser } + headers.Add("Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(u+":"+h.masterPassword))) return nil }