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.

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

fix handling of ACK frames serialized after CRYPTO frames #4018

Merged
merged 1 commit into from Aug 5, 2023

Conversation

marten-seemann
Copy link
Member

No description provided.

Copy link
Contributor

@mholt mholt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't feel like I understand the protocol thoroughly enough to actually review this, but the basic logic LGTM. Nice and simple fix.

@marten-seemann
Copy link
Member Author

Thanks for the review @mholt! I really hope this is the last critical bug in the v0.37 release line. Turns out that switching out the underlying TLS stack (that's in fact what we did, given that the crypto/tls API is completely different (better!) from what we had in qtls) is a minefield.

@codecov
Copy link

codecov bot commented Aug 5, 2023

Codecov Report

Merging #4018 (c239066) into master (26c6fcc) will increase coverage by 0.34%.
Report is 1 commits behind head on master.
The diff coverage is 73.33%.

@@            Coverage Diff             @@
##           master    #4018      +/-   ##
==========================================
+ Coverage   82.76%   83.10%   +0.34%     
==========================================
  Files         147      147              
  Lines       14764    14872     +108     
==========================================
+ Hits        12219    12359     +140     
+ Misses       2042     2012      -30     
+ Partials      503      501       -2     
Files Changed Coverage Δ
connection.go 72.59% <73.33%> (-0.09%) ⬇️

... and 3 files with indirect coverage changes

@marten-seemann marten-seemann merged commit 6b053f7 into master Aug 5, 2023
29 checks passed
@@ -1724,6 +1743,7 @@ func (s *connection) checkTransportParameters(params *wire.TransportParameters)

func (s *connection) applyTransportParameters() {
params := s.peerParams
fmt.Println("apply transport parameters", s.config.MaxIdleTimeout, params.MaxIdleTimeout)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leftover debug statement. Merged via this PR, then fix using force-push on master. Sorry for that.

@mholt
Copy link
Contributor

mholt commented Aug 6, 2023

Thank you @marten-seemann -- absolutely understandable and no worries :) We have released Caddy 2.7.3 with the patches.

@marten-seemann marten-seemann deleted the ack-after-handshake-complete branch September 1, 2023 10:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants