Skip to content

Modern Docker Management, Designed for Everyone

feat: disable Gravatar by default and allow ENABLE_GRAVATAR on any in… (#4349)

Kyle Mendell75996ec396d8
diff --git a/backend/internal/settings/handler.go b/backend/internal/settings/handler.go
index 76f8912b1..a16d49612 100644
--- a/backend/internal/settings/handler.go
+++ b/backend/internal/settings/handler.go
@@ -197,11 +197,10 @@ func (h *SettingsHandler) appendRuntimeSettingsInternal(settingsDto []settings.P
if h.settingsService != nil {
cfg := h.settingsService.GetSettingsConfig()
depotConfigured := strings.TrimSpace(cfg.DepotProjectId.Value) != "" && strings.TrimSpace(cfg.DepotToken.Value) != ""
- settingsDto = append(settingsDto, settings.PublicSetting{
- Key: "depotConfigured",
- Value: strconv.FormatBool(depotConfigured),
- Type: "boolean",
- })
+ settingsDto = append(settingsDto,
+ settings.PublicSetting{Key: "depotConfigured", Value: strconv.FormatBool(depotConfigured), Type: "boolean"},
+ settings.PublicSetting{Key: "enableGravatarEnvForced", Value: strconv.FormatBool(h.settingsService.IsEnvOverrideActive("enableGravatar")), Type: "boolean"},
+ )
}
return settingsDto
diff --git a/backend/internal/settings/model.go b/backend/internal/settings/model.go
index 88036271c..2b7e070ff 100644
--- a/backend/internal/settings/model.go
+++ b/backend/internal/settings/model.go
@@ -70,7 +70,7 @@ type Settings struct {
SwarmStackSourcesDirectory SettingVariable `key:"swarmStackSourcesDirectory,envOverride" meta:"label=Swarm Stack Sources Directory;type=text;keywords=swarm,stacks,stack,source,sources,directory,path,folder,location,storage,compose,env;category=internal;description=Configure where swarm stack source files are stored"`
DiskUsagePath SettingVariable `key:"diskUsagePath" meta:"label=Disk Usage Path;type=text;keywords=disk,usage,path,storage,folder,files;category=general;description=Path used for disk usage calculations"`
BaseServerURL SettingVariable `key:"baseServerUrl" meta:"label=Base Server URL;type=text;keywords=base,url,server,domain,host,endpoint,address,link;category=general;description=Set the base URL for the application"`
- EnableGravatar SettingVariable `key:"enableGravatar,authrequired" meta:"label=Enable Gravatar;type=boolean;keywords=gravatar,avatar,profile,picture,image,user,photo;category=users;description=Enable Gravatar profile pictures for users"`
+ EnableGravatar SettingVariable `key:"enableGravatar,authrequired,envOverride" meta:"label=Enable Gravatar;type=boolean;keywords=gravatar,avatar,profile,picture,image,user,photo;category=users;description=Enable Gravatar profile pictures for users"`
AvatarMaxUploadSizeMb SettingVariable `key:"avatarMaxUploadSizeMb,authrequired" meta:"label=Avatar Max Upload Size (MB);type=number;keywords=avatar,profile,picture,upload,size,limit,maximum,image,user,photo,mb;category=users;description=Maximum size in MB for profile picture uploads (default: 2)"`
DefaultShell SettingVariable `key:"defaultShell" meta:"label=Default Shell;type=text;keywords=shell,default,shellpath,path,login;category=general;description=Default shell to use for commands"`
ExperimentalFeaturesEnabled SettingVariable `key:"experimentalFeaturesEnabled,authrequired" meta:"label=Experimental Features;type=boolean;keywords=experimental,features,beta,preview,flags;category=general;description=Enable experimental features that may change or be removed in future releases"`
diff --git a/backend/internal/settings/service.go b/backend/internal/settings/service.go
index 8d2f4eae9..a8df0d7a7 100644
--- a/backend/internal/settings/service.go
+++ b/backend/internal/settings/service.go
@@ -237,7 +237,7 @@ func DefaultSettingsConfig() *Settings {
AutoHealRestartWindow: SettingVariable{Value: "30"},
VolumeHelperIdleTimeout: SettingVariable{Value: "10"},
BaseServerURL: SettingVariable{Value: "http://localhost"},
- EnableGravatar: SettingVariable{Value: "true"},
+ EnableGravatar: SettingVariable{Value: "false"},
ExperimentalFeaturesEnabled: SettingVariable{Value: "false"},
AvatarMaxUploadSizeMb: SettingVariable{Value: "2"},
DefaultShell: SettingVariable{Value: "/bin/sh"},
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 385e254eb..faf5ba658 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -1667,6 +1667,7 @@
"general_base_url_help": "The Base URL for your docker host. Used when opening containers from the service links",
"general_enable_gravatar_label": "Enable Gravatar",
"general_enable_gravatar_description": "Use Gravatar as the fallback profile picture source for users without an uploaded photo.",
+ "general_enable_gravatar_env_override": "This setting is managed by the ENABLE_GRAVATAR environment variable.",
"general_avatar_upload_size_label": "Profile Picture Upload Size (MB)",
"general_avatar_upload_size_description": "Maximum cropped profile picture size users can upload.",
"general_avatar_upload_size_help": "Allowed range: 1-50 MB.",
diff --git a/frontend/src/lib/types/settings.ts b/frontend/src/lib/types/settings.ts
index edc2086ff..7b0c3fd44 100644
--- a/frontend/src/lib/types/settings.ts
+++ b/frontend/src/lib/types/settings.ts
@@ -69,6 +69,7 @@ export type Settings = {
gitSyncMaxBinarySizeMb: number;
baseServerUrl: string;
enableGravatar: boolean;
+ enableGravatarEnvForced?: boolean;
experimentalFeaturesEnabled: boolean;
apnsEnabled?: boolean;
avatarMaxUploadSizeMb: number;
diff --git a/frontend/src/routes/(app)/settings/users/+page.svelte b/frontend/src/routes/(app)/settings/users/+page.svelte
index 593bc7626..e0dc72066 100644
--- a/frontend/src/routes/(app)/settings/users/+page.svelte
+++ b/frontend/src/routes/(app)/settings/users/+page.svelte
@@ -198,6 +198,7 @@
// Avatar policy: server-wide settings that belong with user management.
const isReadOnly = $derived(Boolean(settingsStore.current?.uiConfigDisabled));
const gravatarEnabled = $derived(Boolean(settingsStore.current?.enableGravatar));
+ const gravatarEnvForced = $derived(Boolean(settingsStore.current?.enableGravatarEnvForced));
const avatarMaxUploadSizeMb = $derived(
Number(settingsStore.current?.avatarMaxUploadSizeMb) > 0 ? Number(settingsStore.current?.avatarMaxUploadSizeMb) : 2
);
@@ -256,12 +257,13 @@
for="enableGravatar"
label={m.general_enable_gravatar_label()}
description={m.general_enable_gravatar_description()}
+ helpText={gravatarEnvForced ? m.general_enable_gravatar_env_override() : undefined}
layout="switch"
>
<Switch
id="enableGravatar"
checked={gravatarEnabled}
- disabled={isReadOnly}
+ disabled={isReadOnly || gravatarEnvForced}
onCheckedChange={(checked) => void saveAvatarSettings({ enableGravatar: checked })}
/>
</SettingsRow>