Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: proxy flag for additional cors headers #377

Merged
merged 2 commits into from
Sep 26, 2024
Merged

feat: proxy flag for additional cors headers #377

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e971bf1
feat: proxy flag for additional cors headers
afreakk Sep 12, 2024
389ea33
Merge branch 'master' into master
zepatrik Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 25 additions & 22 deletions cmd/cloudx/proxy/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,30 +43,32 @@ import (
)

const (
PortFlag = "port"
OpenFlag = "open"
DevFlag = "dev"
DebugFlag = "debug"
WithoutJWTFlag = "no-jwt"
CookieDomainFlag = "cookie-domain"
DefaultRedirectURLFlag = "default-redirect-url"
CORSFlag = "allowed-cors-origins"
RewriteHostFlag = "rewrite-host"
PortFlag = "port"
OpenFlag = "open"
DevFlag = "dev"
DebugFlag = "debug"
WithoutJWTFlag = "no-jwt"
CookieDomainFlag = "cookie-domain"
DefaultRedirectURLFlag = "default-redirect-url"
CORSFlag = "allowed-cors-origins"
AdditionalCORSHeadersFlag = "additional-cors-headers"
RewriteHostFlag = "rewrite-host"
)

type config struct {
port int
open bool
noJWT bool
upstream string
cookieDomain string
publicURL *url.URL
pathPrefix string
defaultRedirectTo cmdx.URL
isTunnel bool
isDebug bool
isDev bool
corsOrigins []string
port int
open bool
noJWT bool
upstream string
cookieDomain string
publicURL *url.URL
pathPrefix string
defaultRedirectTo cmdx.URL
isTunnel bool
isDebug bool
isDev bool
corsOrigins []string
additionalCorsHeaders []string

// rewriteHost means the host header will be rewritten to the upstream host.
// This is useful in cases where upstream resolves requests based on Host.
Expand All @@ -83,6 +85,7 @@ func registerConfigFlags(conf *config, flags *pflag.FlagSet) {
flags.IntVar(&conf.port, PortFlag, portFromEnv(), "The port the proxy should listen on.")
flags.Var(&conf.defaultRedirectTo, DefaultRedirectURLFlag, "Set the URL to redirect to per default after e.g. login or account creation.")
flags.StringSliceVar(&conf.corsOrigins, CORSFlag, []string{}, "A list of allowed CORS origins. Wildcards are allowed.")
flags.StringSliceVar(&conf.additionalCorsHeaders, AdditionalCORSHeadersFlag, []string{}, "A list of additional CORS headers to allow. Wildcards are allowed.")
flags.BoolVar(&conf.isDev, DevFlag, false, "Use this flag when developing locally.")
flags.BoolVar(&conf.isDebug, DebugFlag, false, "Use this flag to debug, for example, CORS requests.")
flags.BoolVar(&conf.rewriteHost, RewriteHostFlag, false, "Use this flag to rewrite the host header to the upstream host.")
Expand Down Expand Up @@ -240,7 +243,7 @@ func runReverseProxy(ctx context.Context, h *client.CommandHelper, stdErr io.Wri
AllowedOrigins: corsOrigins,
AllowOriginRequestFunc: originFunc,
AllowedMethods: corsx.CORSDefaultAllowedMethods,
AllowedHeaders: append(corsx.CORSRequestHeadersSafelist, corsx.CORSRequestHeadersExtended...),
AllowedHeaders: append(corsx.CORSRequestHeadersSafelist, append(corsx.CORSRequestHeadersExtended, conf.additionalCorsHeaders...)...),
ExposedHeaders: corsx.CORSResponseHeadersSafelist,
MaxAge: 0,
AllowCredentials: true,
Expand Down
Loading