proto: Token encode refactors #2110
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
13 tasks
gretchenfrage
force-pushed
the
token-encode-refactors
branch
from
649e8af to
18b5a93
Compare
For symmetry with encode.
This will be useful for NEW_TOKEN usage, as validation tokens will only include IP address and not port.
Prior to this commit, decoding a socket addr from a RetryToken called get_u8 and get_u16, which would have panicked if an encrypted token were minted that terminated after that point. This replaces them with calls that short-circuit, for consistency with other parts of the code there.
This will be useful for NEW_TOKEN usage, as it will make there be more than one call site for this.
gretchenfrage
force-pushed
the
token-encode-refactors
branch
2 times, most recently
from
ee17203 to
ec65aa5
Compare
Ralith
approved these changes
Dec 24, 2024
There was a problem hiding this comment.
The weird address handling was leftover from of an old design where the address was AAD rather than explicitly stored. We migrated away from that because that made it impossible to distinguish invalid tokens from valid tokens with invalid addresses. Glad to see it tidied up.
Organizes encoding payload section versus encrypting section.
Prior to this commit, a RetryToken encodes the client's address as if it were a field, but rather than it actually being a field, it's threaded in to encode, and validated in-place in decode. It's unclear to me why this is. This commit makes the remote address simply a field of the RetryToken struct.
As of the previous commit, RetryToken::decode fails only with the Unusable variant, and validation only occurs in IncomingToken::from_header, which uses InvalidRetryTokenError directly. This allows us to remove ValidationError altogether.
This probably won't affect much, but is slightly more defensive.
gretchenfrage
force-pushed
the
token-encode-refactors
branch
from
ec65aa5 to
560723d
Compare
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.
Please see individual commit messages.
If "Make address a field of RetryToken" is too controversial, I can split it off into a subsequent PR to help the ones before it get through.