status-im
/
go-waku
mirror of https://github.com/status-im/go-waku.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: index out of bounds when querying stored messages

This commit is contained in:
Richard Ramos 2021-04-04 14:42:08 -04:00
parent 47752170e9
commit 3294103e06
No known key found for this signature in database
GPG Key ID: 80D4B01265FDFE8F
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/root.go
View File

@ -186,8 +186,10 @@ var rootCmd = &cobra.Command{
fmt.Println(fmt.Sprint("Page Size: ", response.PagingInfo.PageSize))
fmt.Println(fmt.Sprint("Direction: ", response.PagingInfo.Direction))
fmt.Println(fmt.Sprint("Cursor - ReceivedTime: ", response.PagingInfo.Cursor.ReceivedTime))
fmt.Println(fmt.Sprint("Cursor - Digest: ", hex.EncodeToString(response.PagingInfo.Cursor.Digest)))
if response.PagingInfo.Cursor != nil {
fmt.Println(fmt.Sprint("Cursor - ReceivedTime: ", response.PagingInfo.Cursor.ReceivedTime))
fmt.Println(fmt.Sprint("Cursor - Digest: ", hex.EncodeToString(response.PagingInfo.Cursor.Digest)))
}
fmt.Println("Messages:")
for i, msg := range response.Messages {
fmt.Println(fmt.Sprint(i, "- ", string(msg.Payload))) // Normaly you'd have to decode these, but i'm using v0

12
waku/v2/protocol/waku_store/waku_store.go
View File

@ -78,7 +78,7 @@ func paginateWithIndex(list []IndexedWakuMessage, pinfo *protocol.PagingInfo) (r
}
}
foundIndex := findIndex(&msgList, cursor)
foundIndex := findIndex(msgList, cursor)
if foundIndex == -1 { // the cursor is not valid
return nil, &protocol.PagingInfo{PageSize: 0, Cursor: pinfo.Cursor, Direction: pinfo.Direction}
}
@ -95,6 +95,9 @@ func paginateWithIndex(list []IndexedWakuMessage, pinfo *protocol.PagingInfo) (r
}
s = foundIndex + 1 // non inclusive
e = foundIndex + retrievedPageSize
if e < 0 {
e = 0
}
newCursor = msgList[e].index // the new cursor points to the end of the page
case protocol.PagingInfo_BACKWARD: // backward pagination
remainingMessages := foundIndex
@ -104,6 +107,9 @@ func paginateWithIndex(list []IndexedWakuMessage, pinfo *protocol.PagingInfo) (r
foundIndex = foundIndex + 1
}
s = foundIndex - retrievedPageSize
if s >= len(msgList) {
s = len(msgList) - 1
}
e = foundIndex - 1
newCursor = msgList[s].index // the new cursor points to the begining of the page
}
@ -308,10 +314,10 @@ func indexedWakuMessageComparison(x, y IndexedWakuMessage) int {
return indexComparison(x.index, y.index)
}
func findIndex(msgList *[]IndexedWakuMessage, index *protocol.Index) int {
func findIndex(msgList []IndexedWakuMessage, index *protocol.Index) int {
// returns the position of an IndexedWakuMessage in msgList whose index value matches the given index
// returns -1 if no match is found
for i, indexedWakuMessage := range *msgList {
for i, indexedWakuMessage := range msgList {
if bytes.Compare(indexedWakuMessage.index.Digest, index.Digest) == 0 && indexedWakuMessage.index.ReceivedTime == index.ReceivedTime {
return i
}