feat: grpc-web add CORS handler (#9493)
<!-- The default pull request template is for types feat, fix, or refactor. For other templates, add one of the following parameters to the url: - template=docs.md - template=other.md --> ## Description Closes: #9467 <!-- Add a description of the changes that this PR introduces and the files that are the most critical to review. --> --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [x] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [x] provided a link to the relevant issue or specification - [x] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable)
This commit is contained in:
parent
3c82a32f9b
commit
38d670226f
|
@ -131,6 +131,7 @@ if input key is empty, or input data contains empty key.
|
||||||
|
|
||||||
### Improvements
|
### Improvements
|
||||||
|
|
||||||
|
* (gRPC-Web) [\#9493](https://github.com/cosmos/cosmos-sdk/pull/9493) Add `EnableUnsafeCORS` flag to grpc-web config.
|
||||||
* (store) [\#9403](https://github.com/cosmos/cosmos-sdk/pull/9403) Add `RefundGas` function to `GasMeter` interface
|
* (store) [\#9403](https://github.com/cosmos/cosmos-sdk/pull/9403) Add `RefundGas` function to `GasMeter` interface
|
||||||
* (baseapp, types) [\#9390](https://github.com/cosmos/cosmos-sdk/pull/9390) Add current block header hash to `Context`
|
* (baseapp, types) [\#9390](https://github.com/cosmos/cosmos-sdk/pull/9390) Add current block header hash to `Context`
|
||||||
* (x/staking) [\#9423](https://github.com/cosmos/cosmos-sdk/pull/9423) Staking delegations now returns empty list instead of rpc error when no records found.
|
* (x/staking) [\#9423](https://github.com/cosmos/cosmos-sdk/pull/9423) Staking delegations now returns empty list instead of rpc error when no records found.
|
||||||
|
|
|
@ -140,6 +140,9 @@ type GRPCWebConfig struct {
|
||||||
|
|
||||||
// Address defines the gRPC-web server to listen on
|
// Address defines the gRPC-web server to listen on
|
||||||
Address string `mapstructure:"address"`
|
Address string `mapstructure:"address"`
|
||||||
|
|
||||||
|
// EnableUnsafeCORS defines if CORS should be enabled (unsafe - use it at your own risk)
|
||||||
|
EnableUnsafeCORS bool `mapstructure:"enable-unsafe-cors"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// StateSyncConfig defines the state sync snapshot configuration.
|
// StateSyncConfig defines the state sync snapshot configuration.
|
||||||
|
@ -299,6 +302,7 @@ func GetConfig(v *viper.Viper) Config {
|
||||||
GRPCWeb: GRPCWebConfig{
|
GRPCWeb: GRPCWebConfig{
|
||||||
Enable: v.GetBool("grpc-web.enable"),
|
Enable: v.GetBool("grpc-web.enable"),
|
||||||
Address: v.GetString("grpc-web.address"),
|
Address: v.GetString("grpc-web.address"),
|
||||||
|
EnableUnsafeCORS: v.GetBool("grpc-web.enable-unsafe-cors"),
|
||||||
},
|
},
|
||||||
StateSync: StateSyncConfig{
|
StateSync: StateSyncConfig{
|
||||||
SnapshotInterval: v.GetUint64("state-sync.snapshot-interval"),
|
SnapshotInterval: v.GetUint64("state-sync.snapshot-interval"),
|
||||||
|
|
|
@ -184,6 +184,9 @@ enable = {{ .GRPCWeb.Enable }}
|
||||||
# Address defines the gRPC-web server address to bind to.
|
# Address defines the gRPC-web server address to bind to.
|
||||||
address = "{{ .GRPCWeb.Address }}"
|
address = "{{ .GRPCWeb.Address }}"
|
||||||
|
|
||||||
|
# EnableUnsafeCORS defines if CORS should be enabled (unsafe - use it at your own risk).
|
||||||
|
enable-unsafe-cors = {{ .GRPCWeb.EnableUnsafeCORS }}
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
### State Sync Configuration ###
|
### State Sync Configuration ###
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
|
@ -11,7 +11,16 @@ import (
|
||||||
|
|
||||||
// StartGRPCWeb starts a gRPC-Web server on the given address.
|
// StartGRPCWeb starts a gRPC-Web server on the given address.
|
||||||
func StartGRPCWeb(grpcSrv *grpc.Server, config config.Config) (*http.Server, error) {
|
func StartGRPCWeb(grpcSrv *grpc.Server, config config.Config) (*http.Server, error) {
|
||||||
wrappedServer := grpcweb.WrapServer(grpcSrv)
|
var options []grpcweb.Option
|
||||||
|
if config.GRPCWeb.EnableUnsafeCORS {
|
||||||
|
options = append(options,
|
||||||
|
grpcweb.WithOriginFunc(func(origin string) bool {
|
||||||
|
return true
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
wrappedServer := grpcweb.WrapServer(grpcSrv, options...)
|
||||||
handler := func(resp http.ResponseWriter, req *http.Request) {
|
handler := func(resp http.ResponseWriter, req *http.Request) {
|
||||||
wrappedServer.ServeHTTP(resp, req)
|
wrappedServer.ServeHTTP(resp, req)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue