Commit 016179d6681255be0557040f7fd50a917e094fd8
2013-01-31T14:54:58
WinHttp: use cred in url if provided
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c
index 780b84e..64bfece 100644
--- a/src/transports/winhttp.c
+++ b/src/transports/winhttp.c
@@ -73,7 +73,10 @@ typedef struct {
const char *path;
char *host;
char *port;
+ char *user_from_url;
+ char *pass_from_url;
git_cred *cred;
+ git_cred *url_cred;
int auth_mechanism;
HINTERNET session;
HINTERNET connection;
@@ -250,6 +253,16 @@ static int winhttp_stream_connect(winhttp_stream *s)
apply_basic_credential(s->request, t->cred) < 0)
goto on_error;
+ /* If no other credentials have been applied and the URL has username and
+ * password, use those */
+ if (!t->cred && t->user_from_url && t->pass_from_url) {
+ if (!t->url_cred &&
+ git_cred_userpass_plaintext_new(&t->url_cred, t->user_from_url, t->pass_from_url) < 0)
+ goto on_error;
+ if (apply_basic_credential(s->request, t->url_cred) < 0)
+ goto on_error;
+ }
+
/* We've done everything up to calling WinHttpSendRequest. */
error = 0;
@@ -447,7 +460,7 @@ replay:
if (allowed_types &&
(!t->cred || 0 == (t->cred->credtype & allowed_types))) {
- if (t->owner->cred_acquire_cb(&t->cred, t->owner->url, allowed_types, t->owner->cred_acquire_payload) < 0)
+ if (t->owner->cred_acquire_cb(&t->cred, t->owner->url, t->user_from_url, allowed_types, t->owner->cred_acquire_payload) < 0)
return -1;
assert(t->cred);
@@ -788,8 +801,8 @@ static int winhttp_connect(
t->use_ssl = 1;
}
- if ((ret = gitno_extract_url_parts(&t->host, &t->port, &t->parent.user_from_url,
- &t->parent.pass_from_url, url, default_port)) < 0)
+ if ((ret = gitno_extract_url_parts(&t->host, &t->port, &t->user_from_url,
+ &t->pass_from_url, url, default_port)) < 0)
return ret;
t->path = strchr(url, '/');