Skip to content

Support git credential helper resetting #35064

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 16, 2020
Merged

Support git credential helper resetting #35064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions stdlib/LibGit2/src/gitcredential.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,21 +222,11 @@ function credential_helpers(cfg::GitConfig, cred::GitCredential)
ismatch(url, cred) || continue

# An empty credential.helper resets the list to empty
isempty(value) && empty!(helpers)

# Due to a bug in libgit2 iteration we may read credential helpers out of order.
# See: https://github.com/libgit2/libgit2/issues/4361
#
# Typically the ordering doesn't matter but does in this particular case. Disabling
# credential helpers avoids potential issues with using the wrong credentials or
# writing credentials to the wrong helper.
if isempty(value)
@warn """Resetting the helper list is currently unsupported:
ignoring all git credential helpers""" maxlog=1
return GitCredentialHelper[]
empty!(helpers)
else
Base.push!(helpers, parse(GitCredentialHelper, value))
end

Base.push!(helpers, parse(GitCredentialHelper, value))
end

return helpers
Expand Down
4 changes: 1 addition & 3 deletions stdlib/LibGit2/test/libgit2.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1980,9 +1980,7 @@ mktempdir() do dir
mygit_cred = GitCredential("https", "mygithost")

@test LibGit2.credential_helpers(cfg, github_cred) == expected

println(stderr, "The following 'Resetting the helper list...' warning is expected:")
@test_broken LibGit2.credential_helpers(cfg, mygit_cred) == expected[2]
@test LibGit2.credential_helpers(cfg, mygit_cred) == expected[2:2]

Base.shred!(github_cred)
Base.shred!(mygit_cred)
Expand Down