mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mh/credential-erase-improvements-more' into next

Browse Source 
Update two credential helpers to correctly match which credential
to erase; they dropped not the ones with stale password.

* mh/credential-erase-improvements-more:
  credential/wincred: erase matching creds only
  credential/libsecret: erase matching creds only
This commit is contained in:
Junio C Hamano
2023-08-08 10:42:49 -07:00
parent dc73a2c55a cb626f8e5c
commit fd1ba4accf
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/credential/libsecret/git-credential-libsecret.c
View File

@ -54,6 +54,8 @@ struct credential_operation {
#define CREDENTIAL_OP_END { NULL, NULL } #define CREDENTIAL_OP_END { NULL, NULL }
static void credential_clear(struct credential *c);
/* ----------------- Secret Service functions ----------------- */ /* ----------------- Secret Service functions ----------------- */
static const SecretSchema schema = { static const SecretSchema schema = {
@ -237,6 +239,7 @@ static int keyring_erase(struct credential *c)
{ {
GHashTable *attributes = NULL; GHashTable *attributes = NULL;
GError *error = NULL; GError *error = NULL;
struct credential existing = CREDENTIAL_INIT;
/* /*
* Sanity check that we actually have something to match * Sanity check that we actually have something to match
@ -249,6 +252,20 @@ static int keyring_erase(struct credential *c)
if (!c->protocol && !c->host && !c->path && !c->username) if (!c->protocol && !c->host && !c->path && !c->username)
return EXIT_FAILURE; return EXIT_FAILURE;
if (c->password) {
existing.host = g_strdup(c->host);
existing.path = g_strdup(c->path);
existing.port = c->port;
existing.protocol = g_strdup(c->protocol);
existing.username = g_strdup(c->username);
keyring_get(&existing);
if (existing.password && strcmp(c->password, existing.password)) {
credential_clear(&existing);
return EXIT_SUCCESS;
}
credential_clear(&existing);
}
attributes = make_attr_list(c); attributes = make_attr_list(c);
secret_password_clearv_sync(&schema, secret_password_clearv_sync(&schema,
attributes, attributes,

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

@ -109,7 +109,18 @@ static int match_part_last(LPCWSTR *ptarget, LPCWSTR want, LPCWSTR delim)
return match_part_with_last(ptarget, want, delim, 1); return match_part_with_last(ptarget, want, delim, 1);
} }
static int match_cred(const CREDENTIALW *cred) static int match_cred_password(const CREDENTIALW *cred) {
int ret;
WCHAR *cred_password = xmalloc(cred->CredentialBlobSize);
wcsncpy_s(cred_password, cred->CredentialBlobSize,
(LPCWSTR)cred->CredentialBlob,
cred->CredentialBlobSize / sizeof(WCHAR));
ret = !wcscmp(cred_password, password);
free(cred_password);
return ret;
}
static int match_cred(const CREDENTIALW *cred, int match_password)
{ {
LPCWSTR target = cred->TargetName; LPCWSTR target = cred->TargetName;
if (wusername && wcscmp(wusername, cred->UserName ? cred->UserName : L"")) if (wusername && wcscmp(wusername, cred->UserName ? cred->UserName : L""))
@ -119,7 +130,8 @@ static int match_cred(const CREDENTIALW *cred)
match_part(&target, protocol, L"://") && match_part(&target, protocol, L"://") &&
match_part_last(&target, wusername, L"@") && match_part_last(&target, wusername, L"@") &&
match_part(&target, host, L"/") && match_part(&target, host, L"/") &&
match_part(&target, path, L""); match_part(&target, path, L"") &&
(!match_password || match_cred_password(cred));
} }
static void get_credential(void) static void get_credential(void)
@ -134,7 +146,7 @@ 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], 0)) {
write_item("username", creds[i]->UserName, write_item("username", creds[i]->UserName,
creds[i]->UserName ? wcslen(creds[i]->UserName) : 0); creds[i]->UserName ? wcslen(creds[i]->UserName) : 0);
write_item("password", write_item("password",
@ -196,7 +208,7 @@ static void erase_credential(void)
return; return;
for (i = 0; i < num_creds; ++i) { for (i = 0; i < num_creds; ++i) {
if (match_cred(creds[i])) if (match_cred(creds[i], password != NULL))
CredDeleteW(creds[i]->TargetName, creds[i]->Type, 0); CredDeleteW(creds[i]->TargetName, creds[i]->Type, 0);
} }