Skip to content

fix(ibc-hooks): safely construct JSON message using Go struct and json.Marshal #278

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

Open
odaysec wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(ibc-hooks): safely construct JSON message using Go struct and json.Marshal #278

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 34 additions & 3 deletions modules/ibc-hooks/wasm_hook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,40 @@ func (h WasmHooks) OnAcknowledgementPacketOverride(im IBCMiddleware, ctx sdk.Con
return err
}

sudoMsg := []byte(fmt.Sprintf(
`{"ibc_lifecycle_complete": {"ibc_ack": {"channel": "%s", "sequence": %d, "ack": %s, "success": %s}}}`,
packet.SourceChannel, packet.Sequence, ackAsJson, success))
// Construct message using struct to avoid unsafe quoting
type ibcAckMsg struct {
Channel string `json:"channel"`
Sequence uint64 `json:"sequence"`
Ack interface{} `json:"ack"`
Success string `json:"success"`
}
type ibcLifecycleCompleteMsg struct {
IbcAck ibcAckMsg `json:"ibc_ack"`
}
type sudoMsgWrapper struct {
IbcLifecycleComplete ibcLifecycleCompleteMsg `json:"ibc_lifecycle_complete"`
}

// Unmarshal ackAsJson so it can be passed as a value, not a quoted string
var ackUnmarshaled interface{}
if err := json.Unmarshal(ackAsJson, &ackUnmarshaled); err != nil {
return err
}

sudoMsgStruct := sudoMsgWrapper{
IbcLifecycleComplete: ibcLifecycleCompleteMsg{
IbcAck: ibcAckMsg{
Channel: packet.SourceChannel,
Sequence: packet.Sequence,
Ack: ackUnmarshaled,
Success: success,
},
},
}
sudoMsg, err := json.Marshal(sudoMsgStruct)
if err != nil {
return err
}
_, err = h.ContractKeeper.Sudo(ctx, contractAddr, sudoMsg)
if err != nil {
// error processing the callback
Expand Down