Merge pull request #20751 from JuliaLang/cv/libgit2-cred-misc

LibGit2 miscellaneous fixes to credential callback

Author: tkelman

base/libgit2/callbacks.jl

@@ -37,7 +37,7 @@ function authenticate_ssh(creds::SSHCredentials, libgit2credptr::Ptr{Ptr{Void}},
     end
 
     # first try ssh-agent if credentials support its usage
-    if creds.usesshagent === nothing || creds.usesshagent == "Y" || creds.usesshagent == "U"
+    if creds.usesshagent == "Y" || creds.usesshagent == "U"
         err = ccall((:git_cred_ssh_key_from_agent, :libgit2), Cint,
                      (Ptr{Ptr{Void}}, Cstring), libgit2credptr, username_ptr)
         creds.usesshagent = "U" # used ssh-agent only one time
@@ -59,7 +59,6 @@ function authenticate_ssh(creds::SSHCredentials, libgit2credptr::Ptr{Ptr{Void}},
             ENV["SSH_KEY_PATH"]
         else
             keydefpath = creds.prvkey # check if credentials were already used
-            keydefpath === nothing && (keydefpath = "")
             if isempty(keydefpath) || isusedcreds
                 defaultkeydefpath = joinpath(homedir(),".ssh","id_rsa")
                 if isempty(keydefpath) && isfile(defaultkeydefpath)
@@ -81,7 +80,6 @@ function authenticate_ssh(creds::SSHCredentials, libgit2credptr::Ptr{Ptr{Void}},
             ENV["SSH_PUB_KEY_PATH"]
         else
             keydefpath = creds.pubkey # check if credentials were already used
-            keydefpath === nothing && (keydefpath = "")
             if isempty(keydefpath) || isusedcreds
                 if isempty(keydefpath)
                     keydefpath = privatekey*".pub"
@@ -108,7 +106,6 @@ function authenticate_ssh(creds::SSHCredentials, libgit2credptr::Ptr{Ptr{Void}},
             ENV["SSH_KEY_PASS"]
         else
             passdef = creds.pass # check if credentials were already used
-            passdef === nothing && (passdef = "")
             if passphrase_required && (isempty(passdef) || isusedcreds)
                 if is_windows()
                     passdef = Base.winprompt(
@@ -133,10 +130,9 @@ function authenticate_ssh(creds::SSHCredentials, libgit2credptr::Ptr{Ptr{Void}},
         isusedcreds && return Cint(Error.EAUTH)
     end
 
-    err = ccall((:git_cred_ssh_key_new, :libgit2), Cint,
+    return ccall((:git_cred_ssh_key_new, :libgit2), Cint,
                  (Ptr{Ptr{Void}}, Cstring, Cstring, Cstring, Cstring),
                  libgit2credptr, creds.user, creds.pubkey, creds.prvkey, creds.pass)
-    return err
 end
 
 function authenticate_userpass(creds::UserPasswordCredentials, libgit2credptr::Ptr{Ptr{Void}},
@@ -146,19 +142,16 @@ function authenticate_userpass(creds::UserPasswordCredentials, libgit2credptr::P
     if creds.prompt_if_incorrect
         username = creds.user
         userpass = creds.pass
-        (username === nothing) && (username = "")
-        (userpass === nothing) && (userpass = "")
         if is_windows()
             if isempty(username) || isempty(userpass) || isusedcreds
                 res = Base.winprompt("Please enter your credentials for '$schema$host'", "Credentials required",
-                        username === nothing || isempty(username) ?
-                        urlusername : username; prompt_username = true)
+                        isempty(username) ? urlusername : username; prompt_username = true)
                 isnull(res) && return Cint(Error.EAUTH)
                 username, userpass = Base.get(res)
             end
         elseif isusedcreds
-            username = prompt("Username for '$schema$host'", default = isempty(username) ?
-                urlusername : username)
+            username = prompt("Username for '$schema$host'",
+                default=isempty(username) ? urlusername : username)
             userpass = prompt("Password for '$schema$username@$host'", password=true)
         end
         ((creds.user != username) || (creds.pass != userpass)) && reset!(creds)
@@ -170,10 +163,9 @@ function authenticate_userpass(creds::UserPasswordCredentials, libgit2credptr::P
         isusedcreds && return Cint(Error.EAUTH)
     end
 
-    err = ccall((:git_cred_userpass_plaintext_new, :libgit2), Cint,
+    return ccall((:git_cred_userpass_plaintext_new, :libgit2), Cint,
                  (Ptr{Ptr{Void}}, Cstring, Cstring),
                  libgit2credptr, creds.user, creds.pass)
-    err == 0 && return Cint(0)
 end
 
 
@@ -206,7 +198,7 @@ counting strategy that prevents repeated usage of faulty credentials.
 function credentials_callback(libgit2credptr::Ptr{Ptr{Void}}, url_ptr::Cstring,
                               username_ptr::Cstring,
                               allowed_types::Cuint, payload_ptr::Ptr{Void})
-    err = 0
+    err = Cint(0)
     url = unsafe_string(url_ptr)
 
     # parse url for schema and host
@@ -252,7 +244,7 @@ function credentials_callback(libgit2credptr::Ptr{Ptr{Void}}, url_ptr::Cstring,
         end
         err = Cint(Error.EAUTH)
     end
-    return Cint(err)
+    return err
 end
 
 function fetchhead_foreach_callback(ref_name::Cstring, remote_url::Cstring,