balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Change CORS to Cors on CLI options, specify origins as an option

Browse Source
This commit is contained in:
Dan Sosedoff 2017-11-16 22:10:14 -06:00
parent b52394a166
commit c3435e2ece
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/middleware.go
View File

@ -80,7 +80,7 @@ func serveResult(result interface{}, err error, c *gin.Context) {
func corsMiddleware() gin.HandlerFunc { func corsMiddleware() gin.HandlerFunc {
return func(c *gin.Context) { return func(c *gin.Context) {
c.Header("Access-Control-Allow-Methods", "GET, POST, OPTIONS") c.Header("Access-Control-Allow-Methods", "GET, POST, OPTIONS")
c.Header("Access-Control-Allow-Origin", "*")
c.Header("Access-Control-Expose-Headers", "*") c.Header("Access-Control-Expose-Headers", "*")
c.Header("Access-Control-Allow-Origin", command.Opts.CorsOrigin)
} }
} }

2
pkg/api/routes.go
View File

@ -10,7 +10,7 @@ func SetupMiddlewares(group *gin.RouterGroup) {
group.Use(requestInspectMiddleware()) group.Use(requestInspectMiddleware())
} }
if command.Opts.CORS { if command.Opts.Cors {
group.Use(corsMiddleware()) group.Use(corsMiddleware())
} }

3
pkg/command/options.go
View File

@ -36,7 +36,8 @@ type Options struct {
ConnectHeaders string `long:"connect-headers" description:"List of headers to pass to the connect backend"` ConnectHeaders string `long:"connect-headers" description:"List of headers to pass to the connect backend"`
DisableConnectionIdleTimeout bool `long:"no-idle-timeout" description:"Disable connection idle timeout" default:"false"` DisableConnectionIdleTimeout bool `long:"no-idle-timeout" description:"Disable connection idle timeout" default:"false"`
ConnectionIdleTimeout float64 `long:"idle-timeout" description:"Set connection idle timeout in minutes" default:"180"` ConnectionIdleTimeout float64 `long:"idle-timeout" description:"Set connection idle timeout in minutes" default:"180"`
CORS bool `long:"cors" description:"Enable Cross-Origin Resource Sharing (CORS)" default:"false"` Cors bool `long:"cors" description:"Enable Cross-Origin Resource Sharing (CORS)" default:"false"`
CorsOrigin string `long:"cors-origin" description:"Allowed CORS origins" default:"*"`
} }
var Opts Options var Opts Options