fixup! feat!: rework config parsing

Author: jmattheis

config/config_test.go

@@ -89,3 +89,28 @@ func TestNotAddSlash(t *testing.T) {
 	assert.Equal(t, "../data/", conf.UploadedImagesDir)
 	os.Unsetenv("GOTIFY_UPLOADEDIMAGESDIR")
 }
+
+func TestParseList(t *testing.T) {
+	const env = "GOTIFY_TEST_PARSELIST"
+
+	tests := []struct {
+		name string
+		raw  string
+		want []string
+	}{
+		{name: "escaped quotes", raw: `"a,b","c""d",e`, want: []string{`a,b`, `c"d`, `e`}},
+		{name: "lazy bare quote", raw: `a"b,c`, want: []string{`a"b`, `c`}},
+		{name: "lazy quote in quoted field", raw: `"ab"cd",test`, want: []string{`ab"cd`, `test`}},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			os.Setenv(env, tc.raw)
+			defer os.Unsetenv(env)
+
+			var got []string
+			assert.Nil(t, parseList(&got, env))
+			assert.Equal(t, tc.want, got)
+		})
+	}
+}

config/parse.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"encoding/csv"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -74,11 +75,14 @@ func parseList(target *[]string, env string) error {
 	if !ok || raw == "" {
 		return nil
 	}
-	var out []string
-	for part := range strings.SplitSeq(raw, ",") {
-		out = append(out, strings.TrimSpace(part))
+	reader := csv.NewReader(strings.NewReader(raw))
+	reader.TrimLeadingSpace = true
+	reader.LazyQuotes = true
+	record, err := reader.Read()
+	if err != nil {
+		return fmt.Errorf("invalid CSV for %s (%q): %w", env, raw, err)
 	}
-	*target = out
+	*target = record
 	return nil
 }
 

gotify-server.env.example

@@ -17,8 +17,10 @@
 #   text       a plain string value.
 #   number     an integer value.
 #   boolean    `true` or `false`.
-#   text-list  comma-separated list of strings; whitespace around each entry is trimmed.
+#   text-list  comma-separated list of strings, parsed as a single CSV line.
+#              A comma can be escaped by wrapping the value in quotes.
 #              Example: a,b,c
+#              Example: "a,b",c  -> entries: `a,b` and `c`
 #   json-map   a JSON object mapping string keys to string values.
 #              Example: {"X-Foo":"bar","X-Baz":"qux"}
 #