Passing GOSSIP_MAX_SIZE to snappy uncompressor #8899
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
lucassaldanha
force-pushed
the
gossip-check-uncompressed-size
branch
from
0ae1ed9 to
373b638
Compare
tbenr
approved these changes
Dec 10, 2024
...2p/src/test/java/tech/pegasys/teku/networking/p2p/libp2p/config/LibP2PParamsFactoryTest.java
Outdated
Show resolved
Hide resolved
tbenr
reviewed
Dec 10, 2024
...2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/encoding/SnappyBlockCompressor.java
Outdated
Show resolved
Hide resolved
jtraglia
reviewed
Dec 11, 2024
| .isInstanceOf(DecodingException.class); | ||
| } | ||
|
|
||
| @Test | ||
| void uncompress_uncompressedLengthLongerThanMaxLength() { | ||
| void uncompress_uncompressedLengthLongerThanSszLenghtBounds() { |
There was a problem hiding this comment.
- uncompress_uncompressedLengthLongerThanSszLenghtBounds()
+ uncompress_uncompressedLengthLongerThanSszLenghthBounds()| } | ||
|
|
||
| @Test | ||
| void uncompress_uncompressedLengthEqualThanMaxBytesLength() throws DecodingException { |
There was a problem hiding this comment.
- uncompress_uncompressedLengthEqualThanMaxBytesLength()
+ uncompress_uncompressedLengthEqualToMaxBytesLength()
Comment on lines
+77
to
+79
| final Bytes original = Bytes.fromHexString("0x010203040506"); | ||
| final long smallMaxBytesLength = 3; | ||
| assertThat(smallMaxBytesLength).isLessThan(original.size()); |
There was a problem hiding this comment.
To be a little more precise, I would probably do something like:
assertThat(original.size()).isNotEqualTo(0);
final long smallMaxBytesLength = original.size() - 1;
jtraglia
reviewed
Dec 12, 2024
| @@ -24,16 +24,24 @@ | |||
| */ | |||
| public class SnappyBlockCompressor { | |||
|
|
|||
| public Bytes uncompress(final Bytes compressedData, final SszLengthBounds lengthBounds) | |||
| public Bytes uncompress( | |||
There was a problem hiding this comment.
We should also add a check to compress to ensure that the uncompressed size is <= maxBytesLength.
Likewise, clients MUST NOT emit or propagate messages larger than this limit.
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.
PR Description
In this PR we are passing the network config GOSSIP_MAX_SIZE to
SnappyBlockCompressor#uncompressto check the size of an uncompressed message (as per spec). This way we can check the size of the uncompressed message without actually decompressing it.TODO
MAX_COMPRESSED_GOSSIP_SIZE(LibP2PParamsFactory)GossipHandlerhas a check for the compressed message size. Decide if we want to keep it.Fixed Issue(s)
related to #8895
Documentation
doc-change-requiredlabel to this PR if updates are required.Changelog