Skip to content
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

Jump to bottom

fix(runtime): add child prefix check #4143

Merged
merged 3 commits into from
Sep 3, 2024
Merged

fix(runtime): add child prefix check #4143

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a36e4ec
add child prefix check
jimjbrettj Aug 23, 2024
126621c
move logic into imports for better logging
jimjbrettj Aug 23, 2024
d4e7107
respond to feedback
jimjbrettj Aug 26, 2024
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
25 changes: 21 additions & 4 deletions lib/runtime/wazero/imports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ var (
emptyByteVectorEncoded []byte = scale.MustMarshal([]byte{})
noneEncoded []byte = []byte{0x00}
allZeroesBytes = [32]byte{}

childStorageKeyPrefix = []byte(":child_storage:")
)

const (
Expand Down Expand Up @@ -2065,10 +2067,15 @@ func ext_storage_clear_prefix_version_1(ctx context.Context, m api.Module, prefi
prefix := read(m, prefixSpan)
logger.Debugf("prefix: 0x%x", prefix)

err := storage.ClearPrefix(prefix)
if err != nil {
panic(err)
if !bytes.HasPrefix(prefix, childStorageKeyPrefix) {
err := storage.ClearPrefix(prefix)
if err != nil {
panic(err)
}
} else {
logger.Warnf("cannot clear prefix that is part of or contains a child storage key")
EclesioMeloJunior marked this conversation as resolved.
Show resolved Hide resolved
}

}

// toKillStorageResultEnum encodes the `allRemoved` flag and
Expand Down Expand Up @@ -2117,6 +2124,17 @@ func ext_storage_clear_prefix_version_2(ctx context.Context, m api.Module, prefi
limitPtr = &maxLimit
}

if bytes.HasPrefix(prefix, childStorageKeyPrefix) {
logger.Warnf("cannot clear child prefix: 0x%x", prefix)
encBytes, err := toKillStorageResultEnum(false, 0)
if err != nil {
panic(err)
}

valueSpan := mustWrite(m, rtCtx.Allocator, encBytes)
return valueSpan
}

numRemoved, all, err := storage.ClearPrefixLimit(prefix, *limitPtr)
if err != nil {
logger.Errorf("failed to clear prefix limit: %s", err)
Expand All @@ -2134,7 +2152,6 @@ func ext_storage_clear_prefix_version_2(ctx context.Context, m api.Module, prefi
logger.Errorf("failed to allocate: %s", err)
panic(err)
}

return valueSpan
}

Expand Down
Loading