diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ebddb6bb..b13f5eb44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,10 +22,9 @@ Canonical reference for changes, improvements, and bugfixes for Boundary. `create` or `list`. This format operates only on collections so assigning more actions this way will never work * CORS: CORS is now turned on by default when running with `boundary server` - with an `allowed_origins` value of `*`. You can disable it with `cors_enabled - = false` or if you want to change parameters, set `cors_enabled = true` and - the other related configuration values. It was always turned on when running - `boundary dev` and this provides a more consistent experience. + with an `allowed_origins` value of `serve://boundary`. You can disable it with + `cors_enabled = false`, or if you want to change parameters, set `cors_enabled + = true` and the other related configuration values. ### New and Improved diff --git a/internal/cmd/config/config.go b/internal/cmd/config/config.go index 4cf7ecc64..f8f8d0f67 100644 --- a/internal/cmd/config/config.go +++ b/internal/cmd/config/config.go @@ -333,7 +333,7 @@ func Parse(d string) (*Config, error) { if listener.CorsEnabled == nil { listener.CorsEnabled = new(bool) *listener.CorsEnabled = true - listener.CorsAllowedOrigins = []string{"*"} + listener.CorsAllowedOrigins = []string{"serve://boundary"} } } } diff --git a/internal/servers/controller/handler.go b/internal/servers/controller/handler.go index ce75256f6..51ad8f410 100644 --- a/internal/servers/controller/handler.go +++ b/internal/servers/controller/handler.go @@ -279,12 +279,15 @@ func wrapHandlerWithCors(h http.Handler, props HandlerProperties) http.Handler { case len(allowedOrigins) == 0: // not valid - case len(allowedOrigins) == 1 && allowedOrigins[0] == "*": + case len(allowedOrigins) == 1 && + (allowedOrigins[0] == "*" || + allowedOrigins[0] == "serve://boundary"): valid = true default: valid = strutil.StrListContains(allowedOrigins, origin) } + if !valid { w.Header().Set("Content-Type", "application/json") w.WriteHeader(http.StatusForbidden)