Skip to content

Modern Docker Management, Designed for Everyone

refactor: add mobile device custom redirect url for oidc (#2580)

Kyle Mendellf270a14c1400
diff --git a/backend/internal/bootstrap/services_bootstrap.go b/backend/internal/bootstrap/services_bootstrap.go
index 614a3c4fd..2f71f8d75 100644
--- a/backend/internal/bootstrap/services_bootstrap.go
+++ b/backend/internal/bootstrap/services_bootstrap.go
@@ -101,7 +101,7 @@ func initializeServices(ctx context.Context, db *database.DB, cfg *config.Config
svcs.Swarm = services.NewSwarmService(svcs.Docker, svcs.Settings, svcs.KV, svcs.ContainerRegistry, svcs.Environment)
svcs.Template = services.NewTemplateService(ctx, db, httpClient, svcs.Settings)
svcs.Auth = services.NewAuthService(svcs.User, svcs.Settings, svcs.Event, cfg.JWTSecret, cfg)
- svcs.Oidc = services.NewOidcService(svcs.Auth, cfg, httpClient)
+ svcs.Oidc = services.NewOidcService(svcs.Auth, svcs.Settings, cfg, httpClient)
svcs.System = services.NewSystemService(db, svcs.Docker, svcs.Container, svcs.Image, svcs.Volume, svcs.Network, svcs.Settings)
svcs.SystemUpgrade = services.NewSystemUpgradeService(svcs.Docker, svcs.Version, svcs.Event, svcs.Settings)
svcs.Updater = services.NewUpdaterService(db, svcs.Settings, svcs.Docker, svcs.Project, svcs.ImageUpdate, svcs.ContainerRegistry, svcs.Event, svcs.Image, svcs.Notification, svcs.SystemUpgrade)
diff --git a/backend/internal/config/config.go b/backend/internal/config/config.go
index ddb2f530d..9e4c859f8 100644
--- a/backend/internal/config/config.go
+++ b/backend/internal/config/config.go
@@ -53,6 +53,7 @@ type Config struct {
OidcAutoRedirectToProvider bool `env:"OIDC_AUTO_REDIRECT_TO_PROVIDER" default:"false"`
OidcProviderName string `env:"OIDC_PROVIDER_NAME" default:""`
OidcProviderLogoUrl string `env:"OIDC_PROVIDER_LOGO_URL" default:""`
+ OidcMobileRedirectUris string `env:"OIDC_MOBILE_REDIRECT_URIS" default:"arcane-mobile://oidc-callback"`
PUID string `env:"PUID" default:""`
PGID string `env:"PGID" default:""`
diff --git a/backend/internal/configschema/schema_test.go b/backend/internal/configschema/schema_test.go
index e4021bf8f..09b2ea2f5 100644
--- a/backend/internal/configschema/schema_test.go
+++ b/backend/internal/configschema/schema_test.go
@@ -71,6 +71,12 @@ func TestGenerate_SettingEnvOverridesMatchModelMetadata(t *testing.T) {
assert.True(t, oidcSecret.Sensitive)
assert.Equal(t, "OIDC_CLIENT_SECRET", oidcSecret.Env)
+ oidcMobileRedirectURIs, ok := entries["oidcMobileRedirectUris"]
+ require.True(t, ok)
+ assert.Equal(t, "OIDC_MOBILE_REDIRECT_URIS", oidcMobileRedirectURIs.Env)
+ assert.Equal(t, "arcane-mobile://oidc-callback", oidcMobileRedirectURIs.DefaultValue)
+ assert.Equal(t, "authentication", oidcMobileRedirectURIs.Category)
+
legacyOIDC, ok := entries["authOidcConfig"]
require.True(t, ok)
assert.True(t, legacyOIDC.Deprecated)
@@ -238,6 +244,7 @@ var expectedEnvConfigVars = []string{
"OIDC_CLIENT_SECRET",
"OIDC_ENABLED",
"OIDC_ISSUER_URL",
+ "OIDC_MOBILE_REDIRECT_URIS",
"OIDC_PROVIDER_LOGO_URL",
"OIDC_PROVIDER_NAME",
"OIDC_SCOPES",
@@ -313,6 +320,7 @@ var expectedSettingOverrideKeys = []string{
"oidcIssuerUrl",
"oidcJwksEndpoint",
"oidcMergeAccounts",
+ "oidcMobileRedirectUris",
"oidcProviderLogoUrl",
"oidcProviderName",
"oidcScopes",
diff --git a/backend/internal/huma/handlers/oidc.go b/backend/internal/huma/handlers/oidc.go
index 252678e81..a07135f9b 100644
--- a/backend/internal/huma/handlers/oidc.go
+++ b/backend/internal/huma/handlers/oidc.go
@@ -223,7 +223,16 @@ func (h *OidcHandler) GetOidcAuthUrl(ctx context.Context, input *GetOidcAuthUrlI
appUrl = h.config.AppUrl
}
origin := httputils.GetClientBaseURL(input.Origin, input.XForwardedHost, input.XForwardedProto, input.Host, appUrl)
- authUrl, stateCookieValue, err := h.oidcService.GenerateAuthURL(ctx, input.Body.RedirectUri, origin)
+
+ mobileRedirectURI := input.Body.MobileRedirectUri
+ if mobileRedirectURI != "" {
+ if err := h.oidcService.ValidateMobileRedirectURI(ctx, mobileRedirectURI); err != nil {
+ slog.WarnContext(ctx, "OIDC auth URL: rejected mobile redirect URI", "uri", mobileRedirectURI, "error", err)
+ return nil, huma.Error400BadRequest(err.Error())
+ }
+ }
+
+ authUrl, stateCookieValue, err := h.oidcService.GenerateAuthURL(ctx, input.Body.RedirectUri, origin, mobileRedirectURI)
if err != nil {
return nil, huma.Error500InternalServerError((&common.OidcAuthUrlGenerationError{Err: err}).Error())
}
@@ -256,8 +265,16 @@ func (h *OidcHandler) HandleOidcCallback(ctx context.Context, input *HandleOidcC
}
origin := httputils.GetClientBaseURL(input.Origin, input.XForwardedHost, input.XForwardedProto, input.Host, appUrl)
+ mobileRedirectURI := input.Body.MobileRedirectUri
+ if mobileRedirectURI != "" {
+ if err := h.oidcService.ValidateMobileRedirectURI(ctx, mobileRedirectURI); err != nil {
+ slog.WarnContext(ctx, "OIDC callback: rejected mobile redirect URI", "uri", mobileRedirectURI, "error", err)
+ return nil, huma.Error400BadRequest(err.Error())
+ }
+ }
+
// Process OIDC callback
- userInfo, tokenResp, err := h.oidcService.HandleCallback(ctx, input.Body.Code, input.Body.State, input.OidcStateCookie, origin)
+ userInfo, tokenResp, err := h.oidcService.HandleCallback(ctx, input.Body.Code, input.Body.State, input.OidcStateCookie, origin, mobileRedirectURI)
if err != nil {
slog.WarnContext(ctx, "OIDC callback failed", "error", err, "origin", origin, "state_present", input.Body.State != "", "code_present", input.Body.Code != "")
return nil, huma.Error400BadRequest((&common.OidcCallbackError{Err: err}).Error())
@@ -269,16 +286,19 @@ func (h *OidcHandler) HandleOidcCallback(ctx context.Context, input *HandleOidcC
return nil, huma.Error500InternalServerError((&common.AuthFailedError{Err: err}).Error())
}
- // Calculate cookie max age
- maxAge := max(int(time.Until(tokenPair.ExpiresAt).Seconds()), 0)
- maxAge += 60 // Add 60 seconds buffer for clock skew
-
- // Build cookies: session token + clear state cookie
- tokenCookie := cookie.BuildTokenCookieString(maxAge, tokenPair.AccessToken)
+ // Build cookies: clear the state cookie always; only set the session
+ // token cookie for browser flows (mobile clients use Bearer tokens from
+ // the JSON body and never consume the cookie).
clearStateCookie := cookie.BuildClearOidcStateCookieString(false)
+ setCookies := []string{clearStateCookie}
+ if mobileRedirectURI == "" {
+ maxAge := max(int(time.Until(tokenPair.ExpiresAt).Seconds()), 0)
+ maxAge += 60 // Add 60 seconds buffer for clock skew
+ setCookies = append(setCookies, cookie.BuildTokenCookieString(maxAge, tokenPair.AccessToken))
+ }
return &HandleOidcCallbackOutput{
- SetCookie: []string{tokenCookie, clearStateCookie},
+ SetCookie: setCookies,
Body: auth.OidcCallbackResponse{
Success: true,
Token: tokenPair.AccessToken,
diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.go
index 2d8face74..41b3f7b3d 100644
--- a/backend/internal/models/settings.go
+++ b/backend/internal/models/settings.go
@@ -166,6 +166,7 @@ type Settings struct {
OidcMergeAccounts SettingVariable `key:"oidcMergeAccounts,authrequired,envOverride" meta:"label=OIDC Account Merging;type=boolean;keywords=oidc,merge,link,accounts,email,match,existing,users,combine;category=authentication;description=Allow OIDC logins to merge with existing accounts by email"`
OidcProviderName SettingVariable `key:"oidcProviderName,public,envOverride" meta:"label=OIDC Provider Name;type=text;keywords=oidc,provider,name,display,label,sso;category=authentication;description=Custom name for the OIDC provider (e.g., Authentik, Keycloak)"`
OidcProviderLogoUrl SettingVariable `key:"oidcProviderLogoUrl,public,envOverride" meta:"label=OIDC Provider Logo URL;type=text;keywords=oidc,provider,logo,url,image,icon,sso;category=authentication;description=Custom logo URL for the OIDC provider"`
+ OidcMobileRedirectUris SettingVariable `key:"oidcMobileRedirectUris,envOverride" meta:"label=OIDC Mobile Redirect URIs;type=text;keywords=oidc,mobile,redirect,uri,callback,scheme,ios,android,native;category=authentication;description=Comma-separated allowlist of native app redirect URIs (e.g., arcane-mobile://oidc-callback)"`
// Appearance category
MobileNavigationMode SettingVariable `key:"mobileNavigationMode,authrequired,local" meta:"label=Mobile Navigation Mode;type=select;keywords=mode,style,type,floating,docked,position,layout,design,appearance,bottom;category=appearance;description=Choose between floating or docked navigation on mobile" catmeta:"id=appearance;title=Appearance;icon=appearance;url=/settings/appearance;description=Customize navigation, theme, and interface behavior"`
diff --git a/backend/internal/services/oidc_service.go b/backend/internal/services/oidc_service.go
index 577cfb3e9..e84535366 100644
--- a/backend/internal/services/oidc_service.go
+++ b/backend/internal/services/oidc_service.go
@@ -29,6 +29,7 @@ import (
type OidcService struct {
authService *AuthService
+ settingsService *SettingsService
config *config.Config
httpClient *http.Client
insecureHttpClient *http.Client
@@ -47,7 +48,7 @@ type OidcState struct {
CreatedAt time.Time `json:"created_at"`
}
-func NewOidcService(authService *AuthService, cfg *config.Config, httpClient *http.Client) *OidcService {
+func NewOidcService(authService *AuthService, settingsService *SettingsService, cfg *config.Config, httpClient *http.Client) *OidcService {
if httpClient == nil {
httpClient = http.DefaultClient
}
@@ -58,13 +59,14 @@ func NewOidcService(authService *AuthService, cfg *config.Config, httpClient *ht
oidcClient.Timeout = 0
return &OidcService{
- authService: authService,
- config: cfg,
- httpClient: &oidcClient,
+ authService: authService,
+ settingsService: settingsService,
+ config: cfg,
+ httpClient: &oidcClient,
}
}
-func (s *OidcService) getEffectiveConfig(ctx context.Context) (*models.OidcConfig, error) {
+func (s *OidcService) getEffectiveConfigInternal(ctx context.Context) (*models.OidcConfig, error) {
config, err := s.authService.GetOidcConfig(ctx)
if err != nil {
return nil, fmt.Errorf("failed to get OIDC config: %w", err)
@@ -75,14 +77,14 @@ func (s *OidcService) getEffectiveConfig(ctx context.Context) (*models.OidcConfi
return config, nil
}
-func (s *OidcService) getHttpClient(skipTlsVerify bool) *http.Client {
+func (s *OidcService) getHttpClientInternal(skipTlsVerify bool) *http.Client {
if skipTlsVerify {
- return s.getInsecureHttpClient()
+ return s.getInsecureHttpClientInternal()
}
return s.httpClient
}
-func (s *OidcService) getInsecureHttpClient() *http.Client {
+func (s *OidcService) getInsecureHttpClientInternal() *http.Client {
s.providerMutex.RLock()
if s.insecureHttpClient != nil {
s.providerMutex.RUnlock()
@@ -124,14 +126,14 @@ func (s *OidcService) getInsecureHttpClient() *http.Client {
// Force HTTP/2 even with custom TLS config to avoid "malformed HTTP response" errors
// when the server speaks HTTP/2 but the client disabled it due to custom TLS config.
if err := http2.ConfigureTransport(insecureTransport); err != nil {
- slog.Warn("getInsecureHttpClient: failed to configure http2 transport", "error", err)
+ slog.Warn("getInsecureHttpClientInternal: failed to configure http2 transport", "error", err)
}
insecureClient.Transport = insecureTransport
s.insecureHttpClient = &insecureClient
return s.insecureHttpClient
}
-func (s *OidcService) ensureOpenIDScope(scopes []string) []string {
+func (s *OidcService) ensureOpenIDScopeInternal(scopes []string) []string {
hasOpenID := slices.Contains(scopes, oidc.ScopeOpenID)
if !hasOpenID {
scopes = append([]string{oidc.ScopeOpenID}, scopes...)
@@ -139,16 +141,16 @@ func (s *OidcService) ensureOpenIDScope(scopes []string) []string {
return scopes
}
-func (s *OidcService) hasManualEndpoints(cfg *models.OidcConfig) bool {
+func (s *OidcService) hasManualEndpointsInternal(cfg *models.OidcConfig) bool {
return cfg.AuthorizationEndpoint != "" || cfg.TokenEndpoint != "" || cfg.UserinfoEndpoint != ""
}
-func (s *OidcService) getOauth2Config(cfg *models.OidcConfig, provider *oidc.Provider, origin string) (oauth2.Config, error) {
+func (s *OidcService) getOauth2ConfigInternal(cfg *models.OidcConfig, provider *oidc.Provider, origin, mobileRedirectURI string) (oauth2.Config, error) {
scopes := strings.Fields(cfg.Scopes)
if len(scopes) == 0 {
scopes = []string{"email", "profile"}
}
- scopes = s.ensureOpenIDScope(scopes)
+ scopes = s.ensureOpenIDScopeInternal(scopes)
var endpoint oauth2.Endpoint
if provider != nil {
@@ -163,26 +165,66 @@ func (s *OidcService) getOauth2Config(cfg *models.OidcConfig, provider *oidc.Pro
return oauth2.Config{}, errors.New("authorization and token endpoints must be configured")
}
+ redirectURL := mobileRedirectURI
+ if redirectURL == "" {
+ redirectURL = s.GetOidcRedirectURL(origin)
+ }
+
return oauth2.Config{
ClientID: cfg.ClientID,
ClientSecret: cfg.ClientSecret,
Endpoint: endpoint,
- RedirectURL: s.GetOidcRedirectURL(origin),
+ RedirectURL: redirectURL,
Scopes: scopes,
}, nil
}
-func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo string, origin string) (string, string, error) {
- config, err := s.getEffectiveConfig(ctx)
+// GetMobileRedirectAllowlist returns the configured list of acceptable mobile OAuth redirect URIs.
+func (s *OidcService) GetMobileRedirectAllowlist(ctx context.Context) []string {
+ raw := ""
+ if s.config != nil {
+ raw = s.config.OidcMobileRedirectUris
+ }
+ if s.settingsService != nil {
+ raw = s.settingsService.GetStringSetting(ctx, "oidcMobileRedirectUris", raw)
+ }
+ parts := strings.Split(raw, ",")
+ allowlist := make([]string, 0, len(parts))
+ for _, p := range parts {
+ trimmed := strings.TrimSpace(p)
+ if trimmed != "" {
+ allowlist = append(allowlist, trimmed)
+ }
+ }
+ return allowlist
+}
+
+// ValidateMobileRedirectURI returns nil if uri exactly matches one of the
+// configured mobile redirect URIs. Full-string match is required — partial
+// matches on scheme or host could be abused for open-redirect attacks.
+func (s *OidcService) ValidateMobileRedirectURI(ctx context.Context, uri string) error {
+ if uri == "" {
+ return errors.New("mobile redirect URI is empty")
+ }
+ for _, allowed := range s.GetMobileRedirectAllowlist(ctx) {
+ if allowed == uri {
+ return nil
+ }
+ }
+ return fmt.Errorf("mobile redirect URI %q is not in the configured allowlist", uri)
+}
+
+func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo string, origin string, mobileRedirectURI string) (string, string, error) {
+ config, err := s.getEffectiveConfigInternal(ctx)
if err != nil {
slog.Error("GenerateAuthURL: failed to get OIDC config", "error", err)
return "", "", err
}
var provider *oidc.Provider
- if !s.hasManualEndpoints(config) {
+ if !s.hasManualEndpointsInternal(config) {
var err error
- provider, err = s.getOrDiscoverProvider(ctx, config)
+ provider, err = s.getOrDiscoverProviderInternal(ctx, config)
if err != nil {
slog.Error("GenerateAuthURL: provider discovery failed", "issuer", config.IssuerURL, "error", err)
return "", "", fmt.Errorf("failed to discover provider: %w", err)
@@ -193,7 +235,7 @@ func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo string, or
nonce := utils.GenerateRandomString(32)
codeVerifier := utils.GenerateRandomString(128)
- oauth2Config, err := s.getOauth2Config(config, provider, origin)
+ oauth2Config, err := s.getOauth2ConfigInternal(config, provider, origin, mobileRedirectURI)
if err != nil {
slog.Error("GenerateAuthURL: invalid OIDC endpoints", "error", err)
return "", "", err
@@ -231,7 +273,7 @@ func (s *OidcService) GetOidcRedirectURL(origin string) string {
return baseUrl + "/auth/oidc/callback"
}
-func (s *OidcService) getOrDiscoverProvider(ctx context.Context, cfg *models.OidcConfig) (*oidc.Provider, error) {
+func (s *OidcService) getOrDiscoverProviderInternal(ctx context.Context, cfg *models.OidcConfig) (*oidc.Provider, error) {
issuer := cfg.IssuerURL
skipTls := cfg.SkipTlsVerify
@@ -263,10 +305,10 @@ func (s *OidcService) getOrDiscoverProvider(ctx context.Context, cfg *models.Oid
defer cancel()
// Use the custom HTTP client with the new context
- providerCtx := oidc.ClientContext(discoveryCtx, s.getHttpClient(skipTls))
- provider, discoveredIssuer, err := s.discoverProvider(providerCtx, issuer)
+ providerCtx := oidc.ClientContext(discoveryCtx, s.getHttpClientInternal(skipTls))
+ provider, discoveredIssuer, err := s.discoverProviderInternal(providerCtx, issuer)
if err != nil {
- slog.ErrorContext(ctx, "getOrDiscoverProvider: discovery failed", "issuer", issuer, "skipTls", skipTls, "error", err)
+ slog.ErrorContext(ctx, "getOrDiscoverProviderInternal: discovery failed", "issuer", issuer, "skipTls", skipTls, "error", err)
return nil, fmt.Errorf("failed to discover provider at %s: %w", issuer, err)
}
@@ -278,7 +320,7 @@ func (s *OidcService) getOrDiscoverProvider(ctx context.Context, cfg *models.Oid
s.cachedSkipTls = skipTls
s.providerMutex.Unlock()
- slog.DebugContext(ctx, "getOrDiscoverProvider: provider cached", "issuer", issuer, "effectiveIssuer", discoveredIssuer, "skipTls", skipTls)
+ slog.DebugContext(ctx, "getOrDiscoverProviderInternal: provider cached", "issuer", issuer, "effectiveIssuer", discoveredIssuer, "skipTls", skipTls)
return provider, nil
})
@@ -289,7 +331,7 @@ func (s *OidcService) getOrDiscoverProvider(ctx context.Context, cfg *models.Oid
return v.(*oidc.Provider), nil
}
-func (s *OidcService) discoverProvider(ctx context.Context, issuer string) (*oidc.Provider, string, error) {
+func (s *OidcService) discoverProviderInternal(ctx context.Context, issuer string) (*oidc.Provider, string, error) {
provider, err := oidc.NewProvider(ctx, issuer)
if err == nil {
return provider, issuer, nil
@@ -300,42 +342,42 @@ func (s *OidcService) discoverProvider(ctx context.Context, issuer string) (*oid
altIssuer = issuer + "/"
}
- slog.WarnContext(ctx, "getOrDiscoverProvider: retrying discovery with alternate issuer", "configured", issuer, "alternate", altIssuer)
+ slog.WarnContext(ctx, "getOrDiscoverProviderInternal: retrying discovery with alternate issuer", "configured", issuer, "alternate", altIssuer)
provider, altErr := oidc.NewProvider(ctx, altIssuer)
if altErr == nil {
return provider, altIssuer, nil
}
- slog.ErrorContext(ctx, "getOrDiscoverProvider: discovery failed with alternate issuer", "issuer", altIssuer, "error", altErr)
+ slog.ErrorContext(ctx, "getOrDiscoverProviderInternal: discovery failed with alternate issuer", "issuer", altIssuer, "error", altErr)
return nil, issuer, err
}
-func (s *OidcService) exchangeToken(ctx context.Context, cfg *models.OidcConfig, provider *oidc.Provider, code string, verifier string, origin string) (*oauth2.Token, error) {
- oauth2Config, err := s.getOauth2Config(cfg, provider, origin)
+func (s *OidcService) exchangeTokenInternal(ctx context.Context, cfg *models.OidcConfig, provider *oidc.Provider, code string, verifier string, origin string, mobileRedirectURI string) (*oauth2.Token, error) {
+ oauth2Config, err := s.getOauth2ConfigInternal(cfg, provider, origin, mobileRedirectURI)
if err != nil {
return nil, err
}
- providerCtx := oidc.ClientContext(ctx, s.getHttpClient(cfg.SkipTlsVerify))
+ providerCtx := oidc.ClientContext(ctx, s.getHttpClientInternal(cfg.SkipTlsVerify))
token, err := oauth2Config.Exchange(providerCtx, code, oauth2.VerifierOption(verifier))
if err != nil {
- slog.Error("exchangeToken: token exchange failed", "token_endpoint", oauth2Config.Endpoint.TokenURL, "error", err)
+ slog.Error("exchangeTokenInternal: token exchange failed", "token_endpoint", oauth2Config.Endpoint.TokenURL, "error", err)
return nil, fmt.Errorf("failed to exchange authorization code: %w", err)
}
- slog.Debug("exchangeToken: token exchange successful", "has_access_token", token.AccessToken != "", "has_refresh_token", token.RefreshToken != "")
+ slog.Debug("exchangeTokenInternal: token exchange successful", "has_access_token", token.AccessToken != "", "has_refresh_token", token.RefreshToken != "")
return token, nil
}
-func (s *OidcService) fetchClaims(ctx context.Context, cfg *models.OidcConfig, provider *oidc.Provider, token *oauth2.Token, idToken *oidc.IDToken) (map[string]any, error) {
- providerCtx := oidc.ClientContext(ctx, s.getHttpClient(cfg.SkipTlsVerify))
+func (s *OidcService) fetchClaimsInternal(ctx context.Context, cfg *models.OidcConfig, provider *oidc.Provider, token *oauth2.Token, idToken *oidc.IDToken) (map[string]any, error) {
+ providerCtx := oidc.ClientContext(ctx, s.getHttpClientInternal(cfg.SkipTlsVerify))
var claims map[string]any
if idToken != nil {
if err := idToken.Claims(&claims); err != nil {
- slog.Warn("fetchClaims: failed to extract claims from ID token", "error", err)
+ slog.Warn("fetchClaimsInternal: failed to extract claims from ID token", "error", err)
} else {
- slog.Debug("fetchClaims: extracted claims from ID token")
+ slog.Debug("fetchClaimsInternal: extracted claims from ID token")
}
}
@@ -344,31 +386,31 @@ func (s *OidcService) fetchClaims(ctx context.Context, cfg *models.OidcConfig, p
case provider != nil:
userInfo, err := provider.UserInfo(providerCtx, oauth2.StaticTokenSource(token))
if err != nil {
- slog.Debug("fetchClaims: userinfo endpoint call failed", "error", err)
+ slog.Debug("fetchClaimsInternal: userinfo endpoint call failed", "error", err)
if claims != nil {
return claims, nil
}
return nil, fmt.Errorf("failed to fetch userinfo: %w", err)
}
if err := userInfo.Claims(&userInfoClaims); err != nil {
- slog.Warn("fetchClaims: failed to decode userinfo claims", "error", err)
+ slog.Warn("fetchClaimsInternal: failed to decode userinfo claims", "error", err)
if claims != nil {
return claims, nil
}
return nil, fmt.Errorf("failed to decode userinfo claims: %w", err)
}
- slog.Debug("fetchClaims: fetched userinfo claims successfully")
+ slog.Debug("fetchClaimsInternal: fetched userinfo claims successfully")
case cfg.UserinfoEndpoint != "":
- manualClaims, err := s.fetchUserInfoClaims(providerCtx, cfg, token)
+ manualClaims, err := s.fetchUserInfoClaimsInternal(providerCtx, cfg, token)
if err != nil {
- slog.Debug("fetchClaims: userinfo endpoint call failed", "error", err)
+ slog.Debug("fetchClaimsInternal: userinfo endpoint call failed", "error", err)
if claims != nil {
return claims, nil
}
return nil, fmt.Errorf("failed to fetch userinfo: %w", err)
}
userInfoClaims = manualClaims
- slog.Debug("fetchClaims: fetched userinfo claims successfully")
+ slog.Debug("fetchClaimsInternal: fetched userinfo claims successfully")
case claims != nil:
return claims, nil
default:
@@ -387,7 +429,7 @@ func (s *OidcService) fetchClaims(ctx context.Context, cfg *models.OidcConfig, p
return claims, nil
}
-func (s *OidcService) fetchUserInfoClaims(ctx context.Context, cfg *models.OidcConfig, token *oauth2.Token) (map[string]any, error) {
+func (s *OidcService) fetchUserInfoClaimsInternal(ctx context.Context, cfg *models.OidcConfig, token *oauth2.Token) (map[string]any, error) {
if cfg.UserinfoEndpoint == "" {
return nil, errors.New("userinfo endpoint not configured")
}
@@ -407,7 +449,7 @@ func (s *OidcService) fetchUserInfoClaims(ctx context.Context, cfg *models.OidcC
request.Header.Set("Authorization", fmt.Sprintf("%s %s", tokenType, token.AccessToken))
request.Header.Set("Accept", "application/json")
- client := s.getHttpClient(cfg.SkipTlsVerify)
+ client := s.getHttpClientInternal(cfg.SkipTlsVerify)
resp, err := client.Do(request) //nolint:gosec // intentional request to configured OIDC userinfo endpoint
if err != nil {
return nil, err
@@ -427,43 +469,43 @@ func (s *OidcService) fetchUserInfoClaims(ctx context.Context, cfg *models.OidcC
return claims, nil
}
-func (s *OidcService) HandleCallback(ctx context.Context, code, state, storedState, origin string) (*auth.OidcUserInfo, *auth.OidcTokenResponse, error) {
+func (s *OidcService) HandleCallback(ctx context.Context, code, state, storedState, origin, mobileRedirectURI string) (*auth.OidcUserInfo, *auth.OidcTokenResponse, error) {
slog.Debug("HandleCallback: processing callback", "code_present", code != "", "state_present", state != "")
- stateData, err := s.validateState(state, storedState)
+ stateData, err := s.validateStateInternal(state, storedState)
if err != nil {
return nil, nil, err
}
- cfg, err := s.getEffectiveConfig(ctx)
+ cfg, err := s.getEffectiveConfigInternal(ctx)
if err != nil {
slog.Error("HandleCallback: failed to get OIDC config", "error", err)
return nil, nil, err
}
var provider *oidc.Provider
- if !s.hasManualEndpoints(cfg) {
- provider, err = s.getOrDiscoverProvider(ctx, cfg)
+ if !s.hasManualEndpointsInternal(cfg) {
+ provider, err = s.getOrDiscoverProviderInternal(ctx, cfg)
if err != nil {
return nil, nil, err
}
}
- token, err := s.exchangeToken(ctx, cfg, provider, code, stateData.CodeVerifier, origin)
+ token, err := s.exchangeTokenInternal(ctx, cfg, provider, code, stateData.CodeVerifier, origin, mobileRedirectURI)
if err != nil {
return nil, nil, err
}
- idToken, rawIDToken, err := s.verifyIDToken(ctx, provider, cfg, token, stateData.Nonce)
+ idToken, rawIDToken, err := s.verifyIDTokenInternal(ctx, provider, cfg, token, stateData.Nonce)
if err != nil {
return nil, nil, err
}
- return s.buildUserInfo(ctx, provider, cfg, token, idToken, rawIDToken)
+ return s.buildUserInfoInternal(ctx, provider, cfg, token, idToken, rawIDToken)
}
-func (s *OidcService) validateState(state, storedState string) (*OidcState, error) {
- stateData, err := s.decodeState(storedState)
+func (s *OidcService) validateStateInternal(state, storedState string) (*OidcState, error) {
+ stateData, err := s.decodeStateInternal(storedState)
if err != nil {
slog.Error("HandleCallback: failed to decode stored state", "error", err)
return nil, fmt.Errorf("invalid state parameter: %w", err)
@@ -481,7 +523,7 @@ func (s *OidcService) validateState(state, storedState string) (*OidcState, erro
return stateData, nil
}
-func (s *OidcService) verifyIDToken(ctx context.Context, provider *oidc.Provider, cfg *models.OidcConfig, token *oauth2.Token, nonce string) (*oidc.IDToken, string, error) {
+func (s *OidcService) verifyIDTokenInternal(ctx context.Context, provider *oidc.Provider, cfg *models.OidcConfig, token *oauth2.Token, nonce string) (*oidc.IDToken, string, error) {
var rawIDToken string
if idTokenValue := token.Extra("id_token"); idTokenValue != nil {
if idTokenStr, ok := idTokenValue.(string); ok {
@@ -502,7 +544,7 @@ func (s *OidcService) verifyIDToken(ctx context.Context, provider *oidc.Provider
verifierConfig.Now = time.Now
}
- providerCtx := oidc.ClientContext(ctx, s.getHttpClient(cfg.SkipTlsVerify))
+ providerCtx := oidc.ClientContext(ctx, s.getHttpClientInternal(cfg.SkipTlsVerify))
var verifier *oidc.IDTokenVerifier
if provider != nil {
verifier = provider.Verifier(verifierConfig)
@@ -538,8 +580,8 @@ func (s *OidcService) verifyIDToken(ctx context.Context, provider *oidc.Provider
return idToken, rawIDToken, nil
}
-func (s *OidcService) buildUserInfo(ctx context.Context, provider *oidc.Provider, cfg *models.OidcConfig, token *oauth2.Token, idToken *oidc.IDToken, rawIDToken string) (*auth.OidcUserInfo, *auth.OidcTokenResponse, error) {
- claims, err := s.fetchClaims(ctx, cfg, provider, token, idToken)
+func (s *OidcService) buildUserInfoInternal(ctx context.Context, provider *oidc.Provider, cfg *models.OidcConfig, token *oauth2.Token, idToken *oidc.IDToken, rawIDToken string) (*auth.OidcUserInfo, *auth.OidcTokenResponse, error) {
+ claims, err := s.fetchClaimsInternal(ctx, cfg, provider, token, idToken)
if err != nil {
slog.Error("HandleCallback: failed to fetch claims", "error", err)
return nil, nil, fmt.Errorf("failed to fetch user claims: %w", err)
@@ -585,16 +627,16 @@ func (s *OidcService) buildUserInfo(ctx context.Context, provider *oidc.Provider
return &userInfoDto, tokenResp, nil
}
-func (s *OidcService) decodeState(encodedState string) (*OidcState, error) {
+func (s *OidcService) decodeStateInternal(encodedState string) (*OidcState, error) {
stateJSON, err := base64.URLEncoding.DecodeString(encodedState)
if err != nil {
- slog.Error("decodeState: failed to decode base64 state", "error", err)
+ slog.Error("decodeStateInternal: failed to decode base64 state", "error", err)
return nil, err
}
var stateData OidcState
if err := json.Unmarshal(stateJSON, &stateData); err != nil {
- slog.Error("decodeState: failed to unmarshal state JSON", "error", err)
+ slog.Error("decodeStateInternal: failed to unmarshal state JSON", "error", err)
return nil, err
}
@@ -603,13 +645,13 @@ func (s *OidcService) decodeState(encodedState string) (*OidcState, error) {
// InitiateDeviceAuth initiates the OIDC device authorization flow.
func (s *OidcService) InitiateDeviceAuth(ctx context.Context) (*auth.OidcDeviceAuthResponse, error) {
- cfg, err := s.getEffectiveConfig(ctx)
+ cfg, err := s.getEffectiveConfigInternal(ctx)
if err != nil {
slog.Error("InitiateDeviceAuth: failed to get OIDC config", "error", err)
return nil, err
}
- deviceEndpoint, err := s.getDeviceAuthorizationEndpoint(ctx, cfg)
+ deviceEndpoint, err := s.getDeviceAuthorizationEndpointInternal(ctx, cfg)
if err != nil {
slog.Error("InitiateDeviceAuth: failed to get device endpoint", "error", err)
return nil, err
@@ -619,7 +661,7 @@ func (s *OidcService) InitiateDeviceAuth(ctx context.Context) (*auth.OidcDeviceA
if len(scopes) == 0 {
scopes = []string{"email", "profile"}
}
- scopes = s.ensureOpenIDScope(scopes)
+ scopes = s.ensureOpenIDScopeInternal(scopes)
values := url.Values{}
values.Set("client_id", cfg.ClientID)
@@ -628,7 +670,7 @@ func (s *OidcService) InitiateDeviceAuth(ctx context.Context) (*auth.OidcDeviceA
values.Set("client_secret", cfg.ClientSecret)
}
- respData, err := s.makeDeviceAuthRequest(ctx, deviceEndpoint, values, cfg.SkipTlsVerify)
+ respData, err := s.makeDeviceAuthRequestInternal(ctx, deviceEndpoint, values, cfg.SkipTlsVerify)
if err != nil {
return nil, err
}
@@ -670,13 +712,13 @@ func (s *OidcService) InitiateDeviceAuth(ctx context.Context) (*auth.OidcDeviceA
return response, nil
}
-// getDeviceAuthorizationEndpoint discovers or returns the configured device authorization endpoint.
-func (s *OidcService) getDeviceAuthorizationEndpoint(ctx context.Context, cfg *models.OidcConfig) (string, error) {
+// getDeviceAuthorizationEndpointInternal discovers or returns the configured device authorization endpoint.
+func (s *OidcService) getDeviceAuthorizationEndpointInternal(ctx context.Context, cfg *models.OidcConfig) (string, error) {
if cfg.DeviceAuthorizationEndpoint != "" {
return cfg.DeviceAuthorizationEndpoint, nil
}
- provider, err := s.getOrDiscoverProvider(ctx, cfg)
+ provider, err := s.getOrDiscoverProviderInternal(ctx, cfg)
if err != nil {
return "", fmt.Errorf("failed to discover provider: %w", err)
}
@@ -695,8 +737,8 @@ func (s *OidcService) getDeviceAuthorizationEndpoint(ctx context.Context, cfg *m
return claims.DeviceAuthorizationEndpoint, nil
}
-// makeDeviceAuthRequest makes a device authorization request.
-func (s *OidcService) makeDeviceAuthRequest(ctx context.Context, endpoint string, params url.Values, skipTls bool) (map[string]any, error) {
+// makeDeviceAuthRequestInternal makes a device authorization request.
+func (s *OidcService) makeDeviceAuthRequestInternal(ctx context.Context, endpoint string, params url.Values, skipTls bool) (map[string]any, error) {
body := params.Encode()
req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, strings.NewReader(body))
@@ -706,10 +748,10 @@ func (s *OidcService) makeDeviceAuthRequest(ctx context.Context, endpoint string
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
req.Header.Set("Accept", "application/json")
- client := s.getHttpClient(skipTls)
+ client := s.getHttpClientInternal(skipTls)
resp, err := client.Do(req) //nolint:gosec // intentional request to configured OIDC device authorization endpoint
if err != nil {
- slog.Error("makeDeviceAuthRequest: request failed", "error", err)
+ slog.Error("makeDeviceAuthRequestInternal: request failed", "error", err)
return nil, fmt.Errorf("device authorization request failed: %w", err)
}
defer func() { _ = resp.Body.Close() }()
@@ -734,7 +776,7 @@ func (s *OidcService) makeDeviceAuthRequest(ctx context.Context, endpoint string
// ExchangeDeviceToken exchanges a device code for tokens.
func (s *OidcService) ExchangeDeviceToken(ctx context.Context, deviceCode string) (*auth.OidcUserInfo, *auth.OidcTokenResponse, error) {
- cfg, err := s.getEffectiveConfig(ctx)
+ cfg, err := s.getEffectiveConfigInternal(ctx)
if err != nil {
slog.Error("ExchangeDeviceToken: failed to get OIDC config", "error", err)
return nil, nil, err
@@ -744,7 +786,7 @@ func (s *OidcService) ExchangeDeviceToken(ctx context.Context, deviceCode string
if cfg.TokenEndpoint != "" {
tokenEndpoint = cfg.TokenEndpoint
} else {
- provider, err := s.getOrDiscoverProvider(ctx, cfg)
+ provider, err := s.getOrDiscoverProviderInternal(ctx, cfg)
if err != nil {
return nil, nil, err
}
@@ -760,14 +802,14 @@ func (s *OidcService) ExchangeDeviceToken(ctx context.Context, deviceCode string
params["client_secret"] = cfg.ClientSecret
}
- tokenResp, err := s.makeTokenRequest(ctx, tokenEndpoint, params, cfg.SkipTlsVerify)
+ tokenResp, err := s.makeTokenRequestInternal(ctx, tokenEndpoint, params, cfg.SkipTlsVerify)
if err != nil {
return nil, nil, err
}
var provider *oidc.Provider
- if !s.hasManualEndpoints(cfg) {
- provider, err = s.getOrDiscoverProvider(ctx, cfg)
+ if !s.hasManualEndpointsInternal(cfg) {
+ provider, err = s.getOrDiscoverProviderInternal(ctx, cfg)
if err != nil {
return nil, nil, err
}
@@ -792,16 +834,16 @@ func (s *OidcService) ExchangeDeviceToken(ctx context.Context, deviceCode string
token = token.WithExtra(map[string]any{"id_token": idToken})
}
- idToken, rawIDToken, err := s.verifyIDToken(ctx, provider, cfg, token, "")
+ idToken, rawIDToken, err := s.verifyIDTokenInternal(ctx, provider, cfg, token, "")
if err != nil {
return nil, nil, err
}
- return s.buildUserInfo(ctx, provider, cfg, token, idToken, rawIDToken)
+ return s.buildUserInfoInternal(ctx, provider, cfg, token, idToken, rawIDToken)
}
-// makeTokenRequest makes a token exchange request.
-func (s *OidcService) makeTokenRequest(ctx context.Context, endpoint string, params map[string]string, skipTls bool) (map[string]any, error) {
+// makeTokenRequestInternal makes a token exchange request.
+func (s *OidcService) makeTokenRequestInternal(ctx context.Context, endpoint string, params map[string]string, skipTls bool) (map[string]any, error) {
values := url.Values{}
for k, v := range params {
values.Set(k, v)
@@ -815,10 +857,10 @@ func (s *OidcService) makeTokenRequest(ctx context.Context, endpoint string, par
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
req.Header.Set("Accept", "application/json")
- client := s.getHttpClient(skipTls)
+ client := s.getHttpClientInternal(skipTls)
resp, err := client.Do(req) //nolint:gosec // intentional request to configured OIDC token endpoint
if err != nil {
- slog.Error("makeTokenRequest: request failed", "error", err)
+ slog.Error("makeTokenRequestInternal: request failed", "error", err)
return nil, fmt.Errorf("token request failed: %w", err)
}
defer func() { _ = resp.Body.Close() }()
diff --git a/backend/internal/services/oidc_service_test.go b/backend/internal/services/oidc_service_test.go
new file mode 100644
index 000000000..8de787a7b
--- /dev/null
+++ b/backend/internal/services/oidc_service_test.go
@@ -0,0 +1,85 @@
+package services
+
+import (
+ "context"
+ "testing"
+
+ "github.com/getarcaneapp/arcane/backend/internal/config"
+)
+
+func TestValidateMobileRedirectURI(t *testing.T) {
+ ctx := context.Background()
+ s := &OidcService{
+ config: &config.Config{
+ OidcMobileRedirectUris: "arcane-mobile://oidc-callback, arcane-mobile://oauth",
+ },
+ }
+
+ cases := []struct {
+ name string
+ uri string
+ wantErr bool
+ }{
+ {"exact match first", "arcane-mobile://oidc-callback", false},
+ {"exact match second", "arcane-mobile://oauth", false},
+ {"empty rejected", "", true},
+ {"scheme-only attack", "arcane-mobile://attacker", true},
+ {"different scheme", "https://oidc-callback", true},
+ {"trailing-slash mismatch", "arcane-mobile://oidc-callback/", true},
+ }
+
+ for _, tc := range cases {
+ t.Run(tc.name, func(t *testing.T) {
+ err := s.ValidateMobileRedirectURI(ctx, tc.uri)
+ if (err != nil) != tc.wantErr {
+ t.Fatalf("ValidateMobileRedirectURI(%q): wantErr=%v got err=%v", tc.uri, tc.wantErr, err)
+ }
+ })
+ }
+}
+
+func TestGetMobileRedirectAllowlistTrimsWhitespace(t *testing.T) {
+ ctx := context.Background()
+ s := &OidcService{
+ config: &config.Config{
+ OidcMobileRedirectUris: " arcane-mobile://a ,arcane-mobile://b ,, arcane-mobile://c",
+ },
+ }
+
+ got := s.GetMobileRedirectAllowlist(ctx)
+ want := []string{"arcane-mobile://a", "arcane-mobile://b", "arcane-mobile://c"}
+ if len(got) != len(want) {
+ t.Fatalf("got %d entries (%v), want %d (%v)", len(got), got, len(want), want)
+ }
+ for i, w := range want {
+ if got[i] != w {
+ t.Fatalf("entry %d: got %q, want %q", i, got[i], w)
+ }
+ }
+}
+
+func TestGetMobileRedirectAllowlistUsesSettings(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ settingsService, err := NewSettingsService(ctx, db)
+ if err != nil {
+ t.Fatalf("NewSettingsService: %v", err)
+ }
+ if err := settingsService.UpdateSetting(ctx, "oidcMobileRedirectUris", "arcane-mobile://db-callback"); err != nil {
+ t.Fatalf("UpdateSetting: %v", err)
+ }
+
+ s := &OidcService{
+ settingsService: settingsService,
+ config: &config.Config{
+ OidcMobileRedirectUris: "arcane-mobile://config-callback",
+ },
+ }
+
+ if err := s.ValidateMobileRedirectURI(ctx, "arcane-mobile://db-callback"); err != nil {
+ t.Fatalf("ValidateMobileRedirectURI db value: %v", err)
+ }
+ if err := s.ValidateMobileRedirectURI(ctx, "arcane-mobile://config-callback"); err == nil {
+ t.Fatal("ValidateMobileRedirectURI config fallback should fail when DB setting is configured")
+ }
+}
diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.go
index 1408c9ea4..02e539e91 100644
--- a/backend/internal/services/settings_service.go
+++ b/backend/internal/services/settings_service.go
@@ -168,6 +168,7 @@ func DefaultSettingsConfig() *models.Settings {
OidcMergeAccounts: models.SettingVariable{Value: "false"},
OidcProviderName: models.SettingVariable{Value: ""},
OidcProviderLogoUrl: models.SettingVariable{Value: ""},
+ OidcMobileRedirectUris: models.SettingVariable{Value: "arcane-mobile://oidc-callback"},
MobileNavigationMode: models.SettingVariable{Value: "floating"},
MobileNavigationShowLabels: models.SettingVariable{Value: "true"},
SidebarHoverExpansion: models.SettingVariable{Value: "true"},
diff --git a/frontend/src/routes/(app)/swarm/nodes/swarm-node-label-dialog.svelte b/frontend/src/routes/(app)/swarm/nodes/swarm-node-label-dialog.svelte
index 1888471e5..c6bd956b9 100644
--- a/frontend/src/routes/(app)/swarm/nodes/swarm-node-label-dialog.svelte
+++ b/frontend/src/routes/(app)/swarm/nodes/swarm-node-label-dialog.svelte
@@ -66,7 +66,6 @@
<Label for="label-value">Value</Label>
<Input id="label-value" bind:value placeholder={m.swarm_service_form_value_placeholder()} />
</div>
- <button type="submit" class="hidden"></button>
</form>
{#snippet footer()}
diff --git a/types/auth/oidc.go b/types/auth/oidc.go
index a3c50f00e..a7fc668a2 100644
--- a/types/auth/oidc.go
+++ b/types/auth/oidc.go
@@ -127,6 +127,14 @@ type OidcAuthUrlRequest struct {
//
// Required: true
RedirectUri string `json:"redirectUri"`
+
+ // MobileRedirectUri is the OAuth redirect URI for native mobile clients
+ // (e.g., "arcane-mobile://oidc-callback"). When provided, it must match an
+ // entry in the server's configured mobile redirect allowlist and is used
+ // as the OAuth redirect_uri sent to the OIDC provider.
+ //
+ // Required: false
+ MobileRedirectUri string `json:"mobileRedirectUri,omitempty"`
}
// OidcAuthUrlResponse contains the generated OIDC authorization URL.
@@ -191,6 +199,13 @@ type OidcCallbackRequest struct {
//
// Required: true
State string `json:"state"`
+
+ // MobileRedirectUri must match the value sent with the original
+ // OidcAuthUrlRequest. OAuth requires the redirect_uri to be identical
+ // across the auth code request and the token exchange.
+ //
+ // Required: false
+ MobileRedirectUri string `json:"mobileRedirectUri,omitempty"`
}
// OidcCallbackResponse contains the response from OIDC callback processing.