godotengine/godot-git-plugin
1
0
Fork 0
mirror of https://github.com/godotengine/godot-git-plugin.git synced 2026-01-04 22:09:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Respect username extracted from URL in credential callback

Browse Source
This commit is contained in:
Twarit Waikar
2021-10-14 04:22:37 +05:30
parent 0b09051fc3
commit 78caec5a51
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
godot-git-plugin/src/git_common.cpp
View File

@@ -77,20 +77,22 @@ extern "C" int push_update_reference_cb(const char *refname, const char *status,
extern "C" int credentials_cb(git_cred **out, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload) {
Credentials *creds = (Credentials *)payload;
godot::String proper_username = username_from_url ? username_from_url : creds->username;
if (allowed_types & GIT_CREDENTIAL_USERPASS_PLAINTEXT) {
return git_cred_userpass_plaintext_new(out, godot::CString(creds->username).data, godot::CString(creds->password).data);
return git_cred_userpass_plaintext_new(out, godot::CString(proper_username).data, godot::CString(creds->password).data);
}
if (allowed_types & GIT_CREDENTIAL_SSH_KEY) {
return git_credential_ssh_key_new(out,
godot::CString(creds->username).data,
godot::CString(proper_username).data,
godot::CString(creds->ssh_public_key_path).data,
godot::CString(creds->ssh_private_key_path).data,
godot::CString(creds->ssh_passphrase).data);
}
if (allowed_types & GIT_CREDENTIAL_USERNAME) {
return git_credential_username_new(out, godot::CString(creds->username).data);
return git_credential_username_new(out, godot::CString(proper_username).data);
}
return GIT_EUSER;