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

Support CORS in APIServer & handler ErrServerClosed #1107

Merged
merged 2 commits into from
Oct 9, 2023
Merged

Support CORS in APIServer & handler ErrServerClosed #1107

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaca053
Support CORS in APIServer & handler ErrServerClosed
xxx7xxxx Oct 9, 2023
7fe673c
Fix mod inconsistency
xxx7xxxx Oct 9, 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
Next Next commit
Support CORS in APIServer & handler ErrServerClosed
  • Loading branch information
@xxx7xxxx
xxx7xxxx committed Oct 9, 2023
commit aaca0538a1ccf67cfacfa38513b0d073e315560c
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ require (
github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9 // indirect
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect
github.com/go-chi/cors v1.2.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/google/pprof v0.0.0-20230228050547-1710fef4ab10 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@ github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0=
github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
Expand Down
5 changes: 5 additions & 0 deletions pkg/api/dynamicmux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (

"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
"github.com/go-chi/cors"

"github.com/megaease/easegress/v2/pkg/logger"
)
Expand Down Expand Up @@ -84,6 +85,10 @@ func (m *dynamicMux) reloadAPIs() {
router.Use(m.basicAuth("easegress-basic-auth", m.server.opt.BasicAuth))
}

// For access from browser.
cors := cors.New(cors.Options{})
router.Use(cors.Handler)

for _, apiGroup := range apiGroups {
for _, api := range apiGroup.Entries {
pathV1 := APIPrefixV1 + api.Path
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func MustNewServer(opt *option.Options, cls cluster.Cluster, super *supervisor.S
logger.Infof("api server running in %s", opt.APIAddr)
err = s.server.ListenAndServe()
}
if err != nil {
if err != nil && err != http.ErrServerClosed {
logger.Errorf("start api server failed: %v", err)
}
}()
Expand Down
Loading