caddytls: ECH key rotation #7356
Merged
+233
−72
Conversation
This file contains hidden or 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
Member
Author
|
Let's try something stupid: @copilot Are there any (other) resource leaks or any security vulnerabilities in this code? |
Member
Author
|
I think I've got all the missing pieces, no thanks to Copilot. 🥲 Ready to merge, probably. |
francislavoie
approved these changes
Dec 10, 2025
Member
francislavoie
left a comment
francislavoie
left a comment
There was a problem hiding this comment.
I honestly don't understand ECH flows well enough to give a confident review. But I assume you've tested it, so we might as well merge.
Member
Author
|
Thanks; makes sense. Yeah, I tested it by reducing the rotation interval, etc, to a matter of seconds, instead of hours, and it seemed to be working! |
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.
This change implements ECH key rotation, made possible in Go 1.25 thanks to the GetEncryptedClientHelloKeys callback in tls.Config.
Currently, keys are rotated every 30 days, and are supported for 90 days (so, 60 days after rotation), to give clients time to update without needing to retry.
It's not clear what are actually good intervals for these things, as this is new technology and there isn't much diversity of deployments. But generally, smaller anonymity sets (fewer sites) should rotate a less frequently than big anonymity sets, and I suspect most Caddy instances are smaller.
We can always change the rotation intervals based on feedback/experience.