Commit 4de51f9e by Ian Hattendorf Committed by Edward Thomson

http: ensure the scheme supports the credentials

When a server responds with multiple scheme support - for example,
Negotiate and NTLM are commonly used together - we need to ensure that
we choose a scheme that supports the credentials.
parent 1c847169
...@@ -129,17 +129,22 @@ typedef struct { ...@@ -129,17 +129,22 @@ typedef struct {
size_t *bytes_read; size_t *bytes_read;
} parser_context; } parser_context;
static git_http_auth_scheme *scheme_for_challenge(const char *challenge) static git_http_auth_scheme *scheme_for_challenge(
const char *challenge,
git_cred *cred)
{ {
git_http_auth_scheme *scheme = NULL; git_http_auth_scheme *scheme = NULL;
size_t i; size_t i;
for (i = 0; i < ARRAY_SIZE(auth_schemes); i++) { for (i = 0; i < ARRAY_SIZE(auth_schemes); i++) {
const char *scheme_name = auth_schemes[i].name; const char *scheme_name = auth_schemes[i].name;
const git_credtype_t scheme_types = auth_schemes[i].credtypes;
size_t scheme_len; size_t scheme_len;
scheme_len = strlen(scheme_name); scheme_len = strlen(scheme_name);
if (strncasecmp(challenge, scheme_name, scheme_len) == 0 &&
if ((!cred || (cred->credtype & scheme_types)) &&
strncasecmp(challenge, scheme_name, scheme_len) == 0 &&
(challenge[scheme_len] == '\0' || challenge[scheme_len] == ' ')) { (challenge[scheme_len] == '\0' || challenge[scheme_len] == ' ')) {
scheme = &auth_schemes[i]; scheme = &auth_schemes[i];
break; break;
...@@ -256,7 +261,7 @@ static int set_authentication_types(http_server *server) ...@@ -256,7 +261,7 @@ static int set_authentication_types(http_server *server)
size_t i; size_t i;
git_vector_foreach(&server->auth_challenges, i, challenge) { git_vector_foreach(&server->auth_challenges, i, challenge) {
if ((scheme = scheme_for_challenge(challenge)) != NULL) { if ((scheme = scheme_for_challenge(challenge, NULL)) != NULL) {
server->authtypes |= scheme->type; server->authtypes |= scheme->type;
server->credtypes |= scheme->credtypes; server->credtypes |= scheme->credtypes;
} }
...@@ -433,7 +438,7 @@ static int init_auth(http_server *server) ...@@ -433,7 +438,7 @@ static int init_auth(http_server *server)
int error; int error;
git_vector_foreach(&server->auth_challenges, i, c) { git_vector_foreach(&server->auth_challenges, i, c) {
s = scheme_for_challenge(c); s = scheme_for_challenge(c, server->cred);
if (s && !!(s->credtypes & server->credtypes)) { if (s && !!(s->credtypes & server->credtypes)) {
scheme = s; scheme = s;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment