Add credential handling

Author: omus

src/GitTools.jl

@@ -46,20 +46,23 @@ function transfer_progress(progress::Ptr{LibGit2.GitTransferProgress}, p::Any)
     return Cint(0)
 end
 
-function clone(url, source_path; isbare::Bool=false, header = nothing, branch = nothing)
+function clone(url, source_path; isbare::Bool=false, header = nothing, branch = nothing, credentials = nothing)
     isdir(source_path) && error("$source_path already exists")
     printstyled(stdout, "Cloning "; color = :green, bold=true)
     if header == nothing
         println(stdout, "from git repo: ", url, ".")
     else
         println(stdout, header)
     end
-    p = MiniProgressBar(header = "Fetching:", color = Base.info_color())
+    transfer_payload = MiniProgressBar(header = "Fetching:", color = Base.info_color())
+    cred_payload = LibGit2.CredentialPayload(credentials)
     print(stdout, "\e[?25l")
     try
         GC.@preserve p branch begin
-            callbacks = LibGit2.RemoteCallbacks(transfer_progress=cfunction(transfer_progress, Cint, Tuple{Ptr{LibGit2.GitTransferProgress}, Any}),
-                payload = pointer_from_objref(p))
+            callbacks = LibGit2.RemoteCallbacks(
+                credentials=(LibGit2.credential_cb(), pointer_from_objref(cred_payload)),
+                transfer_progress=(cfunction(transfer_progress, Cint, Tuple{Ptr{LibGit2.GitTransferProgress}, Any}), pointer_from_objref(transfer_payload)),
+            )
             fetch_opts = LibGit2.FetchOptions(callbacks = callbacks)
             if branch == nothing
                 clone_opts = LibGit2.CloneOptions(fetch_opts=fetch_opts, bare=isbare)
@@ -69,12 +72,17 @@ function clone(url, source_path; isbare::Bool=false, header = nothing, branch =
             return LibGit2.clone(url, source_path, clone_opts)
         end
     catch e
+        if isa(e, LibGit2.GitError) && e.code == LibGit2.Error.EAUTH
+            LibGit2.reject(cred_payload)
+        end
+
         rm(source_path; force=true, recursive=true)
         rethrow(e)
     finally
         print(stdout, "\e[?25h")
         println(stdout)
     end
+    LibGit2.approve(cred_payload)
 end
 
-end # module
+end # module

src/Operations.jl

@@ -375,11 +375,12 @@ function install_git(
     version::Union{VersionNumber,Nothing},
     version_path::String
 )::Nothing
+    creds = LibGit2.CachedCredentials()
     clones_dir = joinpath(depots()[1], "clones")
     ispath(clones_dir) || mkpath(clones_dir)
     repo_path = joinpath(clones_dir, string(uuid))
     repo = ispath(repo_path) ? LibGit2.GitRepo(repo_path) : begin
-        GitTools.clone(urls[1], repo_path; isbare=true, header = "[$uuid] $name from $(urls[1])")
+        GitTools.clone(urls[1], repo_path; isbare=true, header = "[$uuid] $name from $(urls[1])", credentials=creds)
     end
     git_hash = LibGit2.GitHash(hash.bytes)
     for i = 2:length(urls)
@@ -390,7 +391,7 @@ function install_git(
             err isa LibGit2.GitError && err.code == LibGit2.Error.ENOTFOUND || rethrow(err)
         end
         url = urls[i]
-        LibGit2.fetch(repo, remoteurl=url, refspecs=refspecs)
+        LibGit2.fetch(repo, remoteurl=url, refspecs=refspecs, credentials=creds)
     end
     tree = try
         with(LibGit2.GitObject, repo, git_hash) do g

src/Types.jl

@@ -601,6 +601,7 @@ function isdir_windows_workaround(path::String)
 end
 
 function handle_repos_develop!(ctx::Context, pkgs::AbstractVector{PackageSpec})
+    creds = LibGit2.CachedCredentials()
     env = ctx.env
     for pkg in pkgs
         pkg.repo == nothing && continue
@@ -623,12 +624,12 @@ function handle_repos_develop!(ctx::Context, pkgs::AbstractVector{PackageSpec})
             repo, just_cloned = ispath(repo_path) ? (LibGit2.GitRepo(repo_path), false) : begin
                 printpkgstyle(ctx, :Cloning, "package from $(pkg.repo.url)")
                 r = LibGit2.clone(pkg.repo.url, repo_path)
-                LibGit2.fetch(r, remoteurl=pkg.repo.url, refspecs=refspecs)
+                GitTools.fetch(r, remoteurl=pkg.repo.url, refspecs=refspecs, credentials=creds)
                 r, true
             end
             if !just_cloned
                 printpkgstyle(ctx, :Updating, "repo from $(pkg.repo.url)")
-                LibGit2.fetch(repo, remoteurl=pkg.repo.url, refspecs=refspecs)
+                GitTools.fetch(repo, remoteurl=pkg.repo.url, refspecs=refspecs, credentials=creds)
             end
             close(repo)
 
@@ -660,6 +661,7 @@ function handle_repos_develop!(ctx::Context, pkgs::AbstractVector{PackageSpec})
 end
 
 function handle_repos_add!(ctx::Context, pkgs::AbstractVector{PackageSpec}; upgrade_or_add::Bool=true)
+    creds = LibGit2.CachedCredentials()
     env = ctx.env
     for pkg in pkgs
         pkg.repo == nothing && continue
@@ -669,15 +671,15 @@ function handle_repos_add!(ctx::Context, pkgs::AbstractVector{PackageSpec}; upgr
         mkpath(clones_dir)
         repo_path = joinpath(clones_dir, string(hash(pkg.repo.url)))
         repo, just_cloned = ispath(repo_path) ? (LibGit2.GitRepo(repo_path), false) : begin
-            r = GitTools.clone(pkg.repo.url, repo_path, isbare=true)
-            LibGit2.fetch(r, remoteurl=pkg.repo.url, refspecs=refspecs)
+            r = GitTools.clone(pkg.repo.url, repo_path, isbare=true, credentials=creds)
+            GitTools.fetch(r, remoteurl=pkg.repo.url, refspecs=refspecs, credentials=creds)
             r, true
         end
         info = manifest_info(env, pkg.uuid)
         pinned = (info != nothing && get(info, "pinned", false))
         if upgrade_or_add  && !pinned && !just_cloned
             printpkgstyle(ctx, :Updating, "repo from $(pkg.repo.url)")
-            LibGit2.fetch(repo, remoteurl=pkg.repo.url, refspecs=refspecs)
+            GitTools.fetch(repo, remoteurl=pkg.repo.url, refspecs=refspecs, credentials=creds)
         end
         if upgrade_or_add && !pinned
             rev = pkg.repo.rev
@@ -928,10 +930,11 @@ function registries()::Vector{String}
     user_regs = abspath(depots()[1], "registries")
     if !ispath(user_regs)
         mkpath(user_regs)
+        creds = LibGit2.CachedCredentials()
         printpkgstyle(stdout, :Cloning, "default registries into $user_regs")
         for (reg, url) in DEFAULT_REGISTRIES
             path = joinpath(user_regs, reg)
-            GitTools.clone(url, path; header = "registry $reg from $(repr(url))")
+            GitTools.clone(url, path; header = "registry $reg from $(repr(url))", credentials = creds)
         end
     end
     return [r for d in depots() for r in registries(d)]