Skip to content

Add a flag to allow disabling autoconfigured CORS allowed origin values #1

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

Merged
jefferai merged 1 commit into from
Apr 14, 2021
Merged

Add a flag to allow disabling autoconfigured CORS allowed origin values #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 16 additions & 5 deletions configutil/listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,13 @@ type Listener struct {
// RandomPort is used only for some testing purposes
RandomPort bool `hcl:"-"`

CorsEnabledRaw interface{} `hcl:"cors_enabled"`
CorsEnabled *bool `hcl:"-"`
CorsAllowedOrigins []string `hcl:"cors_allowed_origins"`
CorsAllowedHeaders []string `hcl:"-"`
CorsAllowedHeadersRaw []string `hcl:"cors_allowed_headers"`
CorsEnabledRaw interface{} `hcl:"cors_enabled"`
CorsEnabled *bool `hcl:"-"`
CorsDisableDefaultAllowedOriginValuesRaw interface{} `hcl:"cors_disable_default_allowed_origin_values"`
CorsDisableDefaultAllowedOriginValues *bool `hcl:"-"`
CorsAllowedOrigins []string `hcl:"cors_allowed_origins"`
CorsAllowedHeaders []string `hcl:"-"`
CorsAllowedHeadersRaw []string `hcl:"cors_allowed_headers"`
}

func (l *Listener) GoString() string {
Expand Down Expand Up @@ -330,6 +332,15 @@ func ParseListeners(result *SharedConfig, list *ast.ObjectList) error {
l.CorsEnabledRaw = nil
}

if l.CorsDisableDefaultAllowedOriginValuesRaw != nil {
disabled, err := parseutil.ParseBool(l.CorsDisableDefaultAllowedOriginValuesRaw)
if err != nil {
return multierror.Prefix(fmt.Errorf("invalid value for cors_disable_default_allowed_origin_values: %w", err), fmt.Sprintf("listeners.%d", i))
}
l.CorsDisableDefaultAllowedOriginValues = &disabled
l.CorsDisableDefaultAllowedOriginValuesRaw = nil
}

if strutil.StrListContains(l.CorsAllowedOrigins, "*") && len(l.CorsAllowedOrigins) > 1 {
return multierror.Prefix(errors.New("cors_allowed_origins must only contain a wildcard or only non-wildcard values"), fmt.Sprintf("listeners.%d", i))
}
Expand Down