Skip to content

Commit 354a58d

Browse files
jberezanskidscho
authored andcommitted
wincred: handle empty username/password correctly
Empty (length 0) usernames and/or passwords, when saved in the Windows Credential Manager, come back as null when reading the credential. One use case for such empty credentials is with NTLM authentication, where empty username and password instruct libcurl to authenticate using the credentials of the currently logged-on user (single sign-on). When locating the relevant credentials, make empty username match null. When outputting the credentials, handle nulls correctly. Signed-off-by: Jakub Bereżański <[email protected]>
1 parent 9856d4d commit 354a58d

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

contrib/credential/wincred/git-credential-wincred.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@ static WCHAR *wusername, *password, *protocol, *host, *path, target[1024];
9494
static void write_item(const char *what, LPCWSTR wbuf, int wlen)
9595
{
9696
char *buf;
97+
98+
if (!wbuf || !wlen) {
99+
printf("%s=\n", what);
100+
return;
101+
}
102+
97103
int len = WideCharToMultiByte(CP_UTF8, 0, wbuf, wlen, NULL, 0, NULL,
98104
FALSE);
99105
buf = xmalloc(len);
@@ -160,7 +166,7 @@ static int match_part_last(LPCWSTR *ptarget, LPCWSTR want, LPCWSTR delim)
160166
static int match_cred(const CREDENTIALW *cred)
161167
{
162168
LPCWSTR target = cred->TargetName;
163-
if (wusername && wcscmp(wusername, cred->UserName))
169+
if (wusername && wcscmp(wusername, cred->UserName ? cred->UserName : L""))
164170
return 0;
165171

166172
return match_part(&target, L"git", L":") &&
@@ -183,7 +189,7 @@ static void get_credential(void)
183189
for (i = 0; i < num_creds; ++i)
184190
if (match_cred(creds[i])) {
185191
write_item("username", creds[i]->UserName,
186-
wcslen(creds[i]->UserName));
192+
creds[i]->UserName ? wcslen(creds[i]->UserName) : 0);
187193
write_item("password",
188194
(LPCWSTR)creds[i]->CredentialBlob,
189195
creds[i]->CredentialBlobSize / sizeof(WCHAR));

0 commit comments

Comments
 (0)