Skip to content

Enhanced error messages to reflect the wrong value for AllowdOrigins #167

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enhanced error messages to reflect the wrong value for AllowdOrigins #167

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8f44c1
enhanced error messages
Jun 24, 2025
018cd7a
fixed linter warning 'Redundant character escape '\/' in RegExp'
Jun 24, 2025
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
11 changes: 6 additions & 5 deletions cors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func (c Config) getAllowedSchemas() []string {
return allowedSchemas
}

var regexpBasedOrigin = regexp.MustCompile(`^\/(.+)\/[gimuy]?$`)
var regexpBasedOrigin = regexp.MustCompile(`^/(.+)/[gimuy]?$`)

func (c Config) validateAllowedSchemas(origin string) bool {
allowedSchemas := c.getAllowedSchemas()
Expand Down Expand Up @@ -140,11 +140,11 @@ func (c Config) Validate() error {
)
}
if !c.AllowAllOrigins && !hasOriginFn && len(c.AllowOrigins) == 0 {
return errors.New("conflict settings: all origins disabled")
return errors.New("conflict settings: all origins disabled. Specify either AllowAllOrigins, AllowOrigins or an AllowOriginFunc")
}
for _, origin := range c.AllowOrigins {
if !strings.Contains(origin, "*") && !c.validateAllowedSchemas(origin) {
return errors.New("bad origin: origins must contain '*' or include " + strings.Join(c.getAllowedSchemas(), ","))
return fmt.Errorf("bad origin ('%s'): origins must contain '*' or include %s", origin, strings.Join(c.getAllowedSchemas(), ","))
}
}
return nil
Expand All @@ -162,8 +162,9 @@ func (c Config) parseWildcardRules() [][]string {
continue
}

if c := strings.Count(o, "*"); c > 1 {
panic(errors.New("only one * is allowed").Error())
if count := strings.Count(o, "*"); count > 1 {
err := fmt.Errorf("only one * is allowed. actual value is: %s", c.AllowOrigins)
panic(err.Error())
}

i := strings.Index(o, "*")
Expand Down