config: trim trailing slashes from externalURL

Fixes #1371.
fsouza · Oct 20, 2023 · f600070 · f600070
1 parent 4908cb9
commit f600070
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -226,7 +226,7 @@ func (c *Config) ToFakeGcsOptions(logger *slog.Logger, scheme string) fakestorag
 		Host:                c.Host,
 		Port:                uint16(port),
 		PublicHost:          c.publicHost,
-		ExternalURL:         c.externalURL,
+		ExternalURL:         strings.TrimRight(c.externalURL, "/"),
 		AllowedCORSHeaders:  c.allowedCORSHeaders,
 		Writer:              &slogWriter{logger: logger, level: slog.LevelInfo},
 		EventOptions:        eventOptions,

diff --git a/internal/config/config_test.go b/internal/config/config_test.go
@@ -416,6 +416,27 @@ func TestToFakeGcsOptions(t *testing.T) {
 				NoListener:  true,
 			},
 		},
+		{
+			"external-url with trailing slashes",
+			Config{
+				backend:     "memory",
+				fsRoot:      "/tmp/something",
+				publicHost:  "127.0.0.1.nip.io:8443",
+				externalURL: "https://myhost.example.com:8443/",
+				Host:        "0.0.0.0",
+				Port:        443,
+				Scheme:      "https",
+			},
+			fakestorage.Options{
+				StorageRoot: "",
+				PublicHost:  "127.0.0.1.nip.io:8443",
+				ExternalURL: "https://myhost.example.com:8443",
+				Host:        "0.0.0.0",
+				Port:        443,
+				Scheme:      "https",
+				NoListener:  true,
+			},
+		},
 	}
 
 	for _, test := range tests {