Allow CORS origins from CORS_ALLOWED_ORIGINS
CI / test (push) Successful in 23s
CI / publish (push) Skipped
CI / docker (push) Successful in 46s
CI / integration (push) Successful in 19s

Echo compares allowed origins literally, so "https://*" and "http://*" never
matched a real origin and no CORS headers were sent. The allowed origins now
come from CORS_ALLOWED_ORIGINS (comma-separated, checked at startup). When it
is empty, only same-origin requests work, which is enough for the bundled
frontend.

Credentials are no longer allowed since the API uses Bearer tokens. Browsers
may now send Range and X-Queue-Id and read X-Queue-Id and Content-Range.
This commit is contained in:
Sansan committed 2026-10-07 20:03:13 +02:00
1 parent a705d7b476
commit d31bf3551c
4 files changed
+85 -8

No files matched your search

+11 -8
View File
@@ -40,14 +40,17 @@ func (s *Server) routes() (*echo.Echo, huma.API) {
e.Use(logging.RequestLogger())
e.Use(echoMiddleware.Recover())
e.Use(echoMiddleware.CORSWithConfig(echoMiddleware.CORSConfig{
AllowOrigins: []string{"https://*", "http://*"},
AllowMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"},
AllowHeaders: []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token", middleware.QueueHeader},
ExposeHeaders: []string{middleware.QueueHeader},
AllowCredentials: true,
MaxAge: 300,
}))
// Without allowed origins no CORS headers are sent, so only same-origin browser requests work.
// The API uses Bearer tokens, not cookies, so credentials are not allowed.
if len(s.cfg.CORSAllowedOrigins) > 0 {
e.Use(echoMiddleware.CORSWithConfig(echoMiddleware.CORSConfig{
AllowOrigins: s.cfg.CORSAllowedOrigins,
AllowMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"},
AllowHeaders: []string{"Accept", "Authorization", "Content-Type", "Range", middleware.QueueHeader},
ExposeHeaders: []string{middleware.QueueHeader, "Content-Range", "Accept-Ranges"},
MaxAge: 300,
}))
}
// The API: /api/v1 is documented at /docs and /openapi.json.
a := newAPI(e)
+27
View File
@@ -196,3 +196,30 @@ func TestTrustedProxies(t *testing.T) {
assert.Equal(t, http.StatusTooManyRequests, e.doBody(http.MethodPost, "/api/v1/token", `{}`, "X-Forwarded-For", "10.0.0.1").Code)
assert.Equal(t, http.StatusOK, e.doBody(http.MethodPost, "/api/v1/token", `{}`, "X-Forwarded-For", "10.0.0.2").Code)
}
func TestCORSAllowedOrigins(t *testing.T) {
e := newTestEnv(t, func(c *config.Config) { c.CORSAllowedOrigins = []string{"https://music.example.com"} })
rec := e.do(http.MethodGet, "/api/v1/music/list", "Origin", "https://music.example.com")
assert.Equal(t, http.StatusOK, rec.Code)
assert.Equal(t, "https://music.example.com", rec.Header().Get("Access-Control-Allow-Origin"))
assert.Contains(t, rec.Header().Get("Access-Control-Expose-Headers"), "X-Queue-Id")
assert.Empty(t, rec.Header().Get("Access-Control-Allow-Credentials"))
preflight := e.do(http.MethodOptions, "/api/v1/music/list", "Origin", "https://music.example.com",
"Access-Control-Request-Method", "GET", "Access-Control-Request-Headers", "authorization,x-queue-id")
assert.Equal(t, http.StatusNoContent, preflight.Code)
assert.Equal(t, "https://music.example.com", preflight.Header().Get("Access-Control-Allow-Origin"))
assert.Contains(t, preflight.Header().Get("Access-Control-Allow-Headers"), "X-Queue-Id")
assert.Contains(t, preflight.Header().Get("Access-Control-Allow-Headers"), "Authorization")
other := e.do(http.MethodGet, "/api/v1/music/list", "Origin", "https://evil.example.com")
assert.Empty(t, other.Header().Get("Access-Control-Allow-Origin"), "other origins get no CORS headers")
}
func TestCORSWithoutAllowedOrigins(t *testing.T) {
e := newTestEnv(t)
rec := e.do(http.MethodGet, "/api/v1/version", "Origin", "https://music.example.com")
assert.Equal(t, http.StatusOK, rec.Code, "the request itself works; the browser blocks reading it")
assert.Empty(t, rec.Header().Get("Access-Control-Allow-Origin"))
}