TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-10-31 09:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: check http methods on specific http2 routes (#3527)

Browse Source 
* fix: check headers lowercase

* Update .releaserc.js

* fix: check http methods on specific http2 routes
This commit is contained in:
Livio Amstutz
2022-04-27 13:10:44 +02:00
committed by GitHub
parent ab04655019
commit fd1150f628
1 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
internal/api/api.go
View File

@@ -83,12 +83,15 @@ func (a *API) RegisterHandler(prefix string, handler http.Handler) {
}
func (a *API) routeGRPC() {
http2Route := a.router.Methods(http.MethodPost).
http2Route := a.router.
MatcherFunc(func(r *http.Request, _ *mux.RouteMatch) bool {
return r.ProtoMajor == 2
}).
Subrouter()
http2Route.Headers("Content-Type", "application/grpc").Handler(a.grpcServer)
http2Route.
Methods(http.MethodPost).
Headers("Content-Type", "application/grpc").
Handler(a.grpcServer)
if !a.externalSecure {
a.routeGRPCWeb(a.router)
@@ -98,31 +101,34 @@ func (a *API) routeGRPC() {
}
func (a *API) routeGRPCWeb(router *mux.Router) {
router.NewRoute().MatcherFunc(
func(r *http.Request, _ *mux.RouteMatch) bool {
if strings.Contains(r.Header.Get("content-type"), "application/grpc-web+") {
return true
}
return strings.Contains(r.Header.Get("access-control-request-headers"), "x-grpc-web")
}).Handler(
grpcweb.WrapServer(a.grpcServer,
grpcweb.WithAllowedRequestHeaders(
[]string{
http_util.Origin,
http_util.ContentType,
http_util.Accept,
http_util.AcceptLanguage,
http_util.Authorization,
http_util.ZitadelOrgID,
http_util.XUserAgent,
http_util.XGrpcWeb,
},
router.NewRoute().
Methods(http.MethodPost, http.MethodOptions).
MatcherFunc(
func(r *http.Request, _ *mux.RouteMatch) bool {
if strings.Contains(strings.ToLower(r.Header.Get("content-type")), "application/grpc-web+") {
return true
}
return strings.Contains(strings.ToLower(r.Header.Get("access-control-request-headers")), "x-grpc-web")
}).
Handler(
grpcweb.WrapServer(a.grpcServer,
grpcweb.WithAllowedRequestHeaders(
[]string{
http_util.Origin,
http_util.ContentType,
http_util.Accept,
http_util.AcceptLanguage,
http_util.Authorization,
http_util.ZitadelOrgID,
http_util.XUserAgent,
http_util.XGrpcWeb,
},
),
grpcweb.WithOriginFunc(func(_ string) bool {
return true
}),
),
grpcweb.WithOriginFunc(func(_ string) bool {
return true
}),
),
)
)
}
func (a *API) healthHandler() http.Handler {