undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wincred: improve compatibility with windows versions

Browse Source 
On WinXP, the windows credential helper doesn't work at all (due to missing
Cred[Un]PackAuthenticationBuffer APIs). On Win7, the credential format used
by wincred is incompatible with native Windows tools (such as the control
panel applet or 'cmdkey.exe /generic'). These Windows tools only set the
TargetName, UserName and CredentialBlob members of the CREDENTIAL
structure (where CredentialBlob is the UTF-16-encoded password).

Remove the unnecessary packing / unpacking of the password, along with the
related API definitions, for compatibility with Windows XP.

Don't use CREDENTIAL_ATTRIBUTEs to identify credentials for compatibility
with Windows credential manager tools. Parse the protocol, username, host
and path fields from the credential's target name instead.

Credentials created with an old wincred version will have mangled or empty
passwords after this change.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
This commit is contained in:
Karsten Blees 2013-01-10 11:52:12 +01:00 committed by Erik Faye-Lund
parent 3b12f46ab3
commit 8b2d219a3d
1 changed files with 68 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
contrib/credential/wincred/git-credential-wincred.c
View File

@ -9,6 +9,8 @@
/* common helpers */ /* common helpers */
#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
static void die(const char *err, ...) static void die(const char *err, ...)
{ {
char msg[4096]; char msg[4096];
@ -30,14 +32,6 @@ static void *xmalloc(size_t size)
return ret; return ret;
} }
static char *xstrdup(const char *str)
{
char *ret = strdup(str);
if (!ret)
die("Out of memory");
return ret;
}
/* MinGW doesn't have wincred.h, so we need to define stuff */ /* MinGW doesn't have wincred.h, so we need to define stuff */
typedef struct _CREDENTIAL_ATTRIBUTEW { typedef struct _CREDENTIAL_ATTRIBUTEW {
@ -67,20 +61,14 @@ typedef struct _CREDENTIALW {
#define CRED_MAX_ATTRIBUTES 64 #define CRED_MAX_ATTRIBUTES 64
typedef BOOL (WINAPI *CredWriteWT)(PCREDENTIALW, DWORD); typedef BOOL (WINAPI *CredWriteWT)(PCREDENTIALW, DWORD);
typedef BOOL (WINAPI *CredUnPackAuthenticationBufferWT)(DWORD, PVOID, DWORD,
LPWSTR, DWORD *, LPWSTR, DWORD *, LPWSTR, DWORD *);
typedef BOOL (WINAPI *CredEnumerateWT)(LPCWSTR, DWORD, DWORD *, typedef BOOL (WINAPI *CredEnumerateWT)(LPCWSTR, DWORD, DWORD *,
PCREDENTIALW **); PCREDENTIALW **);
typedef BOOL (WINAPI *CredPackAuthenticationBufferWT)(DWORD, LPWSTR, LPWSTR,
PBYTE, DWORD *);
typedef VOID (WINAPI *CredFreeT)(PVOID); typedef VOID (WINAPI *CredFreeT)(PVOID);
typedef BOOL (WINAPI *CredDeleteWT)(LPCWSTR, DWORD, DWORD); typedef BOOL (WINAPI *CredDeleteWT)(LPCWSTR, DWORD, DWORD);
static HMODULE advapi, credui; static HMODULE advapi;
static CredWriteWT CredWriteW; static CredWriteWT CredWriteW;
static CredUnPackAuthenticationBufferWT CredUnPackAuthenticationBufferW;
static CredEnumerateWT CredEnumerateW; static CredEnumerateWT CredEnumerateW;
static CredPackAuthenticationBufferWT CredPackAuthenticationBufferW;
static CredFreeT CredFree; static CredFreeT CredFree;
static CredDeleteWT CredDeleteW; static CredDeleteWT CredDeleteW;
@ -88,74 +76,84 @@ static void load_cred_funcs(void)
{ {
/* load DLLs */ /* load DLLs */
advapi = LoadLibrary("advapi32.dll"); advapi = LoadLibrary("advapi32.dll");
credui = LoadLibrary("credui.dll"); if (!advapi)
if (!advapi || !credui) die("failed to load advapi32.dll");
die("failed to load DLLs");
/* get function pointers */ /* get function pointers */
CredWriteW = (CredWriteWT)GetProcAddress(advapi, "CredWriteW"); CredWriteW = (CredWriteWT)GetProcAddress(advapi, "CredWriteW");
CredUnPackAuthenticationBufferW = (CredUnPackAuthenticationBufferWT)
GetProcAddress(credui, "CredUnPackAuthenticationBufferW");
CredEnumerateW = (CredEnumerateWT)GetProcAddress(advapi, CredEnumerateW = (CredEnumerateWT)GetProcAddress(advapi,
"CredEnumerateW"); "CredEnumerateW");
CredPackAuthenticationBufferW = (CredPackAuthenticationBufferWT)
GetProcAddress(credui, "CredPackAuthenticationBufferW");
CredFree = (CredFreeT)GetProcAddress(advapi, "CredFree"); CredFree = (CredFreeT)GetProcAddress(advapi, "CredFree");
CredDeleteW = (CredDeleteWT)GetProcAddress(advapi, "CredDeleteW"); CredDeleteW = (CredDeleteWT)GetProcAddress(advapi, "CredDeleteW");
if (!CredWriteW || !CredUnPackAuthenticationBufferW || if (!CredWriteW || !CredEnumerateW || !CredFree || !CredDeleteW)
!CredEnumerateW || !CredPackAuthenticationBufferW || !CredFree ||
!CredDeleteW)
die("failed to load functions"); die("failed to load functions");
} }
static char target_buf[1024]; static WCHAR *wusername, *password, *protocol, *host, *path, target[1024];
static char *protocol, *host, *path, *username;
static WCHAR *wusername, *password, *target;
static void write_item(const char *what, WCHAR *wbuf) static void write_item(const char *what, LPCWSTR wbuf, int wlen)
{ {
char *buf; char *buf;
int len = WideCharToMultiByte(CP_UTF8, 0, wbuf, -1, NULL, 0, NULL, int len = WideCharToMultiByte(CP_UTF8, 0, wbuf, wlen, NULL, 0, NULL,
FALSE); FALSE);
buf = xmalloc(len); buf = xmalloc(len);
if (!WideCharToMultiByte(CP_UTF8, 0, wbuf, -1, buf, len, NULL, FALSE)) if (!WideCharToMultiByte(CP_UTF8, 0, wbuf, wlen, buf, len, NULL, FALSE))
die("WideCharToMultiByte failed!"); die("WideCharToMultiByte failed!");
printf("%s=", what); printf("%s=", what);
fwrite(buf, 1, len - 1, stdout); fwrite(buf, 1, len, stdout);
putchar('\n'); putchar('\n');
free(buf); free(buf);
} }
static int match_attr(const CREDENTIALW *cred, const WCHAR *keyword, /*
const char *want) * Match an (optional) expected string and a delimiter in the target string,
* consuming the matched text by updating the target pointer.
*/
static int match_part(LPCWSTR *ptarget, LPCWSTR want, LPCWSTR delim)
{ {
int i; LPCWSTR delim_pos, start = *ptarget;
if (!want) int len;
return 1;
for (i = 0; i < cred->AttributeCount; ++i) /* find start of delimiter (or end-of-string if delim is empty) */
if (!wcscmp(cred->Attributes[i].Keyword, keyword)) if (*delim)
return !strcmp((const char *)cred->Attributes[i].Value, delim_pos = wcsstr(start, delim);
want); else
delim_pos = start + wcslen(start);
return 0; /* not found */ /*
* match text up to delimiter, or end of string (e.g. the '/' after
* host is optional if not followed by a path)
*/
if (delim_pos)
len = delim_pos - start;
else
len = wcslen(start);
/* update ptarget if we either found a delimiter or need a match */
if (delim_pos || want)
*ptarget = delim_pos ? delim_pos + wcslen(delim) : start + len;
return !want || (!wcsncmp(want, start, len) && !want[len]);
} }
static int match_cred(const CREDENTIALW *cred) static int match_cred(const CREDENTIALW *cred)
{ {
return (!wusername || !wcscmp(wusername, cred->UserName)) && LPCWSTR target = cred->TargetName;
match_attr(cred, L"git_protocol", protocol) && if (wusername && wcscmp(wusername, cred->UserName))
match_attr(cred, L"git_host", host) && return 0;
match_attr(cred, L"git_path", path);
return match_part(&target, L"git", L":") &&
match_part(&target, protocol, L"://") &&
match_part(&target, wusername, L"@") &&
match_part(&target, host, L"/") &&
match_part(&target, path, L"");
} }
static void get_credential(void) static void get_credential(void)
{ {
WCHAR *user_buf, *pass_buf; CREDENTIALW **creds;
DWORD user_buf_size = 0, pass_buf_size = 0;
CREDENTIALW **creds, *cred = NULL;
DWORD num_creds; DWORD num_creds;
int i; int i;
@ -165,90 +163,36 @@ static void get_credential(void)
/* search for the first credential that matches username */ /* search for the first credential that matches username */
for (i = 0; i < num_creds; ++i) for (i = 0; i < num_creds; ++i)
if (match_cred(creds[i])) { if (match_cred(creds[i])) {
cred = creds[i]; write_item("username", creds[i]->UserName,
wcslen(creds[i]->UserName));
write_item("password",
(LPCWSTR)creds[i]->CredentialBlob,
creds[i]->CredentialBlobSize / sizeof(WCHAR));
break; break;
} }
if (!cred)
return;
CredUnPackAuthenticationBufferW(0, cred->CredentialBlob,
cred->CredentialBlobSize, NULL, &user_buf_size, NULL, NULL,
NULL, &pass_buf_size);
user_buf = xmalloc(user_buf_size * sizeof(WCHAR));
pass_buf = xmalloc(pass_buf_size * sizeof(WCHAR));
if (!CredUnPackAuthenticationBufferW(0, cred->CredentialBlob,
cred->CredentialBlobSize, user_buf, &user_buf_size, NULL, NULL,
pass_buf, &pass_buf_size))
die("CredUnPackAuthenticationBuffer failed");
CredFree(creds); CredFree(creds);
/* zero-terminate (sizes include zero-termination) */
user_buf[user_buf_size - 1] = L'\0';
pass_buf[pass_buf_size - 1] = L'\0';
write_item("username", user_buf);
write_item("password", pass_buf);
free(user_buf);
free(pass_buf);
}
static void write_attr(CREDENTIAL_ATTRIBUTEW *attr, const WCHAR *keyword,
const char *value)
{
attr->Keyword = (LPWSTR)keyword;
attr->Flags = 0;
attr->ValueSize = strlen(value) + 1; /* store zero-termination */
attr->Value = (LPBYTE)value;
} }
static void store_credential(void) static void store_credential(void)
{ {
CREDENTIALW cred; CREDENTIALW cred;
BYTE *auth_buf;
DWORD auth_buf_size = 0;
CREDENTIAL_ATTRIBUTEW attrs[CRED_MAX_ATTRIBUTES];
if (!wusername || !password) if (!wusername || !password)
return; return;
/* query buffer size */
CredPackAuthenticationBufferW(0, wusername, password,
NULL, &auth_buf_size);
auth_buf = xmalloc(auth_buf_size);
if (!CredPackAuthenticationBufferW(0, wusername, password,
auth_buf, &auth_buf_size))
die("CredPackAuthenticationBuffer failed");
cred.Flags = 0; cred.Flags = 0;
cred.Type = CRED_TYPE_GENERIC; cred.Type = CRED_TYPE_GENERIC;
cred.TargetName = target; cred.TargetName = target;
cred.Comment = L"saved by git-credential-wincred"; cred.Comment = L"saved by git-credential-wincred";
cred.CredentialBlobSize = auth_buf_size; cred.CredentialBlobSize = (wcslen(password)) * sizeof(WCHAR);
cred.CredentialBlob = auth_buf; cred.CredentialBlob = (LPVOID)password;
cred.Persist = CRED_PERSIST_LOCAL_MACHINE; cred.Persist = CRED_PERSIST_LOCAL_MACHINE;
cred.AttributeCount = 1; cred.AttributeCount = 0;
cred.Attributes = attrs; cred.Attributes = NULL;
cred.TargetAlias = NULL; cred.TargetAlias = NULL;
cred.UserName = wusername; cred.UserName = wusername;
write_attr(attrs, L"git_protocol", protocol);
if (host) {
write_attr(attrs + cred.AttributeCount, L"git_host", host);
cred.AttributeCount++;
}
if (path) {
write_attr(attrs + cred.AttributeCount, L"git_path", path);
cred.AttributeCount++;
}
if (!CredWriteW(&cred, 0)) if (!CredWriteW(&cred, 0))
die("CredWrite failed"); die("CredWrite failed");
} }
@ -298,13 +242,12 @@ static void read_credential(void)
*v++ = '\0'; *v++ = '\0';
if (!strcmp(buf, "protocol")) if (!strcmp(buf, "protocol"))
protocol = xstrdup(v); protocol = utf8_to_utf16_dup(v);
else if (!strcmp(buf, "host")) else if (!strcmp(buf, "host"))
host = xstrdup(v); host = utf8_to_utf16_dup(v);
else if (!strcmp(buf, "path")) else if (!strcmp(buf, "path"))
path = xstrdup(v); path = utf8_to_utf16_dup(v);
else if (!strcmp(buf, "username")) { else if (!strcmp(buf, "username")) {
username = xstrdup(v);
wusername = utf8_to_utf16_dup(v); wusername = utf8_to_utf16_dup(v);
} else if (!strcmp(buf, "password")) } else if (!strcmp(buf, "password"))
password = utf8_to_utf16_dup(v); password = utf8_to_utf16_dup(v);
@ -333,22 +276,20 @@ int main(int argc, char *argv[])
return 0; return 0;
/* prepare 'target', the unique key for the credential */ /* prepare 'target', the unique key for the credential */
strncat(target_buf, "git:", sizeof(target_buf)); wcscpy(target, L"git:");
strncat(target_buf, protocol, sizeof(target_buf)); wcsncat(target, protocol, ARRAY_SIZE(target));
strncat(target_buf, "://", sizeof(target_buf)); wcsncat(target, L"://", ARRAY_SIZE(target));
if (username) { if (wusername) {
strncat(target_buf, username, sizeof(target_buf)); wcsncat(target, wusername, ARRAY_SIZE(target));
strncat(target_buf, "@", sizeof(target_buf)); wcsncat(target, L"@", ARRAY_SIZE(target));
} }
if (host) if (host)
strncat(target_buf, host, sizeof(target_buf)); wcsncat(target, host, ARRAY_SIZE(target));
if (path) { if (path) {
strncat(target_buf, "/", sizeof(target_buf)); wcsncat(target, L"/", ARRAY_SIZE(target));
strncat(target_buf, path, sizeof(target_buf)); wcsncat(target, path, ARRAY_SIZE(target));
} }
target = utf8_to_utf16_dup(target_buf);
if (!strcmp(argv[1], "get")) if (!strcmp(argv[1], "get"))
get_credential(); get_credential();
else if (!strcmp(argv[1], "store")) else if (!strcmp(argv[1], "store"))