Skip to content

High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.

Disallow `null` in `[]` fields in settings update. Closes #3148.

Kailash Nadh66fe73426fca
diff --git a/internal/core/settings.go b/internal/core/settings.go
index 2d277e46..eaa9e515 100644
--- a/internal/core/settings.go
+++ b/internal/core/settings.go
@@ -1,10 +1,12 @@
package core
import (
+ "bytes"
"encoding/json"
"net/http"
"github.com/jmoiron/sqlx/types"
+ "github.com/knadh/listmonk/internal/utils"
"github.com/knadh/listmonk/models"
"github.com/labstack/echo/v4"
)
@@ -33,6 +35,17 @@ func (c *Core) GetSettings() (models.Settings, error) {
// UpdateSettings updates settings.
func (c *Core) UpdateSettings(s models.Settings) error {
+ // Persist empty collections as arrays, not JSON null.
+ s.AppNotifyEmails = utils.NilToSlice(s.AppNotifyEmails)
+ s.PrivacyExportable = utils.NilToSlice(s.PrivacyExportable)
+ s.DomainBlocklist = utils.NilToSlice(s.DomainBlocklist)
+ s.DomainAllowlist = utils.NilToSlice(s.DomainAllowlist)
+ s.SecurityTrustedURLs = utils.NilToSlice(s.SecurityTrustedURLs)
+ s.UploadExtensions = utils.NilToSlice(s.UploadExtensions)
+ s.SMTP = utils.NilToSlice(s.SMTP)
+ s.Messengers = utils.NilToSlice(s.Messengers)
+ s.BounceBoxes = utils.NilToSlice(s.BounceBoxes)
+
// Marshal settings.
b, err := json.Marshal(s)
if err != nil {
@@ -51,6 +64,21 @@ func (c *Core) UpdateSettings(s models.Settings) error {
// UpdateSettingsByKey updates a single setting by key.
func (c *Core) UpdateSettingsByKey(key string, value json.RawMessage) error {
+ switch key {
+ case "app.notify_emails",
+ "privacy.exportable",
+ "privacy.domain_blocklist",
+ "privacy.domain_allowlist",
+ "security.trusted_urls",
+ "upload.extensions",
+ "smtp",
+ "messengers",
+ "bounce.mailboxes":
+ if bytes.Equal(bytes.TrimSpace(value), []byte("null")) {
+ value = json.RawMessage("[]")
+ }
+ }
+
if _, err := c.q.UpdateSettingsByKey.Exec(key, value); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError,
c.i18n.Ts("globals.messages.errorUpdating", "name", "{globals.terms.settings}", "error", pqErrMsg(err)))
diff --git a/internal/utils/utils.go b/internal/utils/utils.go
index 44aa5175..373938fd 100644
--- a/internal/utils/utils.go
+++ b/internal/utils/utils.go
@@ -76,3 +76,12 @@ func SanitizeURI(u string) string {
return path.Clean(p.Path)
}
+
+// NilToSlice returns an empty slice if s is nil, otherwise s unchanged.
+func NilToSlice[T any](s []T) []T {
+ if s == nil {
+ return []T{}
+ }
+
+ return s
+}