-
Notifications
You must be signed in to change notification settings - Fork 451
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: #1802 confirm cached credential before rejecting #1803
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
|
@@ -91,9 +91,27 @@ public void RejectCredentials(ITracer tracer, string credentialString) | |||||||
{ | ||||||||
lock (this.gitAuthLock) | ||||||||
{ | ||||||||
var cachedCredentialAtStartOfReject = this.cachedCredentialString; | ||||||||
// Don't stomp a different credential | ||||||||
if (credentialString == this.cachedCredentialString && this.cachedCredentialString != null) | ||||||||
if (credentialString == cachedCredentialAtStartOfReject && cachedCredentialAtStartOfReject != null) | ||||||||
{ | ||||||||
// We can't assume that the credential store's cached credential is the same as the one we have. | ||||||||
// Reload the credential from the store to ensure we're rejecting the correct one. | ||||||||
var attemptsBeforeCheckingExistingCredential = this.numberOfAttempts; | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The norm in this repo is to not use
Suggested change
|
||||||||
if (this.TryCallGitCredential(tracer, out string getCredentialError)) | ||||||||
{ | ||||||||
if (this.cachedCredentialString != cachedCredentialAtStartOfReject) | ||||||||
{ | ||||||||
// If the store already had a different credential, we don't want to reject it without trying it. | ||||||||
this.isCachedCredentialStringApproved = false; | ||||||||
return; | ||||||||
} | ||||||||
} | ||||||||
else | ||||||||
{ | ||||||||
tracer.RelatedWarning(getCredentialError); | ||||||||
} | ||||||||
|
||||||||
// If we can we should pass the actual username/password values we used (and found to be invalid) | ||||||||
// to `git-credential reject` so the credential helpers can attempt to check if they're erasing | ||||||||
// the expected credentials, if they so choose to. | ||||||||
|
@@ -121,7 +139,12 @@ public void RejectCredentials(ITracer tracer, string credentialString) | |||||||
|
||||||||
this.cachedCredentialString = null; | ||||||||
this.isCachedCredentialStringApproved = false; | ||||||||
this.UpdateBackoff(); | ||||||||
|
||||||||
// Backoff may have already been incremented by a failure in TryCallGitCredential | ||||||||
if (attemptsBeforeCheckingExistingCredential == this.numberOfAttempts) | ||||||||
{ | ||||||||
this.UpdateBackoff(); | ||||||||
} | ||||||||
} | ||||||||
} | ||||||||
} | ||||||||
|
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The norm in this repo is to not use
var
unless the right-hand-side is a constructor explicitly mentioning the type that the variable will become.