Skip to content

Modern Docker Management, Designed for Everyone

fix: use correct disabletlsverification parameter for ntfy (#3084)

Kyle Mendellb81fb1210b2f
diff --git a/backend/pkg/utils/notifications/ntfy_sender.go b/backend/pkg/utils/notifications/ntfy_sender.go
index 8186df644..3991e17a6 100644
--- a/backend/pkg/utils/notifications/ntfy_sender.go
+++ b/backend/pkg/utils/notifications/ntfy_sender.go
@@ -78,7 +78,7 @@ func BuildNtfyURL(config models.NtfyConfig) (string, error) {
}
if config.DisableTLSVerification {
- q.Set("disabletls", "yes")
+ q.Set("disabletlsverification", "yes")
}
u.RawQuery = q.Encode()
diff --git a/backend/pkg/utils/notifications/ntfy_sender_test.go b/backend/pkg/utils/notifications/ntfy_sender_test.go
index 6c0c5a448..b84c7213f 100644
--- a/backend/pkg/utils/notifications/ntfy_sender_test.go
+++ b/backend/pkg/utils/notifications/ntfy_sender_test.go
@@ -1,6 +1,7 @@
package notifications
import (
+ "net/url"
"testing"
"github.com/getarcaneapp/arcane/backend/v2/internal/models"
@@ -111,7 +112,7 @@ func TestBuildNtfyURL(t *testing.T) {
},
wantErr: false,
check: func(url string) bool {
- return url == "ntfy://user:[email protected]:8080/test?cache=no&disabletls=yes&firebase=no&icon=https%3A%2F%2Fexample.com%2Ficon.png&priority=max&tags=urgent&title=Arcane+Alert"
+ return url == "ntfy://user:[email protected]:8080/test?cache=no&disabletlsverification=yes&firebase=no&icon=https%3A%2F%2Fexample.com%2Ficon.png&priority=max&tags=urgent&title=Arcane+Alert"
},
},
}
@@ -128,3 +129,21 @@ func TestBuildNtfyURL(t *testing.T) {
})
}
}
+
+func TestBuildNtfyURLDisableTLSVerificationUsesCertificateVerificationFlag(t *testing.T) {
+ gotURL, err := BuildNtfyURL(models.NtfyConfig{
+ Host: "ntfy.example.com",
+ Topic: "alerts",
+ Cache: true,
+ Firebase: true,
+ DisableTLSVerification: true,
+ })
+ require.NoError(t, err)
+
+ parsedURL, err := url.Parse(gotURL)
+ require.NoError(t, err)
+
+ query := parsedURL.Query()
+ assert.Equal(t, "yes", query.Get("disabletlsverification"))
+ assert.Empty(t, query.Get("disabletls"))
+}
diff --git a/types/image/image.go b/types/image/image.go
index 0e9406f80..2c75317e3 100644
--- a/types/image/image.go
+++ b/types/image/image.go
@@ -472,7 +472,7 @@ func NewDetailSummary(src *image.InspectResponse) DetailSummary {
}
}
out.Config.WorkingDir = src.Config.WorkingDir
- out.Config.ArgsEscaped = src.Config.ArgsEscaped
+ out.Config.ArgsEscaped = src.Config.ArgsEscaped //nolint:staticcheck,nolintlint // Mirror Docker inspect data; deprecated only for new image builders.
}
out.Architecture = src.Architecture