Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: ntfy tls regression, image update notifcation flag not be recognized (#3143)
Kyle Mendellfa5df4cc7426
diff --git a/backend/internal/models/notification.go b/backend/internal/models/notification.goindex c74dc8a4a..f3e867614 100644--- a/backend/internal/models/notification.go+++ b/backend/internal/models/notification.go@@ -158,6 +158,7 @@ type NtfyConfig struct {Icon string `json:"icon,omitempty"`Cache bool `json:"cache"`Firebase bool `json:"firebase"`+ DisableTLS bool `json:"disableTls"`DisableTLSVerification bool `json:"disableTlsVerification"`Events map[NotificationEventType]bool `json:"events,omitempty"`}diff --git a/backend/internal/services/image_update_service.go b/backend/internal/services/image_update_service.goindex 3f87c3c37..85a86e30e 100644--- a/backend/internal/services/image_update_service.go+++ b/backend/internal/services/image_update_service.go@@ -37,6 +37,7 @@ type ImageUpdateService struct {notificationService *NotificationServiceregistryLimiter *ratelimit.RegistryRateLimiteractivityService *ActivityService+ notifyMu sync.Mutex}type ImageParts struct {@@ -1325,6 +1326,12 @@ func (s *ImageUpdateService) sendBatchImageUpdateNotificationsInternal(ctx contereturn}+ // Serialize the query→send→mark sequence so the poll-end flush and the+ // updater consumption-path flush can't both read the same unnotified set+ // and double-send.+ s.notifyMu.Lock()+ defer s.notifyMu.Unlock()+// completeImageUpdateActivityInternal cancels the activity-tracked ctx before// we reach here, so detach from that cancellation (mirrors the helper it uses)// — otherwise the unnotified-updates query dies with "context canceled" and nodiff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.goindex 76081d469..eaf8dd4ee 100644--- a/backend/internal/services/updater_service.go+++ b/backend/internal/services/updater_service.go@@ -389,6 +389,13 @@ func (s *UpdaterService) PendingImageUpdates(ctx context.Context) ([]moduletypesif err := s.deps.DB.WithContext(ctx).Where("has_update = ?", true).Find(&records).Error; err != nil {return nil, fmt.Errorf("query pending image updates: %w", err)}++ // Flush pending "Updates Available" notifications before the engine+ // consumes and clears these records, otherwise the notification for an+ // update applied here is silently lost (#3132).+ if s.deps.ImageUpdates != nil {+ s.deps.ImageUpdates.sendBatchImageUpdateNotificationsInternal(ctx)+ }s.appendAutoUpdateActivityMessageInternal(ctx,activityIDFromContextInternal(ctx),diff --git a/backend/internal/services/updater_service_test.go b/backend/internal/services/updater_service_test.goindex 09f998360..798d7a313 100644--- a/backend/internal/services/updater_service_test.go+++ b/backend/internal/services/updater_service_test.go@@ -10,6 +10,7 @@ import ("net/http/httptest""net/url""strings"+ "sync/atomic""testing""time"@@ -468,6 +469,82 @@ func TestUpdaterService_PendingImageUpdatesAdapterInternal(t *testing.T) {assert.Equal(t, &lastError, records[0].LastError)}+// TestUpdaterService_PendingImageUpdatesFlushesPendingNotificationsInternal guards+// issue #3132: the updater consumes and clears has_update records without checking+// notification_sent, so an "Updates Available" notification pending at consumption+// time was silently lost. PendingImageUpdates must flush it before the engine runs.+func TestUpdaterService_PendingImageUpdatesFlushesPendingNotificationsInternal(t *testing.T) {+ ctx := context.Background()+ db := setupProjectTestDB(t)+ require.NoError(t, db.AutoMigrate(&models.ImageUpdateRecord{}, &models.NotificationSettings{}, &models.NotificationLog{}))++ var calls atomic.Int32+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {+ calls.Add(1)+ w.WriteHeader(http.StatusOK)+ }))+ defer server.Close()+ require.NoError(t, db.Create(&models.NotificationSettings{+ Provider: models.NotificationProviderGeneric,+ Enabled: true,+ Config: models.JSON{+ "webhookUrl": server.URL,+ "method": "POST",+ "contentType": "application/json",+ },+ }).Error)++ notif := NewNotificationService(db, nil, nil)+ imageUpdates := NewImageUpdateService(db, nil, nil, nil, nil, notif, nil)+ svc := NewUpdaterService(db, nil, nil, nil, imageUpdates, nil, nil, nil, notif, nil, nil)++ require.NoError(t, db.Create(&models.ImageUpdateRecord{+ ID: "sha256:pending-unnotified",+ Repository: "test/repo",+ Tag: "latest",+ HasUpdate: true,+ NotificationSent: false,+ }).Error)++ records, err := svc.PendingImageUpdates(ctx)++ require.NoError(t, err)+ require.Len(t, records, 1)+ require.EqualValues(t, 1, calls.Load())+ var reloaded models.ImageUpdateRecord+ require.NoError(t, db.First(&reloaded, "id = ?", "sha256:pending-unnotified").Error)+ assert.True(t, reloaded.NotificationSent)+}++// With no providers configured, PendingImageUpdates still returns the records and+// leaves notification_sent false (preserves the #3079 "don't mark when nothing+// delivered" semantics).+func TestUpdaterService_PendingImageUpdatesNoProvidersLeavesUnnotifiedInternal(t *testing.T) {+ ctx := context.Background()+ db := setupProjectTestDB(t)+ require.NoError(t, db.AutoMigrate(&models.ImageUpdateRecord{}, &models.NotificationSettings{}, &models.NotificationLog{}))++ notif := NewNotificationService(db, nil, nil)+ imageUpdates := NewImageUpdateService(db, nil, nil, nil, nil, notif, nil)+ svc := NewUpdaterService(db, nil, nil, nil, imageUpdates, nil, nil, nil, notif, nil, nil)++ require.NoError(t, db.Create(&models.ImageUpdateRecord{+ ID: "sha256:pending-no-provider",+ Repository: "test/repo",+ Tag: "latest",+ HasUpdate: true,+ NotificationSent: false,+ }).Error)++ records, err := svc.PendingImageUpdates(ctx)++ require.NoError(t, err)+ require.Len(t, records, 1)+ var reloaded models.ImageUpdateRecord+ require.NoError(t, db.First(&reloaded, "id = ?", "sha256:pending-no-provider").Error)+ assert.False(t, reloaded.NotificationSent)+}+func TestUpdaterService_RecordUpdateRunAdapterInternal(t *testing.T) {ctx := context.Background()db := setupProjectTestDB(t)diff --git a/backend/pkg/utils/notifications/ntfy_sender.go b/backend/pkg/utils/notifications/ntfy_sender.goindex 3991e17a6..70c0bb555 100644--- a/backend/pkg/utils/notifications/ntfy_sender.go+++ b/backend/pkg/utils/notifications/ntfy_sender.go@@ -77,6 +77,10 @@ func BuildNtfyURL(config models.NtfyConfig) (string, error) {q.Set("firebase", "no")}+ if config.DisableTLS {+ q.Set("disabletls", "yes")+ }+if config.DisableTLSVerification {q.Set("disabletlsverification", "yes")}diff --git a/backend/pkg/utils/notifications/ntfy_sender_test.go b/backend/pkg/utils/notifications/ntfy_sender_test.goindex b84c7213f..34240c157 100644--- a/backend/pkg/utils/notifications/ntfy_sender_test.go+++ b/backend/pkg/utils/notifications/ntfy_sender_test.go@@ -147,3 +147,21 @@ func TestBuildNtfyURLDisableTLSVerificationUsesCertificateVerificationFlag(t *teassert.Equal(t, "yes", query.Get("disabletlsverification"))assert.Empty(t, query.Get("disabletls"))}++func TestBuildNtfyURLDisableTLSUsesPlainHTTPFlag(t *testing.T) {+ gotURL, err := BuildNtfyURL(models.NtfyConfig{+ Host: "ntfy.example.com",+ Topic: "alerts",+ Cache: true,+ Firebase: true,+ DisableTLS: true,+ })+ require.NoError(t, err)++ parsedURL, err := url.Parse(gotURL)+ require.NoError(t, err)++ query := parsedURL.Query()+ assert.Equal(t, "yes", query.Get("disabletls"))+ assert.Empty(t, query.Get("disabletlsverification"))+}diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 11eb2777c..114024136 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -2647,6 +2647,8 @@"notifications_ntfy_firebase_help": "Send notifications via Firebase (enabled by default)","notifications_ntfy_disable_tls_label": "Disable TLS Verification","notifications_ntfy_disable_tls_help": "Disable TLS certificate verification (not recommended)",+ "notifications_ntfy_use_http_label": "Use HTTP (Disable TLS)",+ "notifications_ntfy_use_http_help": "Connect over plain HTTP instead of HTTPS, for self-hosted ntfy servers without TLS","notifications_pushover_description": "Send notifications via Pushover when container updates are detected","notifications_pushover_enabled_label": "Enable Pushover Notifications","notifications_pushover_token_label": "API Token",diff --git a/frontend/src/lib/types/notifications.ts b/frontend/src/lib/types/notifications.tsindex 6ec33b938..f6a6fe3b2 100644--- a/frontend/src/lib/types/notifications.ts+++ b/frontend/src/lib/types/notifications.ts@@ -103,6 +103,7 @@ export interface NtfyFormValues extends BaseProviderFormValues {icon: string;cache: boolean;firebase: boolean;+ disableTls: boolean;disableTlsVerification: boolean;}@@ -427,6 +428,7 @@ export function ntfySettingsToFormValues(settings?: NotificationSettings): NtfyFicon: getString(cfg, 'icon'),cache: getBoolean(cfg, 'cache', true),firebase: getBoolean(cfg, 'firebase', true),+ disableTls: getBoolean(cfg, 'disableTls', false),disableTlsVerification: getBoolean(cfg, 'disableTlsVerification', false),...eventFlagsToFormValues(events)};@@ -517,6 +519,7 @@ export function ntfyFormValuesToSettings(values: NtfyFormValues): NotificationSeicon: values.icon,cache: values.cache,firebase: values.firebase,+ disableTls: values.disableTls,disableTlsVerification: values.disableTlsVerification,events: {image_update: values.eventImageUpdate,diff --git a/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelteindex 29286ae76..1f317b5f0 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelte@@ -279,6 +279,7 @@icon: z.string(),cache: z.boolean(),firebase: z.boolean(),+ disableTls: z.boolean(),disableTlsVerification: z.boolean(),...eventSubscriptionSchemaFields})@@ -789,6 +790,13 @@label: m.notifications_ntfy_firebase_label(),description: m.notifications_ntfy_firebase_help()},+ {+ kind: 'switch',+ key: 'disableTls',+ id: 'ntfy-use-http',+ label: m.notifications_ntfy_use_http_label(),+ description: m.notifications_ntfy_use_http_help()+ },{kind: 'switch',key: 'disableTlsVerification',