Skip to content

Commit

Permalink
[CRE-43] fix slicing of events (#992)
Browse files Browse the repository at this point in the history
* fix: calculate the index of the slot instead of relying on the value of it

* test: extract getSlot and unit test it

* chore: renename offset + add test coverage
  • Loading branch information
agparadiso authored Jan 13, 2025
1 parent 7c712f1 commit b34bea6
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 2 deletions.
18 changes: 16 additions & 2 deletions pkg/workflows/wasm/host/wasip1.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package host

import (
"encoding/binary"
"fmt"
"io"
"math/rand"
"time"
Expand Down Expand Up @@ -122,9 +123,11 @@ func pollOneoff(caller *wasmtime.Caller, subscriptionptr int32, eventsptr int32,
eventType := subs[inOffset+8]
argBuf := subs[inOffset+8+8:]

outOffset := events[i*eventsLen]
slot, err := getSlot(events, i)
if err != nil {
return ErrnoFault
}

slot := events[outOffset:]
switch eventType {
case eventTypeClock:
// We want to stub out clock events,
Expand Down Expand Up @@ -228,3 +231,14 @@ func createRandomGet(cfg *ModuleConfig) func(caller *wasmtime.Caller, buf, bufLe
return ErrnoSuccess
}
}

func getSlot(events []byte, i int32) ([]byte, error) {
offset := i * eventsLen

if offset+eventsLen > int32(len(events)) {
return nil, fmt.Errorf("slot %d out of bounds", i)
}

slot := events[offset : offset+eventsLen]
return slot, nil
}
31 changes: 31 additions & 0 deletions pkg/workflows/wasm/host/wasip1_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package host

import (
"testing"

"github.com/stretchr/testify/assert"
)

func TestGetSlot(t *testing.T) {
events := []byte{
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
250, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
}

t.Run("getSlot works correctly", func(t *testing.T) {
expectedSlots := [][]byte{
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31},
{250, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63},
}

for i := int32(0); i < 2; i++ {
slot, err := getSlot(events, i)
assert.NoError(t, err)
assert.Equal(t, expectedSlots[i], slot)
}
})
t.Run("check for out of bound slot", func(t *testing.T) {
_, err := getSlot(events, 400)
assert.Error(t, err)
})
}

0 comments on commit b34bea6

Please sign in to comment.