Re: [PATCH] credential: do not store credentials received from helpers
- From
Jeff King <peff@peff.net>
- Date
- Apr 8, 2012, 07:13 UTC
- Message-ID
- <20120408071300.GB13662@sigill.intra.peff.net>
- In-Reply-To
- <20120408064059.GA6727@sigill.intra.peff.net>
On Sun, Apr 08, 2012 at 02:40:59AM -0400, Jeff King wrote:
> The second issue is that of communicating the ttl or expiration between > helpers. That's easy enough. The protocol allows arbitrary key/value > pairs. We typically just drop ones we don't care about, but we could > retain them and pass them along.
And here's a rough patch for that. This is just to get an idea of the scale, and which parts of the code need changed. I'd probably use a key/value store instead of a string_list. On top of this, credential-cache would have to learn to respect a TTL variable in the input (actually, it does already respect "timeout" which is added on the way from the cache client to the cache daemon, but the parsing around that would have to be cleaned up a bit).
--- credential.c | 14 +++++++++++--- credential.h | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/credential.c b/credential.c index 13409e1..2237e7e 100644 --- a/credential.c +++ b/credential.c @@ -9,6 +9,7 @@ void credential_init(struct credential *c) { memset(c, 0, sizeof(*c)); c->helpers.strdup_strings = 1; + c->extra.strdup_strings = 1; } void credential_clear(struct credential *c) @@ -19,6 +20,7 @@ void credential_clear(struct credential *c) free(c->username); free(c->password); string_list_clear(&c->helpers, 0); + string_list_clear(&c->extra, 0); credential_init(c); } @@ -174,10 +176,11 @@ int credential_read(struct credential *c, FILE *fp) c->path = xstrdup(value); } /* - * Ignore other lines; we don't know what they mean, but - * this future-proofs us when later versions of git do - * learn new lines, and the helpers are updated to match. + * Save other lines so they can be fed back to the helper or + * transported to other helpers. */ + *(value-1) = '='; + string_list_append(&c->extra, line.buf); } strbuf_release(&line); @@ -193,11 +196,16 @@ static void credential_write_item(FILE *fp, const char *key, const char *value) void credential_write(const struct credential *c, FILE *fp) { + int i; + credential_write_item(fp, "protocol", c->protocol); credential_write_item(fp, "host", c->host); credential_write_item(fp, "path", c->path); credential_write_item(fp, "username", c->username); credential_write_item(fp, "password", c->password); + + for (i = 0; i < c->extra.nr; i++) + fprintf(fp, "%s\n", c->extra.items[i].string); } static int run_credential_helper(struct credential *c, diff --git a/credential.h b/credential.h index daf3e81..5f98527 100644 --- a/credential.h +++ b/credential.h @@ -5,6 +5,7 @@ struct credential { struct string_list helpers; + struct string_list extra; unsigned approved:1, configured:1, use_http_path:1; @@ -16,7 +17,7 @@ struct credential { char *path; }; -#define CREDENTIAL_INIT { STRING_LIST_INIT_DUP } +#define CREDENTIAL_INIT { STRING_LIST_INIT_DUP, STRING_LIST_INIT_DUP } void credential_init(struct credential *); void credential_clear(struct credential *);
-- 1.7.10.11.g901cee