Skip to content

Modern Docker Management, Designed for Everyone

fix: add configurable security options for trivy scans (#2072)

Kyle Mendellf1677171a24f
diff --git a/.env.example b/.env.example
index 447b6296e..a99ae7214 100644
--- a/.env.example
+++ b/.env.example
@@ -40,6 +40,11 @@ ALLOW_DOWNGRADE=false
# Docker Configuration
# DOCKER_HOST=unix:///var/run/docker.sock # Default: direct socket access
# DOCKER_HOST=tcp://docker-socket-proxy:2375 # Example: via socket proxy for enhanced security
+# Trivy scan container security options (optional, useful on SELinux hosts)
+# Separate multiple entries with commas or new lines, for example: label=disable,label=type:container_runtime_t
+# TRIVY_SECURITY_OPTS=label=disable
+# Run Trivy scan containers in privileged mode only when security options alone are not enough
+# TRIVY_PRIVILEGED=false
# Agent Configuration (optional)
# AGENT_MODE=true
@@ -62,4 +67,4 @@ ALLOW_DOWNGRADE=false
# ============================================================================
# AUTO_LOGIN_ENABLE=false
# AUTO_LOGIN_USERNAME=arcane
-# AUTO_LOGIN_PASSWORD=arcane-admin
\ No newline at end of file
+# AUTO_LOGIN_PASSWORD=arcane-admin
diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.go
index e98522fb1..f31f4c376 100644
--- a/backend/internal/models/settings.go
+++ b/backend/internal/models/settings.go
@@ -84,38 +84,40 @@ type Settings struct {
DepotProjectId SettingVariable `key:"depotProjectId,envOverride" meta:"label=Depot Project ID;type=text;keywords=depot,project,id,build,provider;category=build;description=Depot project identifier"`
DepotToken SettingVariable `key:"depotToken,envOverride,sensitive" meta:"label=Depot Token;type=password;keywords=depot,token,api,secret,build,provider;category=build;description=Depot API token"`
- // Security category
- AuthLocalEnabled SettingVariable `key:"authLocalEnabled,public" meta:"label=Local Authentication;type=boolean;keywords=local,auth,authentication,username,password,login,credentials;category=security;description=Enable local username/password authentication" catmeta:"id=security;title=Security;icon=shield;url=/settings/security;description=Manage authentication and security settings"`
- AuthSessionTimeout SettingVariable `key:"authSessionTimeout" meta:"label=Session Timeout;type=number;keywords=session,timeout,expire,duration,lifetime,minutes,logout;category=security;description=How long user sessions remain active"`
- AuthPasswordPolicy SettingVariable `key:"authPasswordPolicy" meta:"label=Password Policy;type=select;keywords=password,policy,strength,complexity,requirements,security,rules;category=security;description=Set password strength requirements"`
- VulnerabilityScanEnabled SettingVariable `key:"vulnerabilityScanEnabled" meta:"label=Scheduled Vulnerability Scan;type=boolean;keywords=vulnerability,scan,security,trivy,schedule,automatic,cve;category=security;description=Enable scheduled vulnerability scanning of all Docker images"`
+ // Authentication and security categories
+ AuthLocalEnabled SettingVariable `key:"authLocalEnabled,public" meta:"label=Local Authentication;type=boolean;keywords=local,auth,authentication,username,password,login,credentials;category=authentication;description=Enable local username/password authentication" catmeta:"id=authentication;title=Authentication;icon=lock;url=/settings/authentication;description=Manage authentication providers, password policy, and session behavior"`
+ AuthSessionTimeout SettingVariable `key:"authSessionTimeout" meta:"label=Session Timeout;type=number;keywords=session,timeout,expire,duration,lifetime,minutes,logout;category=authentication;description=How long user sessions remain active"`
+ AuthPasswordPolicy SettingVariable `key:"authPasswordPolicy" meta:"label=Password Policy;type=select;keywords=password,policy,strength,complexity,requirements,security,rules;category=authentication;description=Set password strength requirements"`
+ VulnerabilityScanEnabled SettingVariable `key:"vulnerabilityScanEnabled" meta:"label=Scheduled Vulnerability Scan;type=boolean;keywords=vulnerability,scan,security,trivy,schedule,automatic,cve;category=security;description=Enable scheduled vulnerability scanning of all Docker images" catmeta:"id=security;title=Security;icon=shield;url=/settings/security;description=Configure vulnerability scanning and runtime security settings"`
VulnerabilityScanInterval SettingVariable `key:"vulnerabilityScanInterval" meta:"label=Vulnerability Scan Interval;type=cron;keywords=vulnerability,scan,interval,schedule,frequency,trivy,cve;category=security;description=How often to run scheduled vulnerability scans (cron expression)"`
TrivyImage SettingVariable `key:"trivyImage,envOverride" meta:"label=Trivy Image;type=text;keywords=trivy,scanner,vulnerability,security,image;category=security;description=Override the Trivy image used for vulnerability scans"`
TrivyNetwork SettingVariable `key:"trivyNetwork,envOverride" meta:"label=Trivy Network;type=text;keywords=trivy,network,mode,bridge,host,none,scanner,vulnerability,security;category=security;description=Docker network mode/network name used for Trivy scan containers (default: bridge)"`
+ TrivySecurityOpts SettingVariable `key:"trivySecurityOpts,envOverride" meta:"label=Trivy Security Options;type=textarea;keywords=trivy,security,opt,security_opt,selinux,labels,apparmor,scanner;category=security;description=Docker security options applied to Trivy scan containers. Use commas or new lines to separate entries (for example: label=disable)"`
+ TrivyPrivileged SettingVariable `key:"trivyPrivileged,envOverride" meta:"label=Trivy Privileged;type=boolean;keywords=trivy,privileged,security,selinux,scanner;category=security;description=Run Trivy scan containers in privileged mode when required by the host security policy"`
TrivyResourceLimitsEnabled SettingVariable `key:"trivyResourceLimitsEnabled,envOverride" meta:"label=Trivy Resource Limits;type=boolean;keywords=trivy,resources,limits,cpu,memory,ram,security,scan;category=security;description=Enable CPU and memory limits for Trivy scan containers"`
TrivyCpuLimit SettingVariable `key:"trivyCpuLimit,envOverride" meta:"label=Trivy CPU Limit (cores);type=number;keywords=trivy,cpu,cores,limit,scanner,resources;category=security;description=Maximum CPU cores for Trivy scan containers (supports decimals, e.g. 1.5). Set 0 to disable CPU limit"`
TrivyMemoryLimitMb SettingVariable `key:"trivyMemoryLimitMb,envOverride" meta:"label=Trivy Memory Limit (MB);type=number;keywords=trivy,memory,ram,mb,limit,scanner,resources;category=security;description=Maximum memory for Trivy scan containers in MB. Set 0 to disable memory limit"`
TrivyConcurrentScanContainers SettingVariable `key:"trivyConcurrentScanContainers,envOverride" meta:"label=Trivy Concurrent Scan Containers;type=number;keywords=trivy,concurrent,scan,containers,parallel,workers,limit,security;category=security;description=Maximum number of concurrent Trivy scan containers for manual and scheduled scans. Minimum 1"`
TrivyConfig SettingVariable `key:"trivyConfig" meta:"label=Trivy Config (YAML);type=textarea;keywords=trivy,config,yaml,configuration,scanner,settings;category=security;description=Trivy configuration file content in YAML format"`
TrivyIgnore SettingVariable `key:"trivyIgnore" meta:"label=.trivyignore;type=textarea;keywords=trivy,ignore,ignorefile,vulnerabilities,exceptions,exclusions;category=security;description=Trivy ignore file content - one vulnerability ID per line"`
- AuthOidcConfig SettingVariable `key:"authOidcConfig,sensitive,deprecated" meta:"label=OIDC Config;type=text;keywords=oidc,config,client,id,issuer,secret,oauth;category=security;description=OIDC provider configuration (deprecated - use individual fields)"`
- OidcEnabled SettingVariable `key:"oidcEnabled,public,envOverride" meta:"label=OIDC Authentication;type=boolean;keywords=oidc,openid,connect,sso,oauth,external,provider,federation;category=security;description=Enable OpenID Connect (OIDC) authentication"`
- OidcClientId SettingVariable `key:"oidcClientId,public,envOverride" meta:"label=OIDC Client ID;type=text;keywords=oidc,client,id,oauth,openid;category=security;description=OIDC provider client ID"`
- OidcClientSecret SettingVariable `key:"oidcClientSecret,sensitive,envOverride" meta:"label=OIDC Client Secret;type=password;keywords=oidc,client,secret,oauth,openid;category=security;description=OIDC provider client secret"`
- OidcIssuerUrl SettingVariable `key:"oidcIssuerUrl,public,envOverride" meta:"label=OIDC Issuer URL;type=text;keywords=oidc,issuer,url,oauth,openid,provider;category=security;description=OIDC provider issuer URL"`
- OidcAuthorizationEndpoint SettingVariable `key:"oidcAuthorizationEndpoint,envOverride" meta:"label=OIDC Authorization Endpoint;type=text;keywords=oidc,authorization,endpoint,oauth,openid;category=security;description=Override OIDC authorization endpoint"`
- OidcTokenEndpoint SettingVariable `key:"oidcTokenEndpoint,envOverride" meta:"label=OIDC Token Endpoint;type=text;keywords=oidc,token,endpoint,oauth,openid;category=security;description=Override OIDC token endpoint"`
- OidcUserinfoEndpoint SettingVariable `key:"oidcUserinfoEndpoint,envOverride" meta:"label=OIDC Userinfo Endpoint;type=text;keywords=oidc,userinfo,endpoint,oauth,openid;category=security;description=Override OIDC userinfo endpoint"`
- OidcJwksEndpoint SettingVariable `key:"oidcJwksEndpoint,envOverride" meta:"label=OIDC JWKS Endpoint;type=text;keywords=oidc,jwks,keys,endpoint,oauth,openid;category=security;description=Override OIDC JWKS endpoint"`
- OidcDeviceAuthorizationEndpoint SettingVariable `key:"oidcDeviceAuthorizationEndpoint,envOverride" meta:"label=OIDC Device Authorization Endpoint;type=text;keywords=oidc,device,authorization,endpoint,oauth,openid,cli;category=security;description=Override OIDC device authorization endpoint for CLI authentication"`
- OidcScopes SettingVariable `key:"oidcScopes,public,envOverride" meta:"label=OIDC Scopes;type=text;keywords=oidc,scopes,oauth,openid,permissions;category=security;description=OIDC scopes to request"`
- OidcAdminClaim SettingVariable `key:"oidcAdminClaim,public,envOverride" meta:"label=OIDC Admin Claim;type=text;keywords=oidc,admin,claim,role,group;category=security;description=Claim name for admin role mapping"`
- OidcAdminValue SettingVariable `key:"oidcAdminValue,public,envOverride" meta:"label=OIDC Admin Value;type=text;keywords=oidc,admin,value,role,group;category=security;description=Claim value that grants admin access"`
- OidcSkipTlsVerify SettingVariable `key:"oidcSkipTlsVerify,public,envOverride" meta:"label=OIDC Skip TLS Verify;type=boolean;keywords=oidc,tls,verify,skip,insecure;category=security;description=Skip TLS verification for OIDC provider"`
- OidcAutoRedirectToProvider SettingVariable `key:"oidcAutoRedirectToProvider,public,envOverride" meta:"label=OIDC Auto Redirect;type=boolean;keywords=oidc,auto,redirect,automatic,login,provider,sso;category=security;description=Automatically redirect to OIDC provider on login page"`
- OidcMergeAccounts SettingVariable `key:"oidcMergeAccounts,public,envOverride" meta:"label=OIDC Account Merging;type=boolean;keywords=oidc,merge,link,accounts,email,match,existing,users,combine;category=security;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=security;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=security;description=Custom logo URL for the OIDC provider"`
+ AuthOidcConfig SettingVariable `key:"authOidcConfig,sensitive,deprecated" meta:"label=OIDC Config;type=text;keywords=oidc,config,client,id,issuer,secret,oauth;category=authentication;description=OIDC provider configuration (deprecated - use individual fields)"`
+ OidcEnabled SettingVariable `key:"oidcEnabled,public,envOverride" meta:"label=OIDC Authentication;type=boolean;keywords=oidc,openid,connect,sso,oauth,external,provider,federation;category=authentication;description=Enable OpenID Connect (OIDC) authentication"`
+ OidcClientId SettingVariable `key:"oidcClientId,public,envOverride" meta:"label=OIDC Client ID;type=text;keywords=oidc,client,id,oauth,openid;category=authentication;description=OIDC provider client ID"`
+ OidcClientSecret SettingVariable `key:"oidcClientSecret,sensitive,envOverride" meta:"label=OIDC Client Secret;type=password;keywords=oidc,client,secret,oauth,openid;category=authentication;description=OIDC provider client secret"`
+ OidcIssuerUrl SettingVariable `key:"oidcIssuerUrl,public,envOverride" meta:"label=OIDC Issuer URL;type=text;keywords=oidc,issuer,url,oauth,openid,provider;category=authentication;description=OIDC provider issuer URL"`
+ OidcAuthorizationEndpoint SettingVariable `key:"oidcAuthorizationEndpoint,envOverride" meta:"label=OIDC Authorization Endpoint;type=text;keywords=oidc,authorization,endpoint,oauth,openid;category=authentication;description=Override OIDC authorization endpoint"`
+ OidcTokenEndpoint SettingVariable `key:"oidcTokenEndpoint,envOverride" meta:"label=OIDC Token Endpoint;type=text;keywords=oidc,token,endpoint,oauth,openid;category=authentication;description=Override OIDC token endpoint"`
+ OidcUserinfoEndpoint SettingVariable `key:"oidcUserinfoEndpoint,envOverride" meta:"label=OIDC Userinfo Endpoint;type=text;keywords=oidc,userinfo,endpoint,oauth,openid;category=authentication;description=Override OIDC userinfo endpoint"`
+ OidcJwksEndpoint SettingVariable `key:"oidcJwksEndpoint,envOverride" meta:"label=OIDC JWKS Endpoint;type=text;keywords=oidc,jwks,keys,endpoint,oauth,openid;category=authentication;description=Override OIDC JWKS endpoint"`
+ OidcDeviceAuthorizationEndpoint SettingVariable `key:"oidcDeviceAuthorizationEndpoint,envOverride" meta:"label=OIDC Device Authorization Endpoint;type=text;keywords=oidc,device,authorization,endpoint,oauth,openid,cli;category=authentication;description=Override OIDC device authorization endpoint for CLI authentication"`
+ OidcScopes SettingVariable `key:"oidcScopes,public,envOverride" meta:"label=OIDC Scopes;type=text;keywords=oidc,scopes,oauth,openid,permissions;category=authentication;description=OIDC scopes to request"`
+ OidcAdminClaim SettingVariable `key:"oidcAdminClaim,public,envOverride" meta:"label=OIDC Admin Claim;type=text;keywords=oidc,admin,claim,role,group;category=authentication;description=Claim name for admin role mapping"`
+ OidcAdminValue SettingVariable `key:"oidcAdminValue,public,envOverride" meta:"label=OIDC Admin Value;type=text;keywords=oidc,admin,value,role,group;category=authentication;description=Claim value that grants admin access"`
+ OidcSkipTlsVerify SettingVariable `key:"oidcSkipTlsVerify,public,envOverride" meta:"label=OIDC Skip TLS Verify;type=boolean;keywords=oidc,tls,verify,skip,insecure;category=authentication;description=Skip TLS verification for OIDC provider"`
+ OidcAutoRedirectToProvider SettingVariable `key:"oidcAutoRedirectToProvider,public,envOverride" meta:"label=OIDC Auto Redirect;type=boolean;keywords=oidc,auto,redirect,automatic,login,provider,sso;category=authentication;description=Automatically redirect to OIDC provider on login page"`
+ OidcMergeAccounts SettingVariable `key:"oidcMergeAccounts,public,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"`
// Appearance category
MobileNavigationMode SettingVariable `key:"mobileNavigationMode,public,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/settings_service.go b/backend/internal/services/settings_service.go
index 9a59daecf..aad22d673 100644
--- a/backend/internal/services/settings_service.go
+++ b/backend/internal/services/settings_service.go
@@ -122,6 +122,8 @@ func (s *SettingsService) getDefaultSettings() *models.Settings {
VulnerabilityScanInterval: models.SettingVariable{Value: "0 0 0 * * *"},
TrivyImage: models.SettingVariable{Value: "ghcr.io/aquasecurity/trivy:latest"},
TrivyNetwork: models.SettingVariable{Value: "bridge"},
+ TrivySecurityOpts: models.SettingVariable{Value: ""},
+ TrivyPrivileged: models.SettingVariable{Value: "false"},
TrivyResourceLimitsEnabled: models.SettingVariable{Value: "true"},
TrivyCpuLimit: models.SettingVariable{Value: "1"},
TrivyMemoryLimitMb: models.SettingVariable{Value: "0"},
@@ -589,7 +591,7 @@ func (s *SettingsService) prepareUpdateValues(updates settings.Update, cfg, defa
changedAutoUpdate = true
case "scheduledPruneEnabled", "scheduledPruneInterval", "scheduledPruneContainers", "scheduledPruneImages", "scheduledPruneVolumes", "scheduledPruneNetworks", "scheduledPruneBuildCache":
changedScheduledPrune = true
- case "vulnerabilityScanEnabled", "vulnerabilityScanInterval", "trivyNetwork", "trivyResourceLimitsEnabled", "trivyCpuLimit", "trivyMemoryLimitMb", "trivyConcurrentScanContainers":
+ case "vulnerabilityScanEnabled", "vulnerabilityScanInterval", "trivyNetwork", "trivySecurityOpts", "trivyPrivileged", "trivyResourceLimitsEnabled", "trivyCpuLimit", "trivyMemoryLimitMb", "trivyConcurrentScanContainers":
changedVulnerabilityScan = true
case "autoHealEnabled", "autoHealInterval", "autoHealExcludedContainers", "autoHealMaxRestarts", "autoHealRestartWindow":
changedAutoHeal = true
diff --git a/backend/internal/services/settings_service_test.go b/backend/internal/services/settings_service_test.go
index 8ed78132c..362fd549f 100644
--- a/backend/internal/services/settings_service_test.go
+++ b/backend/internal/services/settings_service_test.go
@@ -44,7 +44,7 @@ func TestSettingsService_EnsureDefaultSettings_Idempotent(t *testing.T) {
require.Equal(t, count1, count2)
// Spot-check core and automation defaults exist with correct values
- for _, key := range []string{"authLocalEnabled", "projectsDirectory", "autoUpdateExcludedContainers", "vulnerabilityScanEnabled", "vulnerabilityScanInterval", "trivyNetwork", "trivyResourceLimitsEnabled", "trivyCpuLimit", "trivyMemoryLimitMb", "trivyConcurrentScanContainers"} {
+ for _, key := range []string{"authLocalEnabled", "projectsDirectory", "autoUpdateExcludedContainers", "vulnerabilityScanEnabled", "vulnerabilityScanInterval", "trivyNetwork", "trivySecurityOpts", "trivyPrivileged", "trivyResourceLimitsEnabled", "trivyCpuLimit", "trivyMemoryLimitMb", "trivyConcurrentScanContainers"} {
var sv models.SettingVariable
err := svc.db.WithContext(ctx).Where("key = ?", key).First(&sv).Error
require.NoErrorf(t, err, "missing default key %s", key)
@@ -58,6 +58,10 @@ func TestSettingsService_EnsureDefaultSettings_Idempotent(t *testing.T) {
require.Equal(t, "0 0 0 * * *", sv.Value)
case "trivyNetwork":
require.Equal(t, "bridge", sv.Value)
+ case "trivySecurityOpts":
+ require.Equal(t, "", sv.Value)
+ case "trivyPrivileged":
+ require.Equal(t, "false", sv.Value)
case "trivyResourceLimitsEnabled":
require.Equal(t, "true", sv.Value)
case "trivyCpuLimit":
@@ -189,6 +193,28 @@ func TestSettingsService_GetSettings_EnvOverride_TrivyNetwork(t *testing.T) {
require.Equal(t, "arcane-external", settings2.TrivyNetwork.Value)
}
+func TestSettingsService_GetSettings_EnvOverride_TrivyRuntimeSecurity(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, svc.EnsureDefaultSettings(ctx))
+
+ settings1, err := svc.GetSettings(ctx)
+ require.NoError(t, err)
+ require.Equal(t, "", settings1.TrivySecurityOpts.Value)
+ require.False(t, settings1.TrivyPrivileged.IsTrue())
+
+ t.Setenv("TRIVY_SECURITY_OPTS", "label=disable,\nlabel=type:container_runtime_t")
+ t.Setenv("TRIVY_PRIVILEGED", "true")
+
+ settings2, err := svc.GetSettings(ctx)
+ require.NoError(t, err)
+ require.Equal(t, "label=disable,\nlabel=type:container_runtime_t", settings2.TrivySecurityOpts.Value)
+ require.True(t, settings2.TrivyPrivileged.IsTrue())
+}
+
func TestSettingsService_isEnvOverrideActiveInternal(t *testing.T) {
ctx := context.Background()
db := setupSettingsTestDB(t)
@@ -478,6 +504,50 @@ func TestSettingsService_UpdateSettings_TrivyNetworkDoesNotTriggerTimeoutCallbac
require.Nil(t, callbackPayload)
}
+func TestSettingsService_UpdateSettings_TrivyRuntimeSecurityTriggersVulnerabilityCallback(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, svc.EnsureDefaultSettings(ctx))
+
+ callbackCalled := false
+ svc.OnVulnerabilityScanSettingsChanged = func(_ context.Context) {
+ callbackCalled = true
+ }
+
+ securityOpts := "label=disable"
+ privileged := "true"
+ _, err = svc.UpdateSettings(ctx, settings.Update{
+ TrivySecurityOpts: &securityOpts,
+ TrivyPrivileged: &privileged,
+ })
+ require.NoError(t, err)
+ require.True(t, callbackCalled)
+}
+
+func TestSettingsService_UpdateSettings_TrivyRuntimeSecurityDoesNotTriggerTimeoutCallback(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, svc.EnsureDefaultSettings(ctx))
+
+ var callbackPayload []libarcane.SettingUpdate
+ svc.OnTimeoutSettingsChanged = func(_ context.Context, timeoutSettings []libarcane.SettingUpdate) {
+ callbackPayload = timeoutSettings
+ }
+
+ securityOpts := "label=disable"
+ privileged := "true"
+ _, err = svc.UpdateSettings(ctx, settings.Update{
+ TrivySecurityOpts: &securityOpts,
+ TrivyPrivileged: &privileged,
+ })
+ require.NoError(t, err)
+ require.Nil(t, callbackPayload)
+}
+
func TestSettingsService_LoadDatabaseSettings_InternalKeys_EnvMode(t *testing.T) {
// Set env + disable flag
t.Setenv("UI_CONFIGURATION_DISABLED", "true")
diff --git a/backend/internal/services/vulnerability_service.go b/backend/internal/services/vulnerability_service.go
index e81c851b1..d83f9a10f 100644
--- a/backend/internal/services/vulnerability_service.go
+++ b/backend/internal/services/vulnerability_service.go
@@ -1272,21 +1272,8 @@ func (s *VulnerabilityService) createBatchTrivyContainer(ctx context.Context, tr
},
}
- hostConfig := &containertypes.HostConfig{
- NetworkMode: containertypes.NetworkMode(s.getTrivyNetworkModeInternal()),
- Mounts: []mounttypes.Mount{
- {
- Type: mounttypes.TypeBind,
- Source: "/var/run/docker.sock",
- Target: "/var/run/docker.sock",
- },
- {
- Type: mounttypes.TypeVolume,
- Source: cacheVolume,
- Target: trivyCacheMountTarget,
- },
- },
- }
+ securityOpts, privileged := s.getTrivyRuntimeSecurityInternal()
+ hostConfig := buildTrivyBatchHostConfigInternal(cacheVolume, s.getTrivyNetworkModeInternal(), securityOpts, privileged)
resources, cpuSet, applyLimits := s.getTrivyContainerResourceOptionsInternal(ctx, dockerClient)
applyTrivyContainerResourcesInternal(hostConfig, resources, cpuSet, applyLimits)
@@ -1609,6 +1596,34 @@ func normalizeTrivyNetworkModeInternal(networkMode string) string {
return networkMode
}
+func parseTrivySecurityOptsInternal(value string) []string {
+ value = strings.TrimSpace(value)
+ if value == "" {
+ return nil
+ }
+
+ value = strings.NewReplacer("\r\n", "\n", "\r", "\n").Replace(value)
+ parts := strings.FieldsFunc(value, func(r rune) bool {
+ return r == ',' || r == '\n'
+ })
+ if len(parts) == 0 {
+ return nil
+ }
+
+ opts := make([]string, 0, len(parts))
+ for _, part := range parts {
+ if opt := strings.TrimSpace(part); opt != "" {
+ opts = append(opts, opt)
+ }
+ }
+
+ if len(opts) == 0 {
+ return nil
+ }
+
+ return opts
+}
+
func (s *VulnerabilityService) getTrivyNetworkModeInternal() string {
if s.settingsService == nil {
return DefaultTrivyNetworkMode
@@ -1622,6 +1637,19 @@ func (s *VulnerabilityService) getTrivyNetworkModeInternal() string {
return normalizeTrivyNetworkModeInternal(cfg.TrivyNetwork.Value)
}
+func (s *VulnerabilityService) getTrivyRuntimeSecurityInternal() ([]string, bool) {
+ if s.settingsService == nil {
+ return nil, false
+ }
+
+ cfg := s.settingsService.GetSettingsConfig()
+ if cfg == nil {
+ return nil, false
+ }
+
+ return parseTrivySecurityOptsInternal(cfg.TrivySecurityOpts.Value), cfg.TrivyPrivileged.IsTrue()
+}
+
func (s *VulnerabilityService) getTrivyScanTimeoutArg() string {
timeoutSeconds := 0
if s.settingsService != nil {
@@ -1806,7 +1834,37 @@ func buildTrivyContainerConfig(trivyImage string, cmdArgs []string) *containerty
}
}
-func buildTrivyHostConfig(cacheVolume string, tempFiles []string, resources containertypes.Resources, cpuSet string, applyLimits bool, networkMode string) *containertypes.HostConfig {
+func buildTrivyBatchHostConfigInternal(cacheVolume, networkMode string, securityOpts []string, privileged bool) *containertypes.HostConfig {
+ hostConfig := &containertypes.HostConfig{
+ NetworkMode: containertypes.NetworkMode(normalizeTrivyNetworkModeInternal(networkMode)),
+ Mounts: []mounttypes.Mount{
+ {
+ Type: mounttypes.TypeBind,
+ Source: "/var/run/docker.sock",
+ Target: "/var/run/docker.sock",
+ },
+ {
+ Type: mounttypes.TypeVolume,
+ Source: cacheVolume,
+ Target: trivyCacheMountTarget,
+ },
+ },
+ }
+
+ applyTrivyRuntimeSecurityInternal(hostConfig, securityOpts, privileged)
+ return hostConfig
+}
+
+func buildTrivyHostConfig(
+ cacheVolume string,
+ tempFiles []string,
+ resources containertypes.Resources,
+ cpuSet string,
+ applyLimits bool,
+ networkMode string,
+ securityOpts []string,
+ privileged bool,
+) *containertypes.HostConfig {
hostConfig := &containertypes.HostConfig{
NetworkMode: containertypes.NetworkMode(normalizeTrivyNetworkModeInternal(networkMode)),
// Keep single-scan containers until explicit cleanup so we can reliably
@@ -1826,12 +1884,24 @@ func buildTrivyHostConfig(cacheVolume string, tempFiles []string, resources cont
},
}
+ applyTrivyRuntimeSecurityInternal(hostConfig, securityOpts, privileged)
applyTrivyContainerResourcesInternal(hostConfig, resources, cpuSet, applyLimits)
addTrivyTempFileMounts(hostConfig, tempFiles)
return hostConfig
}
+func applyTrivyRuntimeSecurityInternal(hostConfig *containertypes.HostConfig, securityOpts []string, privileged bool) {
+ if hostConfig == nil {
+ return
+ }
+
+ if len(securityOpts) > 0 {
+ hostConfig.SecurityOpt = append([]string(nil), securityOpts...)
+ }
+ hostConfig.Privileged = privileged
+}
+
func applyTrivyContainerResourcesInternal(hostConfig *containertypes.HostConfig, resources containertypes.Resources, cpuSet string, applyLimits bool) {
if hostConfig == nil || !applyLimits {
return
@@ -1938,11 +2008,15 @@ func logTrivyContainerStartupRequestInternal(ctx context.Context, scope string,
autoRemove := false
mounts := []string{}
networkMode := ""
+ securityOpts := []string{}
+ privileged := false
if hostConfig != nil {
resources = hostConfig.Resources
autoRemove = hostConfig.AutoRemove
mounts = trivyMountSummariesInternal(hostConfig)
networkMode = string(hostConfig.NetworkMode)
+ securityOpts = append([]string(nil), hostConfig.SecurityOpt...)
+ privileged = hostConfig.Privileged
}
slog.DebugContext(ctx,
@@ -1952,6 +2026,8 @@ func logTrivyContainerStartupRequestInternal(ctx context.Context, scope string,
"cmd", config.Cmd,
"entrypoint", config.Entrypoint,
"networkMode", networkMode,
+ "securityOpts", securityOpts,
+ "privileged", privileged,
"autoRemove", autoRemove,
"mounts", mounts,
"nanoCPUs", resources.NanoCPUs,
@@ -2784,7 +2860,17 @@ func (s *VulnerabilityService) runTrivyScan(ctx context.Context, trivyImage stri
config := buildTrivyContainerConfig(trivyImage, cmdArgs)
resources, cpuSet, applyLimits := s.getTrivyContainerResourceOptionsInternal(ctx, dockerClient)
- hostConfig := buildTrivyHostConfig(cacheVolume, tempFiles, resources, cpuSet, applyLimits, s.getTrivyNetworkModeInternal())
+ securityOpts, privileged := s.getTrivyRuntimeSecurityInternal()
+ hostConfig := buildTrivyHostConfig(
+ cacheVolume,
+ tempFiles,
+ resources,
+ cpuSet,
+ applyLimits,
+ s.getTrivyNetworkModeInternal(),
+ securityOpts,
+ privileged,
+ )
s.setScanPhaseInternal(imageID, vulnerability.ScanPhaseCreatingContainer)
stdoutFile, stderrFile, duration, statusCode, containerID, err := s.runTrivyContainer(ctx, dockerClient, imageID, config, hostConfig)
diff --git a/backend/internal/services/vulnerability_service_test.go b/backend/internal/services/vulnerability_service_test.go
index 820da200a..1a0818846 100644
--- a/backend/internal/services/vulnerability_service_test.go
+++ b/backend/internal/services/vulnerability_service_test.go
@@ -296,11 +296,13 @@ func TestBuildTrivyHostConfig_ExcludesResourcesWhenLimitsDisabled(t *testing.T)
MemorySwap: int64(1_073_741_824),
}
- hostConfig := buildTrivyHostConfig("cache-volume", nil, resources, "", false, "bridge")
+ hostConfig := buildTrivyHostConfig("cache-volume", nil, resources, "", false, "bridge", nil, false)
require.Equal(t, containertypes.NetworkMode("bridge"), hostConfig.NetworkMode)
require.Equal(t, int64(0), hostConfig.Resources.NanoCPUs)
require.Equal(t, int64(0), hostConfig.Resources.Memory)
require.Equal(t, int64(0), hostConfig.Resources.MemorySwap)
+ require.Empty(t, hostConfig.SecurityOpt)
+ require.False(t, hostConfig.Privileged)
}
func TestBuildTrivyHostConfig_IncludesResourcesWhenLimitsEnabled(t *testing.T) {
@@ -310,7 +312,7 @@ func TestBuildTrivyHostConfig_IncludesResourcesWhenLimitsEnabled(t *testing.T) {
MemorySwap: int64(1_073_741_824),
}
- hostConfig := buildTrivyHostConfig("cache-volume", nil, resources, "", true, "arcane-external")
+ hostConfig := buildTrivyHostConfig("cache-volume", nil, resources, "", true, "arcane-external", nil, false)
require.Equal(t, containertypes.NetworkMode("arcane-external"), hostConfig.NetworkMode)
require.Equal(t, resources.NanoCPUs, hostConfig.Resources.NanoCPUs)
require.Equal(t, resources.Memory, hostConfig.Resources.Memory)
@@ -324,7 +326,7 @@ func TestBuildTrivyHostConfig_UsesCPUSetAndClearsNanoCPUs(t *testing.T) {
MemorySwap: int64(1_073_741_824),
}
- hostConfig := buildTrivyHostConfig("cache-volume", nil, resources, "0-1", true, "bridge")
+ hostConfig := buildTrivyHostConfig("cache-volume", nil, resources, "0-1", true, "bridge", nil, false)
require.Equal(t, containertypes.NetworkMode("bridge"), hostConfig.NetworkMode)
require.Equal(t, int64(0), hostConfig.Resources.NanoCPUs)
require.Equal(t, "0-1", hostConfig.Resources.CpusetCpus)
@@ -332,6 +334,66 @@ func TestBuildTrivyHostConfig_UsesCPUSetAndClearsNanoCPUs(t *testing.T) {
require.Equal(t, resources.MemorySwap, hostConfig.Resources.MemorySwap)
}
+func TestParseTrivySecurityOptsInternal(t *testing.T) {
+ tests := []struct {
+ name string
+ value string
+ want []string
+ }{
+ {name: "empty", value: "", want: nil},
+ {name: "whitespace only", value: " \n\t ", want: nil},
+ {name: "single", value: "label=disable", want: []string{"label=disable"}},
+ {name: "comma separated", value: "label=disable,label=type:container_runtime_t", want: []string{"label=disable", "label=type:container_runtime_t"}},
+ {name: "newline separated", value: "label=disable\nlabel=type:container_runtime_t", want: []string{"label=disable", "label=type:container_runtime_t"}},
+ {name: "mixed whitespace", value: " label=disable,\n\n label=type:container_runtime_t \r\n privileged=true ", want: []string{"label=disable", "label=type:container_runtime_t", "privileged=true"}},
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ require.Equal(t, tt.want, parseTrivySecurityOptsInternal(tt.value))
+ })
+ }
+}
+
+func TestBuildTrivyHostConfig_AppliesRuntimeSecurity(t *testing.T) {
+ hostConfig := buildTrivyHostConfig(
+ "cache-volume",
+ nil,
+ containertypes.Resources{},
+ "",
+ false,
+ "bridge",
+ []string{"label=disable", "label=type:container_runtime_t"},
+ true,
+ )
+
+ require.Equal(t, []string{"label=disable", "label=type:container_runtime_t"}, hostConfig.SecurityOpt)
+ require.True(t, hostConfig.Privileged)
+}
+
+func TestBuildTrivyBatchHostConfig_AppliesRuntimeSecurity(t *testing.T) {
+ hostConfig := buildTrivyBatchHostConfig(
+ "cache-volume",
+ "arcane-external",
+ []string{"label=disable"},
+ true,
+ )
+
+ require.Equal(t, containertypes.NetworkMode("arcane-external"), hostConfig.NetworkMode)
+ require.Equal(t, []string{"label=disable"}, hostConfig.SecurityOpt)
+ require.True(t, hostConfig.Privileged)
+ require.Len(t, hostConfig.Mounts, 2)
+}
+
+func TestApplyTrivyRuntimeSecurityInternal(t *testing.T) {
+ hostConfig := &containertypes.HostConfig{}
+
+ applyTrivyRuntimeSecurityInternal(hostConfig, []string{"label=disable"}, true)
+
+ require.Equal(t, []string{"label=disable"}, hostConfig.SecurityOpt)
+ require.True(t, hostConfig.Privileged)
+}
+
func TestNormalizeTrivyNetworkModeInternal(t *testing.T) {
require.Equal(t, DefaultTrivyNetworkMode, normalizeTrivyNetworkModeInternal(""))
require.Equal(t, DefaultTrivyNetworkMode, normalizeTrivyNetworkModeInternal(" \t\n "))
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 8f7cdb0dc..6444625c2 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -975,7 +975,7 @@
"security_subtitle": "Aggregated vulnerability findings across all images in this environment.",
"security_images_scanned": "Images Scanned",
"security_total_vulnerabilities": "Total Vulnerabilities",
- "security_description": "Configure authentication methods, session timeouts, and other security-related options.",
+ "security_description": "Configure vulnerability scanning and runtime security settings.",
"security_authentication_heading": "Authentication",
"security_local_auth_label": "Local Authentication",
"security_local_auth_description": "Username and password stored by Arcane. Keep enabled as a fallback.",
@@ -1014,6 +1014,13 @@
"security_trivy_network_description": "Docker network mode/network name used for Trivy scan containers.",
"security_trivy_network_help": "Default is bridge. Use host, none, or a custom Docker network with internet access if needed.",
"security_trivy_network_current_value_note": "Current configured value",
+ "security_trivy_security_opts_label": "Trivy Security Options",
+ "security_trivy_security_opts_description": "Docker security options applied to Trivy scan containers.",
+ "security_trivy_security_opts_help": "Use commas or new lines to separate entries. Prefer security options such as label=disable before enabling privileged mode.",
+ "security_trivy_security_opts_placeholder": "label=disable\nlabel=type:container_runtime_t",
+ "security_trivy_privileged_label": "Trivy Privileged",
+ "security_trivy_privileged_description": "Run Trivy scan containers in privileged mode when the host security policy requires it.",
+ "security_trivy_privileged_note": "Use this only as a fallback when security options are not sufficient.",
"security_trivy_network_fetch_failed": "Could not load Docker networks; showing built-in options only.",
"security_trivy_resource_limits_label": "Trivy Resource Limits",
"security_trivy_resource_limits_description": "Configure CPU and memory limits for Trivy scan containers.",
@@ -1031,8 +1038,8 @@
"security_settings_saved": "Settings saved successfully.",
"security_local_enabled_info": "Local Authentication enabled to ensure at least one provider is active.",
"security_settings_save_failed": "Failed to save security settings",
- "security_auto_login_enabled_title": "Auto-Login Enabled",
- "security_auto_login_enabled_description": "Auto-login is currently enabled via environment variables. Authentication settings are disabled because users are automatically logged in with pre-configured credentials. To modify authentication settings, disable auto-login in your server configuration.",
+ "security_auto_login_enabled_title": "Auto-Login Enabled",
+ "security_auto_login_enabled_description": "Auto-login is currently enabled via environment variables. Authentication settings are disabled because users are automatically logged in with pre-configured credentials. To modify authentication settings, disable auto-login in your server configuration.",
"security_scan_all": "Scan all images",
"security_scanning": "Scanning",
"security_no_images_to_scan": "No images available to scan",
@@ -2187,5 +2194,7 @@
"deploy_pull_policy_never": "Never pull",
"deploy_force_recreate": "Force recreate containers",
"settings_default_deploy_pull_policy": "Default Deploy Pull Policy",
- "settings_default_deploy_pull_policy_description": "Default image pull policy when deploying projects"
+ "settings_default_deploy_pull_policy_description": "Default image pull policy when deploying projects",
+ "authentication_title": "Authentication",
+ "authentication_description": "Configure authentication providers, password policy, and session behavior."
}
diff --git a/frontend/src/lib/config/navigation-config.ts b/frontend/src/lib/config/navigation-config.ts
index 0f96ea894..1f6544290 100644
--- a/frontend/src/lib/config/navigation-config.ts
+++ b/frontend/src/lib/config/navigation-config.ts
@@ -4,6 +4,7 @@ import {
JobsIcon,
UsersIcon,
SecurityIcon,
+ LockIcon,
NotificationsIcon,
DashboardIcon,
ProjectsIcon,
@@ -60,16 +61,22 @@ export const navigationItems: Record<string, NavigationItem[]> = {
items: [
{ title: m.api_key_page_title(), url: '/settings/api-keys', icon: ApiKeyIcon, shortcut: ['mod', 'shift', '1'] },
{ title: m.appearance_title(), url: '/settings/appearance', icon: ApperanceIcon, shortcut: ['mod', 'shift', '2'] },
+ {
+ title: m.authentication_title(),
+ url: '/settings/authentication',
+ icon: LockIcon,
+ shortcut: ['mod', 'shift', '3']
+ },
{
title: m.notifications_title(),
url: '/settings/notifications',
icon: NotificationsIcon,
- shortcut: ['mod', 'shift', '3']
+ shortcut: ['mod', 'shift', '4']
},
- { title: m.security_title(), url: '/settings/security', icon: SecurityIcon, shortcut: ['mod', 'shift', '4'] },
- { title: m.builds(), url: '/settings/builds', icon: HammerIcon, shortcut: ['mod', 'shift', '5'] },
- { title: m.timeouts_settings(), url: '/settings/timeouts', icon: JobsIcon, shortcut: ['mod', 'shift', '6'] },
- { title: m.users_title(), url: '/settings/users', icon: UsersIcon, shortcut: ['mod', 'shift', '7'] }
+ { title: m.security_title(), url: '/settings/security', icon: SecurityIcon, shortcut: ['mod', 'shift', '5'] },
+ { title: m.builds(), url: '/settings/builds', icon: HammerIcon, shortcut: ['mod', 'shift', '6'] },
+ { title: m.timeouts_settings(), url: '/settings/timeouts', icon: JobsIcon, shortcut: ['mod', 'shift', '7'] },
+ { title: m.users_title(), url: '/settings/users', icon: UsersIcon, shortcut: ['mod', 'shift', '8'] }
]
}
]
diff --git a/frontend/src/lib/types/settings.type.ts b/frontend/src/lib/types/settings.type.ts
index 7785f91a5..c28d864a8 100644
--- a/frontend/src/lib/types/settings.type.ts
+++ b/frontend/src/lib/types/settings.type.ts
@@ -40,6 +40,8 @@ export type Settings = {
authPasswordPolicy: 'basic' | 'standard' | 'strong';
trivyImage: string;
trivyNetwork: string;
+ trivySecurityOpts: string;
+ trivyPrivileged: boolean;
trivyResourceLimitsEnabled: boolean;
trivyCpuLimit: number;
trivyMemoryLimitMb: number;
diff --git a/frontend/src/routes/(app)/settings/+layout.svelte b/frontend/src/routes/(app)/settings/+layout.svelte
index 3388185fd..77014221f 100644
--- a/frontend/src/routes/(app)/settings/+layout.svelte
+++ b/frontend/src/routes/(app)/settings/+layout.svelte
@@ -137,6 +137,8 @@
return m.jobs_title();
case 'docker':
return m.docker_title();
+ case 'authentication':
+ return m.authentication_title();
case 'security':
return m.security_title();
case 'users':
diff --git a/frontend/src/routes/(app)/settings/+page.svelte b/frontend/src/routes/(app)/settings/+page.svelte
index 2eb27902b..2658a19ec 100644
--- a/frontend/src/routes/(app)/settings/+page.svelte
+++ b/frontend/src/routes/(app)/settings/+page.svelte
@@ -6,6 +6,7 @@
SettingsIcon,
UserIcon,
SecurityIcon,
+ LockIcon,
NotificationsIcon,
ArrowRightIcon,
DockerBrandIcon,
@@ -35,6 +36,7 @@
const iconMap: Record<string, any> = {
settings: SettingsIcon,
database: DockerBrandIcon,
+ lock: LockIcon,
shield: SecurityIcon,
appearance: ApperanceIcon,
bell: NotificationsIcon,
diff --git a/frontend/src/routes/(app)/settings/authentication/+page.svelte b/frontend/src/routes/(app)/settings/authentication/+page.svelte
new file mode 100644
index 000000000..83bd49c9b
--- /dev/null
+++ b/frontend/src/routes/(app)/settings/authentication/+page.svelte
@@ -0,0 +1,621 @@
+<script lang="ts">
+ import * as AlertDialog from '$lib/components/ui/alert-dialog';
+ import { z } from 'zod/v4';
+ import { getContext } from 'svelte';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
+ import { Input } from '$lib/components/ui/input';
+ import { Label } from '$lib/components/ui/label';
+ import { Switch } from '$lib/components/ui/switch/index.js';
+ import { Separator } from '$lib/components/ui/separator';
+ import { toast } from 'svelte-sonner';
+ import type { PageData } from './$types';
+ import type { Settings } from '$lib/types/settings.type';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
+ import { m } from '$lib/paraglide/messages';
+ import { LockIcon, InfoIcon } from '$lib/icons';
+ import settingsStore from '$lib/stores/config-store';
+ import { SettingsPageLayout } from '$lib/layouts';
+ import { CopyButton } from '$lib/components/ui/copy-button';
+ import { createSettingsForm } from '$lib/utils/settings-form.util';
+ import * as Alert from '$lib/components/ui/alert';
+
+ let { data }: { data: PageData } = $props();
+ const currentSettings = $derived<Settings>($settingsStore || data.settings!);
+ const isReadOnly = $derived.by(() => $settingsStore.uiConfigDisabled);
+ const isAutoLoginEnabled = $derived(settingsStore.autoLoginEnabled.isEnabled());
+
+ const formSchema = z
+ .object({
+ authLocalEnabled: z.boolean(),
+ authSessionTimeout: z.coerce
+ .number()
+ .int(m.security_session_timeout_integer())
+ .min(15, m.security_session_timeout_min())
+ .max(1440, m.security_session_timeout_max()),
+ authPasswordPolicy: z.enum(['basic', 'standard', 'strong']),
+ oidcEnabled: z.boolean(),
+ oidcMergeAccounts: z.boolean(),
+ oidcSkipTlsVerify: z.boolean(),
+ oidcAutoRedirectToProvider: z.boolean(),
+ oidcClientId: z.string(),
+ oidcClientSecret: z.string(),
+ oidcIssuerUrl: z.string(),
+ oidcScopes: z.string(),
+ oidcAdminClaim: z.string(),
+ oidcAdminValue: z.string(),
+ oidcProviderName: z.string(),
+ oidcProviderLogoUrl: z.string()
+ })
+ .superRefine((formData, ctx) => {
+ const oidcEnabledForAuthValidation = data.oidcStatus.envForced ? currentSettings.oidcEnabled : formData.oidcEnabled;
+ if (oidcEnabledForAuthValidation) return;
+ if (!formData.authLocalEnabled) {
+ ctx.addIssue({
+ code: 'custom',
+ message: m.security_enable_one_provider(),
+ path: ['authLocalEnabled']
+ });
+ }
+ });
+
+ let showMergeAccountsAlert = $state(false);
+
+ const formDefaults = $derived({
+ authLocalEnabled: currentSettings.authLocalEnabled,
+ authSessionTimeout: currentSettings.authSessionTimeout,
+ authPasswordPolicy: currentSettings.authPasswordPolicy,
+ oidcEnabled: currentSettings.oidcEnabled,
+ oidcMergeAccounts: currentSettings.oidcMergeAccounts,
+ oidcSkipTlsVerify: currentSettings.oidcSkipTlsVerify,
+ oidcAutoRedirectToProvider: currentSettings.oidcAutoRedirectToProvider,
+ oidcClientId: currentSettings.oidcClientId,
+ oidcClientSecret: '',
+ oidcIssuerUrl: currentSettings.oidcIssuerUrl,
+ oidcScopes: currentSettings.oidcScopes,
+ oidcAdminClaim: currentSettings.oidcAdminClaim,
+ oidcAdminValue: currentSettings.oidcAdminValue,
+ oidcProviderName: currentSettings.oidcProviderName,
+ oidcProviderLogoUrl: currentSettings.oidcProviderLogoUrl
+ });
+
+ let { formInputs, form, settingsForm } = $derived(
+ createSettingsForm({
+ schema: formSchema,
+ currentSettings: formDefaults,
+ getCurrentSettings: () => ({
+ authLocalEnabled: ($settingsStore || data.settings!).authLocalEnabled,
+ authSessionTimeout: ($settingsStore || data.settings!).authSessionTimeout,
+ authPasswordPolicy: ($settingsStore || data.settings!).authPasswordPolicy,
+ oidcEnabled: ($settingsStore || data.settings!).oidcEnabled,
+ oidcMergeAccounts: ($settingsStore || data.settings!).oidcMergeAccounts,
+ oidcSkipTlsVerify: ($settingsStore || data.settings!).oidcSkipTlsVerify,
+ oidcAutoRedirectToProvider: ($settingsStore || data.settings!).oidcAutoRedirectToProvider,
+ oidcClientId: ($settingsStore || data.settings!).oidcClientId,
+ oidcClientSecret: '',
+ oidcIssuerUrl: ($settingsStore || data.settings!).oidcIssuerUrl,
+ oidcScopes: ($settingsStore || data.settings!).oidcScopes,
+ oidcAdminClaim: ($settingsStore || data.settings!).oidcAdminClaim,
+ oidcAdminValue: ($settingsStore || data.settings!).oidcAdminValue,
+ oidcProviderName: ($settingsStore || data.settings!).oidcProviderName,
+ oidcProviderLogoUrl: ($settingsStore || data.settings!).oidcProviderLogoUrl
+ }),
+ successMessage: m.security_settings_saved()
+ })
+ );
+
+ const hasAuthenticationChanges = $derived(
+ $formInputs.authLocalEnabled.value !== currentSettings.authLocalEnabled ||
+ $formInputs.authSessionTimeout.value !== currentSettings.authSessionTimeout ||
+ $formInputs.authPasswordPolicy.value !== currentSettings.authPasswordPolicy ||
+ $formInputs.oidcEnabled.value !== currentSettings.oidcEnabled ||
+ $formInputs.oidcMergeAccounts.value !== currentSettings.oidcMergeAccounts ||
+ $formInputs.oidcSkipTlsVerify.value !== currentSettings.oidcSkipTlsVerify ||
+ $formInputs.oidcAutoRedirectToProvider.value !== currentSettings.oidcAutoRedirectToProvider ||
+ $formInputs.oidcClientId.value !== currentSettings.oidcClientId ||
+ $formInputs.oidcIssuerUrl.value !== currentSettings.oidcIssuerUrl ||
+ $formInputs.oidcScopes.value !== currentSettings.oidcScopes ||
+ $formInputs.oidcAdminClaim.value !== currentSettings.oidcAdminClaim ||
+ $formInputs.oidcAdminValue.value !== currentSettings.oidcAdminValue ||
+ $formInputs.oidcProviderName.value !== currentSettings.oidcProviderName ||
+ $formInputs.oidcProviderLogoUrl.value !== currentSettings.oidcProviderLogoUrl ||
+ $formInputs.oidcClientSecret.value !== ''
+ );
+
+ const redirectUri = $derived(`${globalThis?.location?.origin ?? ''}/auth/oidc/callback`);
+ const isOidcEnvForced = $derived(data.oidcStatus.envForced);
+ const isOidcForcedEnabled = $derived(isOidcEnvForced && currentSettings.oidcEnabled);
+ const isOidcForcedDisabled = $derived(isOidcEnvForced && !currentSettings.oidcEnabled);
+ const isOidcEnabledForAuthValidation = $derived.by(() =>
+ isOidcEnvForced ? currentSettings.oidcEnabled : $formInputs.oidcEnabled.value
+ );
+ const showOidcDetails = $derived($formInputs.oidcEnabled.value || isOidcForcedEnabled);
+
+ async function customSubmit() {
+ const formData = form.validate();
+ if (!formData) {
+ toast.error(m.security_form_validation_error());
+ return;
+ }
+
+ if (formData.oidcEnabled && !isOidcEnvForced) {
+ if (!formData.oidcClientId || !formData.oidcIssuerUrl) {
+ toast.error(m.security_oidc_required_fields());
+ return;
+ }
+ }
+
+ settingsForm.setLoading(true);
+
+ try {
+ await settingsForm.updateSettings({
+ authLocalEnabled: formData.authLocalEnabled,
+ authSessionTimeout: formData.authSessionTimeout,
+ authPasswordPolicy: formData.authPasswordPolicy,
+ oidcEnabled: formData.oidcEnabled,
+ oidcMergeAccounts: formData.oidcMergeAccounts,
+ oidcSkipTlsVerify: formData.oidcSkipTlsVerify,
+ oidcAutoRedirectToProvider: formData.oidcAutoRedirectToProvider,
+ oidcClientId: formData.oidcClientId,
+ oidcIssuerUrl: formData.oidcIssuerUrl,
+ oidcScopes: formData.oidcScopes,
+ oidcAdminClaim: formData.oidcAdminClaim,
+ oidcAdminValue: formData.oidcAdminValue,
+ oidcProviderName: formData.oidcProviderName,
+ oidcProviderLogoUrl: formData.oidcProviderLogoUrl,
+ ...(formData.oidcClientSecret && { oidcClientSecret: formData.oidcClientSecret })
+ });
+ $formInputs.oidcClientSecret.value = '';
+ toast.success(m.security_settings_saved());
+ } catch (error: any) {
+ console.error('Failed to save settings:', error);
+ toast.error(m.security_settings_save_failed());
+ } finally {
+ settingsForm.setLoading(false);
+ }
+ }
+
+ function customReset() {
+ form.reset();
+ $formInputs.oidcClientSecret.value = '';
+ }
+
+ function handleLocalSwitchChange(checked: boolean) {
+ if (!checked && !isOidcEnabledForAuthValidation) {
+ $formInputs.authLocalEnabled.value = true;
+ toast.error(m.security_enable_one_provider_error());
+ return;
+ }
+ $formInputs.authLocalEnabled.value = checked;
+ }
+
+ function handleOidcEnabledChange(checked: boolean) {
+ if (!checked && !$formInputs.authLocalEnabled.value && !isOidcEnvForced) {
+ $formInputs.authLocalEnabled.value = true;
+ toast.info(m.security_local_enabled_info());
+ }
+ $formInputs.oidcEnabled.value = checked;
+ }
+
+ function handleMergeAccountsChange(checked: boolean) {
+ if (checked && !currentSettings.oidcMergeAccounts) {
+ showMergeAccountsAlert = true;
+ } else {
+ $formInputs.oidcMergeAccounts.value = checked;
+ }
+ }
+
+ function confirmMergeAccounts() {
+ $formInputs.oidcMergeAccounts.value = true;
+ showMergeAccountsAlert = false;
+ }
+
+ function cancelMergeAccounts() {
+ $formInputs.oidcMergeAccounts.value = false;
+ showMergeAccountsAlert = false;
+ }
+
+ $effect(() => {
+ settingsForm.registerFormActions(customSubmit, customReset);
+ const formState = getContext('settingsFormState') as any;
+ if (formState) {
+ formState.hasChanges = hasAuthenticationChanges;
+ }
+ });
+</script>
+
+<SettingsPageLayout
+ title={m.authentication_title()}
+ description={m.authentication_description()}
+ icon={LockIcon}
+ pageType="form"
+ showReadOnlyTag={isReadOnly}
+>
+ {#snippet mainContent()}
+ <fieldset disabled={isReadOnly} class="relative space-y-8">
+ <div class="space-y-4">
+ <h3 class="text-lg font-medium">{m.security_authentication_heading()}</h3>
+
+ {#if isAutoLoginEnabled}
+ <Alert.Root variant="default" class="border-amber-200 bg-amber-50 dark:border-amber-800 dark:bg-amber-950">
+ <InfoIcon class="h-4 w-4 text-amber-600 dark:text-amber-500" />
+ <Alert.Title class="text-amber-900 dark:text-amber-100">{m.security_auto_login_enabled_title()}</Alert.Title>
+ <Alert.Description class="text-amber-800 dark:text-amber-200">
+ {m.security_auto_login_enabled_description()}
+ </Alert.Description>
+ </Alert.Root>
+ {:else}
+ <div class="bg-card rounded-lg border shadow-sm">
+ <div class="space-y-6 p-6">
+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{m.security_local_auth_label()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.security_local_auth_description()}</p>
+ </div>
+ <div class="flex items-center gap-2">
+ <Switch
+ id="localAuthSwitch"
+ bind:checked={$formInputs.authLocalEnabled.value}
+ onCheckedChange={handleLocalSwitchChange}
+ />
+ <Label for="localAuthSwitch" class="font-normal">
+ {$formInputs.authLocalEnabled.value ? m.common_enabled() : m.common_disabled()}
+ </Label>
+ </div>
+ </div>
+
+ <Separator />
+
+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{m.security_oidc_auth_label()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.security_oidc_auth_description()}</p>
+ {#if isOidcEnvForced}
+ <div class="mt-2">
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <span
+ class="inline-flex items-center gap-1.5 rounded-full bg-amber-100 px-2.5 py-1 text-xs font-medium text-amber-800 ring-1 ring-amber-200 dark:bg-amber-900/50 dark:text-amber-200 dark:ring-amber-800"
+ >
+ {#if isOidcForcedDisabled}
+ {m.security_server_disabled_via_server()}
+ {:else}
+ {m.security_server_configured()}
+ {/if}
+ </span>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="top">
+ {#if isOidcForcedDisabled}
+ {m.security_oidc_forced_disabled_tooltip()}
+ {:else}
+ {m.security_oidc_forced_managed_tooltip()}
+ {/if}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+ </div>
+ {/if}
+ </div>
+ <div class="space-y-4">
+ <div class="flex items-center gap-2">
+ <Switch
+ id="oidcEnabledSwitch"
+ disabled={isOidcEnvForced}
+ bind:checked={$formInputs.oidcEnabled.value}
+ onCheckedChange={handleOidcEnabledChange}
+ />
+ <Label for="oidcEnabledSwitch" class="font-normal">
+ {m.security_oidc_enabled_label()}
+ </Label>
+ </div>
+
+ {#if showOidcDetails}
+ <div class="space-y-4 pt-2">
+ <div class="space-y-2">
+ <Label for="oidcClientId" class="text-sm font-medium">{m.oidc_client_id_label()}</Label>
+ <Input
+ id="oidcClientId"
+ type="text"
+ placeholder={m.oidc_client_id_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcClientId.value}
+ class="font-mono text-sm"
+ />
+ {#if $formInputs.oidcClientId.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcClientId.error}</p>
+ {/if}
+ </div>
+
+ <div class="space-y-2">
+ <Label for="oidcClientSecret" class="text-sm font-medium">{m.oidc_client_secret_label()}</Label>
+ <Input
+ id="oidcClientSecret"
+ type="password"
+ placeholder={m.oidc_client_secret_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcClientSecret.value}
+ class="font-mono text-sm"
+ />
+ <p class="text-muted-foreground text-xs">{m.security_oidc_client_secret_help()}</p>
+ {#if $formInputs.oidcClientSecret.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcClientSecret.error}</p>
+ {/if}
+ </div>
+
+ <div class="space-y-2">
+ <Label for="oidcIssuerUrl" class="text-sm font-medium">{m.oidc_issuer_url_label()}</Label>
+ <Input
+ id="oidcIssuerUrl"
+ type="text"
+ placeholder={m.oidc_issuer_url_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcIssuerUrl.value}
+ class="font-mono text-sm"
+ />
+ <p class="text-muted-foreground text-xs">{m.oidc_issuer_url_description()}</p>
+ {#if $formInputs.oidcIssuerUrl.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcIssuerUrl.error}</p>
+ {/if}
+ </div>
+
+ <div class="space-y-2">
+ <Label for="oidcProviderName" class="text-sm font-medium">{m.oidc_provider_name_label()}</Label>
+ <Input
+ id="oidcProviderName"
+ type="text"
+ placeholder={m.oidc_provider_name_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcProviderName.value}
+ class="font-mono text-sm"
+ />
+ <p class="text-muted-foreground text-xs">{m.oidc_provider_name_description()}</p>
+ {#if $formInputs.oidcProviderName.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcProviderName.error}</p>
+ {/if}
+ </div>
+
+ <div class="space-y-2">
+ <Label for="oidcProviderLogoUrl" class="text-sm font-medium">{m.oidc_provider_logo_url_label()}</Label>
+ <Input
+ id="oidcProviderLogoUrl"
+ type="text"
+ placeholder={m.oidc_provider_logo_url_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcProviderLogoUrl.value}
+ class="font-mono text-sm"
+ />
+ <p class="text-muted-foreground text-xs">{m.oidc_provider_logo_url_description()}</p>
+ {#if $formInputs.oidcProviderLogoUrl.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcProviderLogoUrl.error}</p>
+ {/if}
+ </div>
+
+ <div class="space-y-2">
+ <Label for="oidcScopes" class="text-sm font-medium">{m.oidc_scopes_label()}</Label>
+ <Input
+ id="oidcScopes"
+ type="text"
+ placeholder={m.oidc_scopes_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcScopes.value}
+ class="font-mono text-sm"
+ />
+ {#if $formInputs.oidcScopes.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcScopes.error}</p>
+ {/if}
+ </div>
+
+ <div class="border-t pt-4">
+ <h4 class="text-sm font-semibold">{m.oidc_admin_role_mapping_title()}</h4>
+ <p class="text-muted-foreground mb-3 text-xs">{m.oidc_admin_role_mapping_description()}</p>
+ <div class="grid gap-3 sm:grid-cols-2">
+ <div class="space-y-2">
+ <Label for="oidcAdminClaim" class="text-sm font-medium">{m.oidc_admin_claim_label()}</Label>
+ <Input
+ id="oidcAdminClaim"
+ type="text"
+ placeholder={m.oidc_admin_claim_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcAdminClaim.value}
+ class="font-mono text-sm"
+ />
+ {#if $formInputs.oidcAdminClaim.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcAdminClaim.error}</p>
+ {/if}
+ </div>
+ <div class="space-y-2">
+ <Label for="oidcAdminValue" class="text-sm font-medium">{m.oidc_admin_value_label()}</Label>
+ <Input
+ id="oidcAdminValue"
+ type="text"
+ placeholder={m.oidc_admin_value_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcAdminValue.value}
+ class="font-mono text-sm"
+ />
+ <p class="text-muted-foreground text-[11px]">{m.oidc_admin_value_help()}</p>
+ {#if $formInputs.oidcAdminValue.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcAdminValue.error}</p>
+ {/if}
+ </div>
+ </div>
+ </div>
+
+ <div class="border-t pt-4">
+ <div class="flex items-center gap-2">
+ <Switch
+ id="oidcMergeAccountsSwitch"
+ disabled={isOidcEnvForced}
+ bind:checked={$formInputs.oidcMergeAccounts.value}
+ onCheckedChange={handleMergeAccountsChange}
+ />
+ <div class="grid gap-1.5 leading-none">
+ <Label for="oidcMergeAccountsSwitch" class="font-normal">
+ {m.security_oidc_merge_accounts_label()}
+ </Label>
+ <p class="text-muted-foreground text-xs">
+ {m.security_oidc_merge_accounts_description()}
+ </p>
+ </div>
+ </div>
+ </div>
+
+ <div class="border-t pt-4">
+ <div class="flex items-center gap-2">
+ <Switch
+ id="oidcSkipTlsVerifySwitch"
+ disabled={isOidcEnvForced}
+ bind:checked={$formInputs.oidcSkipTlsVerify.value}
+ />
+ <div class="grid gap-1.5 leading-none">
+ <Label for="oidcSkipTlsVerifySwitch" class="font-normal">
+ {m.oidc_skip_tls_verify_label()}
+ </Label>
+ <p class="text-muted-foreground text-xs">
+ {m.oidc_skip_tls_verify_description()}
+ </p>
+ </div>
+ </div>
+ </div>
+
+ <div class="border-t pt-4">
+ <div class="flex items-center gap-2">
+ <Switch
+ id="oidcAutoRedirectSwitch"
+ disabled={isOidcEnvForced}
+ bind:checked={$formInputs.oidcAutoRedirectToProvider.value}
+ />
+ <div class="grid gap-1.5 leading-none">
+ <Label for="oidcAutoRedirectSwitch" class="font-normal">
+ {m.oidc_auto_redirect_label()}
+ </Label>
+ <p class="text-muted-foreground text-xs">
+ {m.oidc_auto_redirect_description()}
+ </p>
+ </div>
+ </div>
+ </div>
+
+ <div class="bg-muted/30 rounded-lg border p-4">
+ <div class="mb-2 flex items-center gap-2">
+ <InfoIcon class="size-4 text-blue-600" />
+ <span class="text-sm font-medium">{m.oidc_redirect_uri_title()}</span>
+ </div>
+ <p class="text-muted-foreground mb-3 text-sm">{m.oidc_redirect_uri_description()}</p>
+ <div class="flex items-center gap-2">
+ <code class="bg-muted flex-1 rounded p-2 font-mono text-xs break-all">{redirectUri}</code>
+ <CopyButton text={redirectUri} size="sm" variant="outline" class="shrink-0" title={m.common_copy()} />
+ </div>
+ </div>
+ </div>
+ {/if}
+ </div>
+ </div>
+ </div>
+ </div>
+ {/if}
+ </div>
+
+ <div class="space-y-4">
+ <h3 class="text-lg font-medium">{m.security_session_heading()}</h3>
+ <div class="bg-card rounded-lg border shadow-sm">
+ <div class="space-y-6 p-6">
+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{m.security_session_timeout_label()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.security_session_timeout_description()}</p>
+ </div>
+ <div class="max-w-xs">
+ <Input
+ id="authSessionTimeout"
+ type="number"
+ bind:value={$formInputs.authSessionTimeout.value}
+ aria-label={m.security_session_timeout_label()}
+ />
+ {#if $formInputs.authSessionTimeout.error}
+ <p class="text-destructive mt-2 text-sm">{$formInputs.authSessionTimeout.error}</p>
+ {/if}
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="space-y-4">
+ <h3 class="text-lg font-medium">{m.security_password_policy_label()}</h3>
+ <div class="bg-card rounded-lg border shadow-sm">
+ <div class="space-y-6 p-6">
+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{m.security_password_policy_label()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.security_password_policy_description()}</p>
+ </div>
+ <div>
+ <div class="grid grid-cols-1 gap-2 sm:grid-cols-3 sm:gap-3" role="group" aria-labelledby="passwordPolicyLabel">
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <ArcaneButton
+ action="base"
+ tone={$formInputs.authPasswordPolicy.value === 'basic' ? 'outline-primary' : 'outline'}
+ class="h-12 w-full text-xs sm:text-sm"
+ onclick={() => ($formInputs.authPasswordPolicy.value = 'basic')}
+ customLabel={m.common_basic()}
+ />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="top">
+ {m.security_password_policy_basic_tooltip()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <ArcaneButton
+ action="base"
+ tone={$formInputs.authPasswordPolicy.value === 'standard' ? 'outline-primary' : 'outline'}
+ class="h-12 w-full text-xs sm:text-sm"
+ onclick={() => ($formInputs.authPasswordPolicy.value = 'standard')}
+ customLabel={m.security_password_policy_standard()}
+ />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="top">
+ {m.security_password_policy_standard_tooltip()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <ArcaneButton
+ action="base"
+ tone={$formInputs.authPasswordPolicy.value === 'strong' ? 'outline-primary' : 'outline'}
+ class="h-12 w-full text-xs sm:text-sm"
+ onclick={() => ($formInputs.authPasswordPolicy.value = 'strong')}
+ customLabel={m.security_password_policy_strong()}
+ />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="top">
+ {m.security_password_policy_strong_tooltip()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ {/snippet}
+ {#snippet additionalContent()}
+ <AlertDialog.Root bind:open={showMergeAccountsAlert}>
+ <AlertDialog.Content>
+ <AlertDialog.Header>
+ <AlertDialog.Title>{m.security_oidc_merge_accounts_alert_title()}</AlertDialog.Title>
+ <AlertDialog.Description>
+ {m.security_oidc_merge_accounts_alert_description()}
+ </AlertDialog.Description>
+ </AlertDialog.Header>
+ <AlertDialog.Footer>
+ <AlertDialog.Cancel onclick={cancelMergeAccounts}>{m.common_cancel()}</AlertDialog.Cancel>
+ <AlertDialog.Action onclick={confirmMergeAccounts}>{m.common_confirm()}</AlertDialog.Action>
+ </AlertDialog.Footer>
+ </AlertDialog.Content>
+ </AlertDialog.Root>
+ {/snippet}
+</SettingsPageLayout>
diff --git a/frontend/src/routes/(app)/settings/security/+page.svelte b/frontend/src/routes/(app)/settings/security/+page.svelte
index bce2a8962..b11592a9c 100644
--- a/frontend/src/routes/(app)/settings/security/+page.svelte
+++ b/frontend/src/routes/(app)/settings/security/+page.svelte
@@ -1,23 +1,18 @@
<script lang="ts">
- import * as AlertDialog from '$lib/components/ui/alert-dialog';
import { z } from 'zod/v4';
import { getContext, onMount } from 'svelte';
- import { ArcaneButton } from '$lib/components/arcane-button/index.js';
- import { Input } from '$lib/components/ui/input';
import { Label } from '$lib/components/ui/label';
import { Switch } from '$lib/components/ui/switch/index.js';
- import { Separator } from '$lib/components/ui/separator';
+ import { Textarea } from '$lib/components/ui/textarea/index.js';
import { toast } from 'svelte-sonner';
import type { PageData } from './$types';
import type { Settings } from '$lib/types/settings.type';
- import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import { m } from '$lib/paraglide/messages';
- import { LockIcon, InfoIcon } from '$lib/icons';
+ import { SecurityIcon, InfoIcon } from '$lib/icons';
import SearchableSelect from '$lib/components/form/searchable-select.svelte';
import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
import settingsStore from '$lib/stores/config-store';
import { SettingsPageLayout } from '$lib/layouts';
- import { CopyButton } from '$lib/components/ui/copy-button';
import { createSettingsForm } from '$lib/utils/settings-form.util';
import * as Alert from '$lib/components/ui/alert';
import { networkService } from '$lib/services/network-service';
@@ -25,139 +20,58 @@
let { data }: { data: PageData } = $props();
const currentSettings = $derived<Settings>($settingsStore || data.settings!);
const isReadOnly = $derived.by(() => $settingsStore.uiConfigDisabled);
- const isAutoLoginEnabled = $derived(settingsStore.autoLoginEnabled.isEnabled());
- const formSchema = z
- .object({
- authLocalEnabled: z.boolean(),
- authSessionTimeout: z.coerce
- .number()
- .int(m.security_session_timeout_integer())
- .min(15, m.security_session_timeout_min())
- .max(1440, m.security_session_timeout_max()),
- authPasswordPolicy: z.enum(['basic', 'standard', 'strong']),
- trivyImage: z.string(),
- trivyNetwork: z.string(),
- trivyResourceLimitsEnabled: z.boolean(),
- trivyCpuLimit: z.coerce.number().int(m.security_session_timeout_integer()).nonnegative(),
- trivyMemoryLimitMb: z.coerce.number().int().nonnegative(),
- trivyConcurrentScanContainers: z.coerce.number().int().min(1, m.security_trivy_concurrent_scan_containers_min()),
- oidcEnabled: z.boolean(),
- oidcMergeAccounts: z.boolean(),
- oidcSkipTlsVerify: z.boolean(),
- oidcAutoRedirectToProvider: z.boolean(),
- oidcClientId: z.string(),
- oidcClientSecret: z.string(),
- oidcIssuerUrl: z.string(),
- oidcScopes: z.string(),
- oidcAdminClaim: z.string(),
- oidcAdminValue: z.string(),
- oidcProviderName: z.string(),
- oidcProviderLogoUrl: z.string()
- })
- .superRefine((formData, ctx) => {
- const oidcEnabledForAuthValidation = data.oidcStatus.envForced ? currentSettings.oidcEnabled : formData.oidcEnabled;
- if (oidcEnabledForAuthValidation) return;
- if (!formData.authLocalEnabled) {
- ctx.addIssue({
- code: 'custom',
- message: m.security_enable_one_provider(),
- path: ['authLocalEnabled']
- });
- }
- });
-
- let showMergeAccountsAlert = $state(false);
+ const formSchema = z.object({
+ trivyImage: z.string(),
+ trivyNetwork: z.string(),
+ trivySecurityOpts: z.string(),
+ trivyPrivileged: z.boolean(),
+ trivyResourceLimitsEnabled: z.boolean(),
+ trivyCpuLimit: z.coerce.number().int(m.security_session_timeout_integer()).nonnegative(),
+ trivyMemoryLimitMb: z.coerce.number().int().nonnegative(),
+ trivyConcurrentScanContainers: z.coerce.number().int().min(1, m.security_trivy_concurrent_scan_containers_min())
+ });
const formDefaults = $derived({
- authLocalEnabled: currentSettings.authLocalEnabled,
- authSessionTimeout: currentSettings.authSessionTimeout,
- authPasswordPolicy: currentSettings.authPasswordPolicy,
trivyImage: currentSettings.trivyImage,
trivyNetwork: currentSettings.trivyNetwork || 'bridge',
+ trivySecurityOpts: currentSettings.trivySecurityOpts || '',
+ trivyPrivileged: currentSettings.trivyPrivileged ?? false,
trivyResourceLimitsEnabled: currentSettings.trivyResourceLimitsEnabled ?? true,
trivyCpuLimit: currentSettings.trivyCpuLimit ?? 1,
trivyMemoryLimitMb: currentSettings.trivyMemoryLimitMb ?? 0,
- trivyConcurrentScanContainers: currentSettings.trivyConcurrentScanContainers ?? 1,
- oidcEnabled: currentSettings.oidcEnabled,
- oidcMergeAccounts: currentSettings.oidcMergeAccounts,
- oidcSkipTlsVerify: currentSettings.oidcSkipTlsVerify,
- oidcAutoRedirectToProvider: currentSettings.oidcAutoRedirectToProvider,
- oidcClientId: currentSettings.oidcClientId,
- oidcClientSecret: '',
- oidcIssuerUrl: currentSettings.oidcIssuerUrl,
- oidcScopes: currentSettings.oidcScopes,
- oidcAdminClaim: currentSettings.oidcAdminClaim,
- oidcAdminValue: currentSettings.oidcAdminValue,
- oidcProviderName: currentSettings.oidcProviderName,
- oidcProviderLogoUrl: currentSettings.oidcProviderLogoUrl
+ trivyConcurrentScanContainers: currentSettings.trivyConcurrentScanContainers ?? 1
});
- // Security page needs custom submit logic for OIDC client secret handling
let { formInputs, form, settingsForm } = $derived(
createSettingsForm({
schema: formSchema,
currentSettings: formDefaults,
getCurrentSettings: () => ({
- authLocalEnabled: ($settingsStore || data.settings!).authLocalEnabled,
- authSessionTimeout: ($settingsStore || data.settings!).authSessionTimeout,
- authPasswordPolicy: ($settingsStore || data.settings!).authPasswordPolicy,
trivyImage: ($settingsStore || data.settings!).trivyImage,
trivyNetwork: ($settingsStore || data.settings!).trivyNetwork || 'bridge',
+ trivySecurityOpts: ($settingsStore || data.settings!).trivySecurityOpts || '',
+ trivyPrivileged: ($settingsStore || data.settings!).trivyPrivileged ?? false,
trivyResourceLimitsEnabled: ($settingsStore || data.settings!).trivyResourceLimitsEnabled ?? true,
trivyCpuLimit: ($settingsStore || data.settings!).trivyCpuLimit ?? 1,
trivyMemoryLimitMb: ($settingsStore || data.settings!).trivyMemoryLimitMb ?? 0,
- trivyConcurrentScanContainers: ($settingsStore || data.settings!).trivyConcurrentScanContainers ?? 1,
- oidcEnabled: ($settingsStore || data.settings!).oidcEnabled,
- oidcMergeAccounts: ($settingsStore || data.settings!).oidcMergeAccounts,
- oidcSkipTlsVerify: ($settingsStore || data.settings!).oidcSkipTlsVerify,
- oidcAutoRedirectToProvider: ($settingsStore || data.settings!).oidcAutoRedirectToProvider,
- oidcClientId: ($settingsStore || data.settings!).oidcClientId,
- oidcClientSecret: '',
- oidcIssuerUrl: ($settingsStore || data.settings!).oidcIssuerUrl,
- oidcScopes: ($settingsStore || data.settings!).oidcScopes,
- oidcAdminClaim: ($settingsStore || data.settings!).oidcAdminClaim,
- oidcAdminValue: ($settingsStore || data.settings!).oidcAdminValue,
- oidcProviderName: ($settingsStore || data.settings!).oidcProviderName,
- oidcProviderLogoUrl: ($settingsStore || data.settings!).oidcProviderLogoUrl
+ trivyConcurrentScanContainers: ($settingsStore || data.settings!).trivyConcurrentScanContainers ?? 1
}),
successMessage: m.security_settings_saved()
})
);
- // Override the default hasChanges since we need special handling for oidcClientSecret
const hasSecurityChanges = $derived(
- $formInputs.authLocalEnabled.value !== currentSettings.authLocalEnabled ||
- $formInputs.authSessionTimeout.value !== currentSettings.authSessionTimeout ||
- $formInputs.authPasswordPolicy.value !== currentSettings.authPasswordPolicy ||
- $formInputs.trivyImage.value !== currentSettings.trivyImage ||
+ $formInputs.trivyImage.value !== currentSettings.trivyImage ||
$formInputs.trivyNetwork.value !== (currentSettings.trivyNetwork || 'bridge') ||
+ $formInputs.trivySecurityOpts.value !== (currentSettings.trivySecurityOpts || '') ||
+ $formInputs.trivyPrivileged.value !== (currentSettings.trivyPrivileged ?? false) ||
$formInputs.trivyResourceLimitsEnabled.value !== (currentSettings.trivyResourceLimitsEnabled ?? true) ||
$formInputs.trivyCpuLimit.value !== (currentSettings.trivyCpuLimit ?? 1) ||
$formInputs.trivyMemoryLimitMb.value !== (currentSettings.trivyMemoryLimitMb ?? 0) ||
- $formInputs.trivyConcurrentScanContainers.value !== (currentSettings.trivyConcurrentScanContainers ?? 1) ||
- $formInputs.oidcEnabled.value !== currentSettings.oidcEnabled ||
- $formInputs.oidcMergeAccounts.value !== currentSettings.oidcMergeAccounts ||
- $formInputs.oidcSkipTlsVerify.value !== currentSettings.oidcSkipTlsVerify ||
- $formInputs.oidcAutoRedirectToProvider.value !== currentSettings.oidcAutoRedirectToProvider ||
- $formInputs.oidcClientId.value !== currentSettings.oidcClientId ||
- $formInputs.oidcIssuerUrl.value !== currentSettings.oidcIssuerUrl ||
- $formInputs.oidcScopes.value !== currentSettings.oidcScopes ||
- $formInputs.oidcAdminClaim.value !== currentSettings.oidcAdminClaim ||
- $formInputs.oidcAdminValue.value !== currentSettings.oidcAdminValue ||
- $formInputs.oidcProviderName.value !== currentSettings.oidcProviderName ||
- $formInputs.oidcProviderLogoUrl.value !== currentSettings.oidcProviderLogoUrl ||
- $formInputs.oidcClientSecret.value !== ''
+ $formInputs.trivyConcurrentScanContainers.value !== (currentSettings.trivyConcurrentScanContainers ?? 1)
);
- const redirectUri = $derived(`${globalThis?.location?.origin ?? ''}/auth/oidc/callback`);
- const isOidcEnvForced = $derived(data.oidcStatus.envForced);
- const isOidcForcedEnabled = $derived(isOidcEnvForced && currentSettings.oidcEnabled);
- const isOidcForcedDisabled = $derived(isOidcEnvForced && !currentSettings.oidcEnabled);
- const isOidcEnabledForAuthValidation = $derived.by(() =>
- isOidcEnvForced ? currentSettings.oidcEnabled : $formInputs.oidcEnabled.value
- );
- const showOidcDetails = $derived($formInputs.oidcEnabled.value || isOidcForcedEnabled);
const baseTrivyNetworkOptions = [
{ value: 'bridge', label: 'bridge' },
{ value: 'host', label: 'host' },
@@ -227,40 +141,19 @@
const trivyCpuLimit = formData.trivyResourceLimitsEnabled ? formData.trivyCpuLimit : 0;
const trivyMemoryLimitMb = formData.trivyResourceLimitsEnabled ? formData.trivyMemoryLimitMb : 0;
- if (formData.oidcEnabled && !isOidcEnvForced) {
- if (!formData.oidcClientId || !formData.oidcIssuerUrl) {
- toast.error(m.security_oidc_required_fields());
- return;
- }
- }
-
settingsForm.setLoading(true);
try {
await settingsForm.updateSettings({
- authLocalEnabled: formData.authLocalEnabled,
- authSessionTimeout: formData.authSessionTimeout,
- authPasswordPolicy: formData.authPasswordPolicy,
trivyImage: formData.trivyImage,
trivyNetwork: formData.trivyNetwork,
+ trivySecurityOpts: formData.trivySecurityOpts,
+ trivyPrivileged: formData.trivyPrivileged,
trivyResourceLimitsEnabled: formData.trivyResourceLimitsEnabled,
trivyCpuLimit,
trivyMemoryLimitMb,
- trivyConcurrentScanContainers: formData.trivyConcurrentScanContainers,
- oidcEnabled: formData.oidcEnabled,
- oidcMergeAccounts: formData.oidcMergeAccounts,
- oidcSkipTlsVerify: formData.oidcSkipTlsVerify,
- oidcAutoRedirectToProvider: formData.oidcAutoRedirectToProvider,
- oidcClientId: formData.oidcClientId,
- oidcIssuerUrl: formData.oidcIssuerUrl,
- oidcScopes: formData.oidcScopes,
- oidcAdminClaim: formData.oidcAdminClaim,
- oidcAdminValue: formData.oidcAdminValue,
- oidcProviderName: formData.oidcProviderName,
- oidcProviderLogoUrl: formData.oidcProviderLogoUrl,
- ...(formData.oidcClientSecret && { oidcClientSecret: formData.oidcClientSecret })
+ trivyConcurrentScanContainers: formData.trivyConcurrentScanContainers
});
- $formInputs.oidcClientSecret.value = '';
toast.success(m.security_settings_saved());
} catch (error: any) {
console.error('Failed to save settings:', error);
@@ -272,32 +165,6 @@
function customReset() {
form.reset();
- $formInputs.oidcClientSecret.value = '';
- }
-
- function handleLocalSwitchChange(checked: boolean) {
- if (!checked && !isOidcEnabledForAuthValidation) {
- $formInputs.authLocalEnabled.value = true;
- toast.error(m.security_enable_one_provider_error());
- return;
- }
- $formInputs.authLocalEnabled.value = checked;
- }
-
- function handleOidcEnabledChange(checked: boolean) {
- if (!checked && !$formInputs.authLocalEnabled.value && !isOidcEnvForced) {
- $formInputs.authLocalEnabled.value = true;
- toast.info(m.security_local_enabled_info());
- }
- $formInputs.oidcEnabled.value = checked;
- }
-
- function handleMergeAccountsChange(checked: boolean) {
- if (checked && !currentSettings.oidcMergeAccounts) {
- showMergeAccountsAlert = true;
- } else {
- $formInputs.oidcMergeAccounts.value = checked;
- }
}
function handleTrivyResourceLimitsChange(checked: boolean) {
@@ -308,24 +175,12 @@
}
}
- function confirmMergeAccounts() {
- $formInputs.oidcMergeAccounts.value = true;
- showMergeAccountsAlert = false;
- }
-
- function cancelMergeAccounts() {
- $formInputs.oidcMergeAccounts.value = false;
- showMergeAccountsAlert = false;
- }
-
onMount(() => {
void loadTrivyNetworkOptions();
});
$effect(() => {
- // Use custom submit/reset for security page
settingsForm.registerFormActions(customSubmit, customReset);
- // Sync the custom hasSecurityChanges to the context
const formState = getContext('settingsFormState') as any;
if (formState) {
formState.hasChanges = hasSecurityChanges;
@@ -336,388 +191,12 @@
<SettingsPageLayout
title={m.security_title()}
description={m.security_description()}
- icon={LockIcon}
+ icon={SecurityIcon}
pageType="form"
showReadOnlyTag={isReadOnly}
>
{#snippet mainContent()}
<fieldset disabled={isReadOnly} class="relative space-y-8">
- <!-- Authentication Section -->
- <div class="space-y-4">
- <h3 class="text-lg font-medium">{m.security_authentication_heading()}</h3>
-
- {#if isAutoLoginEnabled}
- <!-- Auto-Login Enabled Alert -->
- <Alert.Root variant="default" class="border-amber-200 bg-amber-50 dark:border-amber-800 dark:bg-amber-950">
- <InfoIcon class="h-4 w-4 text-amber-600 dark:text-amber-500" />
- <Alert.Title class="text-amber-900 dark:text-amber-100">{m.security_auto_login_enabled_title()}</Alert.Title>
- <Alert.Description class="text-amber-800 dark:text-amber-200">
- {m.security_auto_login_enabled_description()}
- </Alert.Description>
- </Alert.Root>
- {:else}
- <!-- Authentication Cards (only shown when auto-login is disabled) -->
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <!-- Local Auth -->
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.security_local_auth_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.security_local_auth_description()}</p>
- </div>
- <div class="flex items-center gap-2">
- <Switch
- id="localAuthSwitch"
- bind:checked={$formInputs.authLocalEnabled.value}
- onCheckedChange={handleLocalSwitchChange}
- />
- <Label for="localAuthSwitch" class="font-normal">
- {$formInputs.authLocalEnabled.value ? m.common_enabled() : m.common_disabled()}
- </Label>
- </div>
- </div>
-
- <Separator />
-
- <!-- OIDC Auth -->
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.security_oidc_auth_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.security_oidc_auth_description()}</p>
- {#if isOidcEnvForced}
- <div class="mt-2">
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger>
- <span
- class="inline-flex items-center gap-1.5 rounded-full bg-amber-100 px-2.5 py-1 text-xs font-medium text-amber-800 ring-1 ring-amber-200 dark:bg-amber-900/50 dark:text-amber-200 dark:ring-amber-800"
- >
- {#if isOidcForcedDisabled}
- {m.security_server_disabled_via_server()}
- {:else}
- {m.security_server_configured()}
- {/if}
- </span>
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content side="top">
- {#if isOidcForcedDisabled}
- {m.security_oidc_forced_disabled_tooltip()}
- {:else}
- {m.security_oidc_forced_managed_tooltip()}
- {/if}
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
- </div>
- {/if}
- </div>
- <div class="space-y-4">
- <div class="flex items-center gap-2">
- <Switch
- id="oidcEnabledSwitch"
- disabled={isOidcEnvForced}
- bind:checked={$formInputs.oidcEnabled.value}
- onCheckedChange={handleOidcEnabledChange}
- />
- <Label for="oidcEnabledSwitch" class="font-normal">
- {m.security_oidc_enabled_label()}
- </Label>
- </div>
-
- {#if showOidcDetails}
- <div class="space-y-4 pt-2">
- <div class="space-y-2">
- <Label for="oidcClientId" class="text-sm font-medium">{m.oidc_client_id_label()}</Label>
- <Input
- id="oidcClientId"
- type="text"
- placeholder={m.oidc_client_id_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcClientId.value}
- class="font-mono text-sm"
- />
- {#if $formInputs.oidcClientId.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcClientId.error}</p>
- {/if}
- </div>
-
- <div class="space-y-2">
- <Label for="oidcClientSecret" class="text-sm font-medium">{m.oidc_client_secret_label()}</Label>
- <Input
- id="oidcClientSecret"
- type="password"
- placeholder={m.oidc_client_secret_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcClientSecret.value}
- class="font-mono text-sm"
- />
- <p class="text-muted-foreground text-xs">{m.security_oidc_client_secret_help()}</p>
- {#if $formInputs.oidcClientSecret.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcClientSecret.error}</p>
- {/if}
- </div>
-
- <div class="space-y-2">
- <Label for="oidcIssuerUrl" class="text-sm font-medium">{m.oidc_issuer_url_label()}</Label>
- <Input
- id="oidcIssuerUrl"
- type="text"
- placeholder={m.oidc_issuer_url_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcIssuerUrl.value}
- class="font-mono text-sm"
- />
- <p class="text-muted-foreground text-xs">{m.oidc_issuer_url_description()}</p>
- {#if $formInputs.oidcIssuerUrl.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcIssuerUrl.error}</p>
- {/if}
- </div>
-
- <div class="space-y-2">
- <Label for="oidcProviderName" class="text-sm font-medium">{m.oidc_provider_name_label()}</Label>
- <Input
- id="oidcProviderName"
- type="text"
- placeholder={m.oidc_provider_name_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcProviderName.value}
- class="font-mono text-sm"
- />
- <p class="text-muted-foreground text-xs">{m.oidc_provider_name_description()}</p>
- {#if $formInputs.oidcProviderName.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcProviderName.error}</p>
- {/if}
- </div>
-
- <div class="space-y-2">
- <Label for="oidcProviderLogoUrl" class="text-sm font-medium">{m.oidc_provider_logo_url_label()}</Label>
- <Input
- id="oidcProviderLogoUrl"
- type="text"
- placeholder={m.oidc_provider_logo_url_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcProviderLogoUrl.value}
- class="font-mono text-sm"
- />
- <p class="text-muted-foreground text-xs">{m.oidc_provider_logo_url_description()}</p>
- {#if $formInputs.oidcProviderLogoUrl.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcProviderLogoUrl.error}</p>
- {/if}
- </div>
-
- <div class="space-y-2">
- <Label for="oidcScopes" class="text-sm font-medium">{m.oidc_scopes_label()}</Label>
- <Input
- id="oidcScopes"
- type="text"
- placeholder={m.oidc_scopes_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcScopes.value}
- class="font-mono text-sm"
- />
- {#if $formInputs.oidcScopes.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcScopes.error}</p>
- {/if}
- </div>
-
- <div class="border-t pt-4">
- <h4 class="text-sm font-semibold">{m.oidc_admin_role_mapping_title()}</h4>
- <p class="text-muted-foreground mb-3 text-xs">{m.oidc_admin_role_mapping_description()}</p>
- <div class="grid gap-3 sm:grid-cols-2">
- <div class="space-y-2">
- <Label for="oidcAdminClaim" class="text-sm font-medium">{m.oidc_admin_claim_label()}</Label>
- <Input
- id="oidcAdminClaim"
- type="text"
- placeholder={m.oidc_admin_claim_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcAdminClaim.value}
- class="font-mono text-sm"
- />
- {#if $formInputs.oidcAdminClaim.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcAdminClaim.error}</p>
- {/if}
- </div>
- <div class="space-y-2">
- <Label for="oidcAdminValue" class="text-sm font-medium">{m.oidc_admin_value_label()}</Label>
- <Input
- id="oidcAdminValue"
- type="text"
- placeholder={m.oidc_admin_value_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcAdminValue.value}
- class="font-mono text-sm"
- />
- <p class="text-muted-foreground text-[11px]">{m.oidc_admin_value_help()}</p>
- {#if $formInputs.oidcAdminValue.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcAdminValue.error}</p>
- {/if}
- </div>
- </div>
- </div>
-
- <div class="border-t pt-4">
- <div class="flex items-center gap-2">
- <Switch
- id="oidcMergeAccountsSwitch"
- disabled={isOidcEnvForced}
- bind:checked={$formInputs.oidcMergeAccounts.value}
- onCheckedChange={handleMergeAccountsChange}
- />
- <div class="grid gap-1.5 leading-none">
- <Label for="oidcMergeAccountsSwitch" class="font-normal">
- {m.security_oidc_merge_accounts_label()}
- </Label>
- <p class="text-muted-foreground text-xs">
- {m.security_oidc_merge_accounts_description()}
- </p>
- </div>
- </div>
- </div>
-
- <div class="border-t pt-4">
- <div class="flex items-center gap-2">
- <Switch
- id="oidcSkipTlsVerifySwitch"
- disabled={isOidcEnvForced}
- bind:checked={$formInputs.oidcSkipTlsVerify.value}
- />
- <div class="grid gap-1.5 leading-none">
- <Label for="oidcSkipTlsVerifySwitch" class="font-normal">
- {m.oidc_skip_tls_verify_label()}
- </Label>
- <p class="text-muted-foreground text-xs">
- {m.oidc_skip_tls_verify_description()}
- </p>
- </div>
- </div>
- </div>
-
- <div class="border-t pt-4">
- <div class="flex items-center gap-2">
- <Switch
- id="oidcAutoRedirectSwitch"
- disabled={isOidcEnvForced}
- bind:checked={$formInputs.oidcAutoRedirectToProvider.value}
- />
- <div class="grid gap-1.5 leading-none">
- <Label for="oidcAutoRedirectSwitch" class="font-normal">
- {m.oidc_auto_redirect_label()}
- </Label>
- <p class="text-muted-foreground text-xs">
- {m.oidc_auto_redirect_description()}
- </p>
- </div>
- </div>
- </div>
-
- <div class="bg-muted/30 rounded-lg border p-4">
- <div class="mb-2 flex items-center gap-2">
- <InfoIcon class="size-4 text-blue-600" />
- <span class="text-sm font-medium">{m.oidc_redirect_uri_title()}</span>
- </div>
- <p class="text-muted-foreground mb-3 text-sm">{m.oidc_redirect_uri_description()}</p>
- <div class="flex items-center gap-2">
- <code class="bg-muted flex-1 rounded p-2 font-mono text-xs break-all">{redirectUri}</code>
- <CopyButton text={redirectUri} size="sm" variant="outline" class="shrink-0" title={m.common_copy()} />
- </div>
- </div>
- </div>
- {/if}
- </div>
- </div>
- </div>
- </div>
- {/if}
- </div>
-
- <!-- Session Section -->
- <div class="space-y-4">
- <h3 class="text-lg font-medium">{m.security_session_heading()}</h3>
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.security_session_timeout_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.security_session_timeout_description()}</p>
- </div>
- <div class="max-w-xs">
- <TextInputWithLabel
- bind:value={$formInputs.authSessionTimeout.value}
- error={$formInputs.authSessionTimeout.error}
- label={m.security_session_timeout_label()}
- placeholder={m.security_session_timeout_placeholder()}
- helpText={m.security_session_timeout_description()}
- type="number"
- />
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Password Policy Section -->
- <div class="space-y-4">
- <h3 class="text-lg font-medium">{m.security_password_policy_label()}</h3>
- <div class="bg-card rounded-lg border shadow-sm">
- <div class="space-y-6 p-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.security_password_policy_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.security_password_policy_description()}</p>
- </div>
- <div>
- <div class="grid grid-cols-1 gap-2 sm:grid-cols-3 sm:gap-3" role="group" aria-labelledby="passwordPolicyLabel">
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger>
- <ArcaneButton
- action="base"
- tone={$formInputs.authPasswordPolicy.value === 'basic' ? 'outline-primary' : 'outline'}
- class="h-12 w-full text-xs sm:text-sm"
- onclick={() => ($formInputs.authPasswordPolicy.value = 'basic')}
- customLabel={m.common_basic()}
- />
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content side="top">
- {m.security_password_policy_basic_tooltip()}
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
-
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger>
- <ArcaneButton
- action="base"
- tone={$formInputs.authPasswordPolicy.value === 'standard' ? 'outline-primary' : 'outline'}
- class="h-12 w-full text-xs sm:text-sm"
- onclick={() => ($formInputs.authPasswordPolicy.value = 'standard')}
- customLabel={m.security_password_policy_standard()}
- />
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content side="top">
- {m.security_password_policy_standard_tooltip()}
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
-
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger>
- <ArcaneButton
- action="base"
- tone={$formInputs.authPasswordPolicy.value === 'strong' ? 'outline-primary' : 'outline'}
- class="h-12 w-full text-xs sm:text-sm"
- onclick={() => ($formInputs.authPasswordPolicy.value = 'strong')}
- customLabel={m.security_password_policy_strong()}
- />
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content side="top">
- {m.security_password_policy_strong_tooltip()}
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Vulnerability Scanning Section -->
<div class="space-y-4">
<h3 class="text-lg font-medium">{m.security_vulnerability_scanning_heading()}</h3>
<div class="bg-card rounded-lg border shadow-sm">
@@ -763,6 +242,50 @@
</div>
</div>
+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{m.security_trivy_security_opts_label()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_security_opts_description()}</p>
+ <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_security_opts_help()}</p>
+ </div>
+ <div class="space-y-2">
+ <Textarea
+ bind:value={$formInputs.trivySecurityOpts.value}
+ aria-label={m.security_trivy_security_opts_label()}
+ class="min-h-28 font-mono text-sm"
+ placeholder={m.security_trivy_security_opts_placeholder()}
+ rows={4}
+ />
+ {#if $formInputs.trivySecurityOpts.error}
+ <p class="text-destructive text-sm">{$formInputs.trivySecurityOpts.error}</p>
+ {/if}
+ </div>
+ </div>
+
+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{m.security_trivy_privileged_label()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_privileged_description()}</p>
+ <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_privileged_note()}</p>
+ </div>
+ <div class="space-y-3">
+ <div class="flex items-center gap-2">
+ <Switch id="trivyPrivilegedSwitch" bind:checked={$formInputs.trivyPrivileged.value} />
+ <Label for="trivyPrivilegedSwitch" class="font-normal">
+ {$formInputs.trivyPrivileged.value ? m.common_enabled() : m.common_disabled()}
+ </Label>
+ </div>
+ {#if $formInputs.trivyPrivileged.value}
+ <Alert.Root variant="default" class="border-amber-200 bg-amber-50 dark:border-amber-800 dark:bg-amber-950">
+ <InfoIcon class="h-4 w-4 text-amber-900 dark:text-amber-100" />
+ <Alert.Description class="text-amber-800 dark:text-amber-200">
+ {m.security_trivy_privileged_note()}
+ </Alert.Description>
+ </Alert.Root>
+ {/if}
+ </div>
+ </div>
+
<div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
<div>
<Label class="text-base">{m.security_trivy_resource_limits_label()}</Label>
@@ -814,20 +337,4 @@
</div>
</fieldset>
{/snippet}
- {#snippet additionalContent()}
- <AlertDialog.Root bind:open={showMergeAccountsAlert}>
- <AlertDialog.Content>
- <AlertDialog.Header>
- <AlertDialog.Title>{m.security_oidc_merge_accounts_alert_title()}</AlertDialog.Title>
- <AlertDialog.Description>
- {m.security_oidc_merge_accounts_alert_description()}
- </AlertDialog.Description>
- </AlertDialog.Header>
- <AlertDialog.Footer>
- <AlertDialog.Cancel onclick={cancelMergeAccounts}>{m.common_cancel()}</AlertDialog.Cancel>
- <AlertDialog.Action onclick={confirmMergeAccounts}>{m.common_confirm()}</AlertDialog.Action>
- </AlertDialog.Footer>
- </AlertDialog.Content>
- </AlertDialog.Root>
- {/snippet}
</SettingsPageLayout>
diff --git a/types/settings/settings.go b/types/settings/settings.go
index 702652c56..bcbba5884 100644
--- a/types/settings/settings.go
+++ b/types/settings/settings.go
@@ -193,6 +193,17 @@ type Update struct {
// Required: false
TrivyNetwork *string `json:"trivyNetwork,omitempty"`
+ // TrivySecurityOpts applies Docker security options to Trivy scan containers.
+ // Accepts comma-separated or newline-separated values.
+ //
+ // Required: false
+ TrivySecurityOpts *string `json:"trivySecurityOpts,omitempty"`
+
+ // TrivyPrivileged controls whether Trivy scan containers run in privileged mode.
+ //
+ // Required: false
+ TrivyPrivileged *string `json:"trivyPrivileged,omitempty"`
+
// TrivyResourceLimitsEnabled controls whether CPU and memory limits are applied to Trivy scan containers.
//
// Required: false