Merge pull request #1708 from CosmWasm/mergify/bp/releases/v0.4x/pr-1697

Prevent empty channel version (backport #1697)
CosmWasm · Nov 13, 2023 · 56af873 · 56af873
2 parents 15bc22a + b2aa4a4
commit 56af873
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/x/wasm/ibc.go b/x/wasm/ibc.go
@@ -75,6 +75,9 @@ func (i IBCHandler) OnChanOpenInit(
 		return "", err
 	}
 	if acceptedVersion == "" { // accept incoming version when nothing returned by contract
+		if version == "" {
+			return "", types.ErrEmpty.Wrap("version")
+		}
 		acceptedVersion = version
 	}
 

diff --git a/x/wasm/ibc_integration_test.go b/x/wasm/ibc_integration_test.go
@@ -21,21 +21,31 @@ import (
 )
 
 func TestOnChanOpenInitVersion(t *testing.T) {
-	const startVersion = "v1"
+	const v1 = "v1"
 	specs := map[string]struct {
-		contractRsp *wasmvmtypes.IBC3ChannelOpenResponse
-		expVersion  string
+		startVersion string
+		contractRsp  *wasmvmtypes.IBC3ChannelOpenResponse
+		expVersion   string
+		expErr       bool
 	}{
 		"different version": {
-			contractRsp: &wasmvmtypes.IBC3ChannelOpenResponse{Version: "v2"},
-			expVersion:  "v2",
+			startVersion: v1,
+			contractRsp:  &wasmvmtypes.IBC3ChannelOpenResponse{Version: "v2"},
+			expVersion:   "v2",
 		},
 		"no response": {
-			expVersion: startVersion,
+			startVersion: v1,
+			expVersion:   v1,
 		},
 		"empty result": {
-			contractRsp: &wasmvmtypes.IBC3ChannelOpenResponse{},
-			expVersion:  startVersion,
+			startVersion: v1,
+			contractRsp:  &wasmvmtypes.IBC3ChannelOpenResponse{},
+			expVersion:   v1,
+		},
+		"empty versions should fail": {
+			startVersion: "",
+			contractRsp:  &wasmvmtypes.IBC3ChannelOpenResponse{},
+			expErr:       true,
 		},
 	}
 	for name, spec := range specs {
@@ -63,10 +73,17 @@ func TestOnChanOpenInitVersion(t *testing.T) {
 
 			path.EndpointA.ChannelConfig = &ibctesting.ChannelConfig{
 				PortID:  contractInfo.IBCPortID,
-				Version: startVersion,
+				Version: spec.startVersion,
 				Order:   channeltypes.UNORDERED,
 			}
-			require.NoError(t, path.EndpointA.ChanOpenInit())
+			// when
+			gotErr := path.EndpointA.ChanOpenInit()
+			// then
+			if spec.expErr {
+				require.Error(t, gotErr)
+				return
+			}
+			require.NoError(t, gotErr)
 			assert.Equal(t, spec.expVersion, path.EndpointA.ChannelConfig.Version)
 		})
 	}