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

feat: grpc-web add CORS handler #9493

Merged
merged 12 commits into from
Jun 16, 2021
Merged

feat: grpc-web add CORS handler #9493

Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
eb59f49
add EnableUnsafeCORS
aleem1314 Jun 10, 2021
c114cce
Merge branch 'master' into aleem/9467-grpcweb-cors
aleem1314 Jun 10, 2021
f6bdfc8
review changes
aleem1314 Jun 14, 2021
c6d1699
Merge branch 'master' into aleem/9467-grpcweb-cors
aleem1314 Jun 14, 2021
7c9b397
add EnableUnsafeCORS flag to grpc-web config
aleem1314 Jun 14, 2021
5624d63
Merge branch 'master' into aleem/9467-grpcweb-cors
aleem1314 Jun 15, 2021
ae0b4ad
Update server/config/config.go
aleem1314 Jun 15, 2021
e069fcd
Update server/config/toml.go
aleem1314 Jun 15, 2021
f2de803
Update server/config/config.go
aleem1314 Jun 15, 2021
140d64d
Merge branch 'master' into aleem/9467-grpcweb-cors
alexanderbez Jun 15, 2021
ce8691f
update CHANGELOG.md
aleem1314 Jun 16, 2021
78be226
Merge branch 'master' into aleem/9467-grpcweb-cors
mergify[bot] Jun 16, 2021
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: 10 additions & 1 deletion server/grpc/grpc_web.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,16 @@ import (

// StartGRPCWeb starts a gRPC-Web server on the given address.
func StartGRPCWeb(grpcSrv *grpc.Server, config config.Config) (*http.Server, error) {
wrappedServer := grpcweb.WrapServer(grpcSrv)
var options []grpcweb.Option
if config.API.EnableUnsafeCORS {
amaury1093 marked this conversation as resolved.
Show resolved Hide resolved
options = append(options,
grpcweb.WithOriginFunc(func(origin string) bool {
return true
}),
)
}

wrappedServer := grpcweb.WrapServer(grpcSrv, options...)
handler := func(resp http.ResponseWriter, req *http.Request) {
wrappedServer.ServeHTTP(resp, req)
}
Expand Down