Fix logging of key changes to be consistent #68113
Open
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
Fixes logging of master aes and session keys changes to be correct and consistent. Also simplifies the code and reduces duplication.
|
@dwoz - if you aren't up for merging this before 3006.13, no worries - I can always bring it back at a later stage |
twangboy
requested changes
Jun 26, 2025
We staged |
twangboy
added
the
needs-testcase
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.
What does this PR do?
Fixes logging of master aes and session keys changes to be correct and consistent. This was useful when testing issues in #68085 to understand what is actually happening.
Also removes some duplication of code.
What issues does this PR fix or reference?
Debug logging for master AES and session keys was incomplete and inconsistent across AsyncAuth._authenticate() and SAuth.authenticate()
Previous Behavior
AsyncAuth._authenticate() logged both master AES and session key changes as "The master's aes key has changed".
SAuth.authenticate() didn't log anything.
New Behavior
Both functions consistently log:
The wording isn't ideal, but assuming that people may be used to those messages I didn't want to change too much.
Commits signed with SSH key?
Yes