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

feature: supports regex for origin #64

Merged
merged 3 commits into from
Nov 4, 2023
Merged

feature: supports regex for origin #64

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbef1f6
Origin wildcard
cv65kr Nov 4, 2023
e2d7167
Origin wildcard
cv65kr Nov 4, 2023
2323e5c
Rename option
cv65kr Nov 4, 2023
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
3 changes: 2 additions & 1 deletion config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ type Config struct {
// CORSConfig headers configuration.
type CORSConfig struct {
// AllowedOrigin: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin
AllowedOrigin string `mapstructure:"allowed_origin"`
AllowedOrigin string `mapstructure:"allowed_origin"`
AllowedOriginWildcard string `mapstructure:"allowed_origin_wildcard"`
cv65kr marked this conversation as resolved.
Show resolved Hide resolved
// AllowedHeaders: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Headers
AllowedHeaders string `mapstructure:"allowed_headers"`
// AllowedMethods: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Methods
Expand Down
8 changes: 8 additions & 0 deletions plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package headers
import (
"fmt"
"net/http"
"regexp"
"strings"

"github.com/roadrunner-server/errors"
Expand Down Expand Up @@ -70,6 +71,13 @@ func (p *Plugin) Init(cfg Configurer) error {
opts.AllowedOrigins = strings.Split(p.cfg.CORS.AllowedOrigin, ",")
}

// if this option is set, the content of `AllowedOrigins` is ignored
if p.cfg.CORS.AllowedOriginWildcard != "" {
opts.AllowOriginFunc = func(origin string) bool {
return regexp.MustCompile(p.cfg.CORS.AllowedOriginWildcard).MatchString(origin)
}
}
rustatian marked this conversation as resolved.
Show resolved Hide resolved

if p.cfg.CORS.AllowedMethods != "" {
// trim all spaces
p.cfg.CORS.AllowedMethods = strings.Trim(p.cfg.CORS.AllowedMethods, " ")
Expand Down
Loading