gRPC gateway issue with colons in the account url path (#8649)

* add allow_colon_final_segments flag * add test * Update x/auth/client/rest/rest_test.go Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
cosmos · Feb 22, 2021 · 81cc5c1 · 81cc5c1
1 parent 7b52767
commit 81cc5c1
Show file tree

Hide file tree

Showing 21 changed files with 107 additions and 95 deletions.
diff --git a/client/grpc/reflection/reflection.pb.gw.go b/client/grpc/reflection/reflection.pb.gw.go
diff --git a/client/grpc/tmservice/query.pb.gw.go b/client/grpc/tmservice/query.pb.gw.go
diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh
@@ -20,7 +20,7 @@ for dir in $proto_dirs; do
   -I "third_party/proto" \
   --gocosmos_out=plugins=interfacetype+grpc,\
 Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \
-  --grpc-gateway_out=logtostderr=true:. \
+  --grpc-gateway_out=logtostderr=true,allow_colon_final_segments=true:. \
   $(find "${dir}" -maxdepth 1 -name '*.proto')
 
 done

diff --git a/types/tx/service.pb.gw.go b/types/tx/service.pb.gw.go
diff --git a/x/auth/client/rest/rest_test.go b/x/auth/client/rest/rest_test.go
@@ -156,6 +156,18 @@ func (s *IntegrationTestSuite) TestEncodeDecode() {
 	require.Equal(stdTx, legacytx.StdTx(decodeResp))
 }
 
+func (s *IntegrationTestSuite) TestQueryAccountWithColon() {
+	val := s.network.Validators[0]
+	// This address is not a valid simapp address! It is only used to test that addresses with
+	// colon don't 501. See
+	// https://github.com/cosmos/cosmos-sdk/issues/8650
+	addrWithColon := "cosmos:1m4f6lwd9eh8e5nxt0h00d46d3fr03apfh8qf4g"
+
+	res, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/auth/v1beta1/accounts/%s", val.APIAddress, addrWithColon))
+	s.Require().NoError(err)
+	s.Require().Contains(string(res), "decoding bech32 failed")
+}
+
 func (s *IntegrationTestSuite) TestEncodeIBCTx() {
 	val := s.network.Validators[0]
 

diff --git a/x/auth/types/query.pb.gw.go b/x/auth/types/query.pb.gw.go
diff --git a/x/authz/types/query.pb.gw.go b/x/authz/types/query.pb.gw.go
diff --git a/x/bank/types/query.pb.gw.go b/x/bank/types/query.pb.gw.go
diff --git a/x/distribution/types/query.pb.gw.go b/x/distribution/types/query.pb.gw.go
diff --git a/x/evidence/types/query.pb.gw.go b/x/evidence/types/query.pb.gw.go
diff --git a/x/feegrant/types/query.pb.gw.go b/x/feegrant/types/query.pb.gw.go