credential: erase all matching credentials
`credential reject` sends the erase action to each helper, but the exact behaviour of erase isn't specified in documentation or tests. Some helpers (such as credential-store and credential-libsecret) delete all matching credentials, others (such as credential-cache) delete at most one matching credential. Test that helpers erase all matching credentials. This behaviour is easiest to reason about. Users expect that `echo "url=https://example.com" | git credential reject` or `echo "url=https://example.com\nusername=tim" | git credential reject` erase all matching credentials. Fix credential-cache. Signed-off-by: M Hickford <mirth.hickford@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
aeb21ce22e
commit
6c26da8404
@ -33,12 +33,12 @@ static void cache_credential(struct credential *c, int timeout)
|
||||
e->expiration = time(NULL) + timeout;
|
||||
}
|
||||
|
||||
static struct credential_cache_entry *lookup_credential(const struct credential *c, int match_password)
|
||||
static struct credential_cache_entry *lookup_credential(const struct credential *c)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < entries_nr; i++) {
|
||||
struct credential *e = &entries[i].item;
|
||||
if (credential_match(c, e, match_password))
|
||||
if (credential_match(c, e, 0))
|
||||
return &entries[i];
|
||||
}
|
||||
return NULL;
|
||||
@ -48,9 +48,12 @@ static void remove_credential(const struct credential *c, int match_password)
|
||||
{
|
||||
struct credential_cache_entry *e;
|
||||
|
||||
e = lookup_credential(c, match_password);
|
||||
if (e)
|
||||
e->expiration = 0;
|
||||
int i;
|
||||
for (i = 0; i < entries_nr; i++) {
|
||||
e = &entries[i];
|
||||
if (credential_match(c, &e->item, match_password))
|
||||
e->expiration = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static timestamp_t check_expirations(void)
|
||||
@ -127,7 +130,7 @@ static void serve_one_client(FILE *in, FILE *out)
|
||||
if (read_request(in, &c, &action, &timeout) < 0)
|
||||
/* ignore error */ ;
|
||||
else if (!strcmp(action.buf, "get")) {
|
||||
struct credential_cache_entry *e = lookup_credential(&c, 0);
|
||||
struct credential_cache_entry *e = lookup_credential(&c);
|
||||
if (e) {
|
||||
fprintf(out, "username=%s\n", e->item.username);
|
||||
fprintf(out, "password=%s\n", e->item.password);
|
||||
|
Reference in New Issue
Block a user