randomize the serialization order of control frames #4069
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
marten-seemann
commented
Sep 6, 2023
| // Randomize the order of the control frames. | ||
| // This makes sure that the receiver doesn't rely on the order in which frames are packed. | ||
| if len(pl.frames) > 1 { | ||
| p.rand.Shuffle(len(pl.frames), func(i, j int) { pl.frames[i], pl.frames[j] = pl.frames[j], pl.frames[i] }) |
There was a problem hiding this comment.
Using exp/rand here, since the Shuffle function doesn't allocate.
marten-seemann
commented
Sep 6, 2023
| @@ -151,6 +159,7 @@ func newPacketPacker( | |||
| perspective: perspective, | |||
| framer: framer, | |||
| acks: acks, | |||
| rand: *rand.New(rand.NewSource(binary.BigEndian.Uint64(b[:]))), | |||
There was a problem hiding this comment.
Using exp/rand here, since the rand.Source is small (16 bytes).
Codecov Report
@@ Coverage Diff @@
## master #4069 +/- ##
==========================================
- Coverage 83.48% 83.47% -0.01%
==========================================
Files 147 147
Lines 14906 14934 +28
==========================================
+ Hits 12443 12465 +22
- Misses 1967 1971 +4
- Partials 496 498 +2
|
sukunrt
approved these changes
Sep 6, 2023
I agree that it won't be a problem, but to be explicit about it, I added a comment to that function. |
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.
We recently discovered a bug where the receiver relied on frames being sent in a particular order. This PR randomizes the order of what we call control frames (all frames other than ACK or STREAM frames) when packing the packet.
I'd like to randomize the order of the ACK as well (currently it's always serialized first). We could do this, but we wouldn't have a way to (q)log this without changing the tracer call, so this would be a bigger change:
quic-go/logging/interface.go
Line 117 in 591d864