[CRE-40] Check binary size before decompression #994
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
agparadiso
temporarily deployed
to
integration
GitHub Actions
Inactive
agparadiso
temporarily deployed
to
integration
GitHub Actions
Inactive
agparadiso
temporarily deployed
to
integration
GitHub Actions
Inactive
agparadiso
changed the title
pkg/workflows/wasm/host/module.go
Outdated
| @@ -91,6 +92,7 @@ type ModuleConfig struct { | |||
| IsUncompressed bool | |||
| Fetch func(ctx context.Context, req *wasmpb.FetchRequest) (*wasmpb.FetchResponse, error) | |||
| MaxFetchRequests int | |||
| MaxBinarySize int64 | |||
There was a problem hiding this comment.
@agparadiso Could we call this MaxUncompressedBinarySize -- since you're only applying it to the uncompressed size
There was a problem hiding this comment.
this is used to check the size before decompressing it. Should it be MaxCompressedBinarySize? 🤔
There was a problem hiding this comment.
Hah yes it should be :)
MStreet3
reviewed
Jan 13, 2025
pkg/workflows/wasm/host/module.go
Outdated
| @@ -183,6 +189,12 @@ func NewModule(modCfg *ModuleConfig, binary []byte, opts ...func(*ModuleConfig)) | |||
|
|
|||
| engine := wasmtime.NewEngineWithConfig(cfg) | |||
| if !modCfg.IsUncompressed { | |||
| // validate the binary size before decompressing | |||
| // this is to prevent decompression bombs | |||
| if int64(len(binary)) > modCfg.MaxBinarySize { | |||
There was a problem hiding this comment.
should this type be uint64
MStreet3
reviewed
Jan 13, 2025
pkg/workflows/wasm/host/module.go
Outdated
| @@ -91,6 +92,7 @@ type ModuleConfig struct { | |||
| IsUncompressed bool | |||
| Fetch func(ctx context.Context, req *wasmpb.FetchRequest) (*wasmpb.FetchResponse, error) | |||
| MaxFetchRequests int | |||
| MaxBinarySize int64 | |||
MStreet3
reviewed
Jan 13, 2025
pkg/workflows/wasm/host/wasm_test.go
Outdated
|
|
||
| t.Run("compressed binary size is bigger than the default 10mb limit", func(t *testing.T) { | ||
| // 11mb binary | ||
| binary := make([]byte, 11*1024*1024) |
There was a problem hiding this comment.
Suggested change
| binary := make([]byte, 11*1024*1024) | |
| binary := make([]byte, defaultBinarySize + 1) |
nit
maybe simpler to keep the test in sync if this default ever changes
agparadiso
temporarily deployed
to
integration
GitHub Actions
Inactive
agparadiso
temporarily deployed
to
integration
GitHub Actions
Inactive
agparadiso
temporarily deployed
to
integration
GitHub Actions
Inactive
MStreet3
reviewed
Jan 13, 2025
pkg/workflows/wasm/host/wasm_test.go
Outdated
| require.NoError(t, bwr.Close()) | ||
|
|
||
| _, err = NewModule(&ModuleConfig{IsUncompressed: false, Logger: logger.Test(t)}, binary) | ||
| default10mbLimit := fmt.Sprintf("binary size exceeds the maximum allowed size of %d bytes", 10*1024*1024) |
There was a problem hiding this comment.
Suggested change
| default10mbLimit := fmt.Sprintf("binary size exceeds the maximum allowed size of %d bytes", 10*1024*1024) | |
| default10mbLimit := fmt.Sprintf("binary size exceeds the maximum allowed size of %d bytes", defaultMaxCompressedBinarySize) |
There was a problem hiding this comment.
ahh true, sorry forgot about that one. should be good now thanks
cedric-cordenier
previously approved these changes
Jan 13, 2025
agparadiso
force-pushed
the
fix/CRE-40_decompression_bombs
branch
from
c6327cd to
82d5beb
Compare
agparadiso
temporarily deployed
to
integration
GitHub Actions
Inactive
agparadiso
temporarily deployed
to
integration
GitHub Actions
Inactive
agparadiso
temporarily deployed
to
integration
GitHub Actions
Inactive
agparadiso
temporarily deployed
to
integration
GitHub Actions
Inactive
agparadiso
temporarily deployed
to
integration
GitHub Actions
Inactive
agparadiso
temporarily deployed
to
integration
GitHub Actions
Inactive
cedric-cordenier
approved these changes
Jan 14, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This pr addresses decompression bombs by having a customisable
MaxBinarySizethat we will check before trying to decompress it. By default a 10mb default value is provided.CRE-40
Requires
Supports