[PATCH 04/13] credential: add function for parsing url components
- From
Jeff King <peff@peff.net>
- Date
- Nov 24, 2011, 11:01 UTC
- Message-ID
- <20111124110122.GB8417@sigill.intra.peff.net>
- In-Reply-To
- <20111124105801.GA6168@sigill.intra.peff.net>
All of the components of a credential struct can be found in a URL. For example, the URL:
http://foo:bar@example.com/repo.git
contains:
protocol=http host=example.com path=repo.git username=foo password=bar
We want to be able to turn URLs into broken-down credential structs so that we know two things:
1. Which parts of the username/password we still need
2. What the context of the request is (for prompting or
as a key for storing credentials).This code is based on http_auth_init in http.c, but needed a few modifications in order to get all of the components that the credential object is interested in.
Once the http code is switched over to the credential API, then http_auth_init can just go away.
Signed-off-by: Jeff King <peff@peff.net> --- Documentation/technical/api-credentials.txt | 3 ++ credential.c | 52 +++++++++++++++++++++++++++ credential.h | 1 + 3 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/Documentation/technical/api-credentials.txt b/Documentation/technical/api-credentials.txt index 3061077..0dca0bf 100644 --- a/Documentation/technical/api-credentials.txt +++ b/Documentation/technical/api-credentials.txt @@ -62,6 +62,9 @@ Functions storage helpers of the approval, so that they can store the result to be used again. +`credential_from_url`:: + + Parse a URL into broken-down credential fields. Credential Storage Helpers -------------------------- diff --git a/credential.c b/credential.c index d50a611..5cc4319 100644 --- a/credential.c +++ b/credential.c @@ -2,6 +2,7 @@ #include "credential.h" #include "string-list.h" #include "run-command.h" +#include "url.h" void credential_init(struct credential *c) { @@ -240,3 +241,54 @@ void credential_reject(struct credential *c) c->password = NULL; c->approved = 0; } + +void credential_from_url(struct credential *c, const char *url) +{ + const char *at, *colon, *cp, *slash, *host, *proto_end; + + credential_clear(c); + + /* + * Match one of: + * (1) proto://<host>/... + * (2) proto://<user>@<host>/... + * (3) proto://<user>:<pass>@<host>/... + */ + proto_end = strstr(url, "://"); + if (!proto_end) + return; + cp = proto_end + 3; + at = strchr(cp, '@'); + colon = strchr(cp, ':'); + slash = strchrnul(cp, '/'); + + if (!at || slash <= at) { + /* Case (1) */ + host = cp; + } + else if (!colon || at <= colon) { + /* Case (2) */ + c->username = url_decode_mem(cp, at - cp); + host = at + 1; + } else { + /* Case (3) */ + c->username = url_decode_mem(cp, colon - cp); + c->password = url_decode_mem(colon + 1, at - (colon + 1)); + host = at + 1; + } + + if (proto_end - url > 0) + c->protocol = xmemdupz(url, proto_end - url); + if (slash - host > 0) + c->host = url_decode_mem(host, slash - host); + /* Trim leading and trailing slashes from path */ + while (*slash == '/') + slash++; + if (*slash) { + char *p; + c->path = url_decode(slash); + p = c->path + strlen(c->path) - 1; + while (p > c->path && *p == '/') + *p-- = '\0'; + } +} diff --git a/credential.h b/credential.h index 2ea7d49..8a6d162 100644 --- a/credential.h +++ b/credential.h @@ -24,5 +24,6 @@ struct credential { void credential_reject(struct credential *); int credential_read(struct credential *, FILE *); +void credential_from_url(struct credential *, const char *url); #endif /* CREDENTIAL_H */
-- 1.7.7.4.5.gb32a5