Skip to content

Commit

Permalink
credential/libsecret: erase matching creds only
Browse files Browse the repository at this point in the history
The credential erase request typically includes protocol, host, username
and password.

credential-libsecret erases a stored credential if it matches protocol,
host and username, regardless of password.

This is confusing in the case the stored password differs from that
in the request. This case can occur when multiple credential helpers are
configured.

Only erase credential if stored password matches request (or request
omits password).

This fixes test "helper (libsecret) does not erase a password distinct
from input" when t0303 is run with GIT_TEST_CREDENTIAL_HELPER set to
"libsecret". This test was added in aeb21ce (credential: avoid
erasing distinct password, 2023-06-13).

Signed-off-by: M Hickford <mirth.hickford@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
hickford authored and gitster committed Jul 26, 2023
1 parent 6c26da8 commit 7144dee
Showing 1 changed file with 17 additions and 0 deletions.
17 changes: 17 additions & 0 deletions contrib/credential/libsecret/git-credential-libsecret.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ struct credential_operation {

#define CREDENTIAL_OP_END { NULL, NULL }

static void credential_clear(struct credential *c);

/* ----------------- Secret Service functions ----------------- */

static char *make_label(struct credential *c)
Expand Down Expand Up @@ -185,6 +187,7 @@ static int keyring_erase(struct credential *c)
{
GHashTable *attributes = NULL;
GError *error = NULL;
struct credential existing = CREDENTIAL_INIT;

/*
* Sanity check that we actually have something to match
Expand All @@ -197,6 +200,20 @@ static int keyring_erase(struct credential *c)
if (!c->protocol && !c->host && !c->path && !c->username)
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);
secret_password_clearv_sync(SECRET_SCHEMA_COMPAT_NETWORK,
attributes,
Expand Down

0 comments on commit 7144dee

Please sign in to comment.