moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

http_negotiate.c: fix several SPNEGO memory handling issues

Browse Source
This commit is contained in:
Yang Tse 2013-04-04 01:57:25 +02:00
parent 7ba091ca82
commit 3dcc1a9c19
1 changed files with 81 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
lib/http_negotiate.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -135,7 +135,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
struct negotiatedata *neg_ctx = proxy?&data->state.proxyneg: struct negotiatedata *neg_ctx = proxy?&data->state.proxyneg:
&data->state.negotiate; &data->state.negotiate;
OM_uint32 major_status, minor_status, minor_status2; OM_uint32 major_status, minor_status, discard_st;
gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER; gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER; gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER;
int ret; int ret;
@ -192,46 +192,50 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
return -1; return -1;
input_token.length = rawlen; input_token.length = rawlen;
DEBUGASSERT(input_token.value != NULL);
#ifdef HAVE_SPNEGO /* Handle SPNEGO */ #ifdef HAVE_SPNEGO /* Handle SPNEGO */
if(checkprefix("Negotiate", header)) { if(checkprefix("Negotiate", header)) {
ASN1_OBJECT * object = NULL; unsigned char *spnegoToken = NULL;
unsigned char * spnegoToken = NULL;
size_t spnegoTokenLength = 0; size_t spnegoTokenLength = 0;
unsigned char * mechToken = NULL; gss_buffer_desc mechToken = GSS_C_EMPTY_BUFFER;
size_t mechTokenLength = 0;
if(input_token.value == NULL)
return CURLE_OUT_OF_MEMORY;
spnegoToken = malloc(input_token.length); spnegoToken = malloc(input_token.length);
if(spnegoToken == NULL) if(spnegoToken == NULL) {
Curl_safefree(input_token.value);
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
}
memcpy(spnegoToken, input_token.value, input_token.length);
spnegoTokenLength = input_token.length; spnegoTokenLength = input_token.length;
object = OBJ_txt2obj ("1.2.840.113554.1.2.2", 1);
if(!parseSpnegoTargetToken(spnegoToken, if(!parseSpnegoTargetToken(spnegoToken,
spnegoTokenLength, spnegoTokenLength,
NULL, NULL,
NULL, NULL,
&mechToken, &mechToken.value,
&mechTokenLength, &mechToken.length,
NULL, NULL,
NULL)) { NULL)) {
free(spnegoToken); Curl_safefree(spnegoToken);
spnegoToken = NULL;
infof(data, "Parse SPNEGO Target Token failed\n"); infof(data, "Parse SPNEGO Target Token failed\n");
} }
else if(!mechToken.value || !mechToken.length) {
Curl_safefree(spnegoToken);
if(mechToken.value)
gss_release_buffer(&discard_st, &mechToken);
infof(data, "Parse SPNEGO Target Token succeeded (NULL token)\n");
}
else { else {
free(input_token.value); Curl_safefree(spnegoToken);
input_token.value = malloc(mechTokenLength); Curl_safefree(input_token.value);
if(input_token.value == NULL) input_token.value = malloc(mechToken.length);
if(input_token.value == NULL) {
gss_release_buffer(&discard_st, &mechToken);
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
}
memcpy(input_token.value, mechToken,mechTokenLength); memcpy(input_token.value, mechToken.value, mechToken.length);
input_token.length = mechTokenLength; input_token.length = mechToken.length;
free(mechToken); gss_release_buffer(&discard_st, &mechToken);
mechToken = NULL;
infof(data, "Parse SPNEGO Target Token succeeded\n"); infof(data, "Parse SPNEGO Target Token succeeded\n");
} }
} }
@ -246,23 +250,23 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
&input_token, &input_token,
&output_token, &output_token,
NULL); NULL);
if(input_token.length > 0) Curl_safefree(input_token.value);
gss_release_buffer(&minor_status2, &input_token);
neg_ctx->status = major_status; neg_ctx->status = major_status;
if(GSS_ERROR(major_status)) { if(GSS_ERROR(major_status)) {
/* Curl_cleanup_negotiate(data) ??? */ if(output_token.value)
log_gss_error(conn, minor_status, gss_release_buffer(&discard_st, &output_token);
"gss_init_sec_context() failed: "); log_gss_error(conn, minor_status, "gss_init_sec_context() failed: ");
return -1; return -1;
} }
if(output_token.length == 0) { if(!output_token.value || !output_token.length) {
if(output_token.value)
gss_release_buffer(&discard_st, &output_token);
return -1; return -1;
} }
neg_ctx->output_token = output_token; neg_ctx->output_token = output_token;
/* conn->bits.close = FALSE; */
return 0; return 0;
} }
@ -275,14 +279,14 @@ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy)
size_t len = 0; size_t len = 0;
char *userp; char *userp;
CURLcode error; CURLcode error;
OM_uint32 discard_st;
#ifdef HAVE_SPNEGO /* Handle SPNEGO */ #ifdef HAVE_SPNEGO /* Handle SPNEGO */
if(checkprefix("Negotiate", neg_ctx->protocol)) { if(checkprefix("Negotiate", neg_ctx->protocol)) {
ASN1_OBJECT * object = NULL; ASN1_OBJECT *object = NULL;
unsigned char * spnegoToken = NULL; unsigned char *responseToken = NULL;
size_t spnegoTokenLength = 0;
unsigned char * responseToken = NULL;
size_t responseTokenLength = 0; size_t responseTokenLength = 0;
gss_buffer_desc spnegoToken = GSS_C_EMPTY_BUFFER;
responseToken = malloc(neg_ctx->output_token.length); responseToken = malloc(neg_ctx->output_token.length);
if(responseToken == NULL) if(responseToken == NULL)
@ -291,30 +295,34 @@ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy)
neg_ctx->output_token.length); neg_ctx->output_token.length);
responseTokenLength = neg_ctx->output_token.length; responseTokenLength = neg_ctx->output_token.length;
object=OBJ_txt2obj ("1.2.840.113554.1.2.2", 1); object = OBJ_txt2obj("1.2.840.113554.1.2.2", 1);
if(!makeSpnegoInitialToken (object, if(!object) {
responseToken, Curl_safefree(responseToken);
responseTokenLength, return CURLE_OUT_OF_MEMORY;
&spnegoToken, }
&spnegoTokenLength)) {
free(responseToken); if(!makeSpnegoInitialToken(object,
responseToken = NULL; responseToken,
responseTokenLength,
&spnegoToken.value,
&spnegoToken.length)) {
Curl_safefree(responseToken);
ASN1_OBJECT_free(object);
infof(conn->data, "Make SPNEGO Initial Token failed\n"); infof(conn->data, "Make SPNEGO Initial Token failed\n");
} }
else if(!spnegoToken.value || !spnegoToken.length) {
Curl_safefree(responseToken);
ASN1_OBJECT_free(object);
if(spnegoToken.value)
gss_release_buffer(&discard_st, &spnegoToken);
infof(conn->data, "Make SPNEGO Initial Token succeeded (NULL token)\n");
}
else { else {
free(responseToken); Curl_safefree(responseToken);
responseToken = NULL; ASN1_OBJECT_free(object);
free(neg_ctx->output_token.value); gss_release_buffer(&discard_st, &neg_ctx->output_token);
neg_ctx->output_token.value = malloc(spnegoTokenLength); neg_ctx->output_token.value = spnegoToken.value;
if(neg_ctx->output_token.value == NULL) { neg_ctx->output_token.length = spnegoToken.length;
free(spnegoToken);
spnegoToken = NULL;
return CURLE_OUT_OF_MEMORY;
}
memcpy(neg_ctx->output_token.value, spnegoToken,spnegoTokenLength);
neg_ctx->output_token.length = spnegoTokenLength;
free(spnegoToken);
spnegoToken = NULL;
infof(conn->data, "Make SPNEGO Initial Token succeeded\n"); infof(conn->data, "Make SPNEGO Initial Token succeeded\n");
} }
} }
@ -324,26 +332,31 @@ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy)
neg_ctx->output_token.length, neg_ctx->output_token.length,
&encoded, &len); &encoded, &len);
if(error) { if(error) {
Curl_safefree(neg_ctx->output_token.value); gss_release_buffer(&discard_st, &neg_ctx->output_token);
neg_ctx->output_token.value = NULL; neg_ctx->output_token = GSS_C_EMPTY_BUFFER;
return error; return error;
} }
if(len == 0) { if(!encoded || !len) {
Curl_safefree(neg_ctx->output_token.value); gss_release_buffer(&discard_st, &neg_ctx->output_token);
neg_ctx->output_token.value = NULL; neg_ctx->output_token = GSS_C_EMPTY_BUFFER;
return CURLE_REMOTE_ACCESS_DENIED; return CURLE_REMOTE_ACCESS_DENIED;
} }
userp = aprintf("%sAuthorization: %s %s\r\n", proxy ? "Proxy-" : "", userp = aprintf("%sAuthorization: %s %s\r\n", proxy ? "Proxy-" : "",
neg_ctx->protocol, encoded); neg_ctx->protocol, encoded);
if(proxy) {
if(proxy) Curl_safefree(conn->allocptr.proxyuserpwd);
conn->allocptr.proxyuserpwd = userp; conn->allocptr.proxyuserpwd = userp;
else }
else {
Curl_safefree(conn->allocptr.userpwd);
conn->allocptr.userpwd = userp; conn->allocptr.userpwd = userp;
free(encoded); }
Curl_cleanup_negotiate (conn->data);
Curl_safefree(encoded);
Curl_cleanup_negotiate(conn->data);
return (userp == NULL) ? CURLE_OUT_OF_MEMORY : CURLE_OK; return (userp == NULL) ? CURLE_OUT_OF_MEMORY : CURLE_OK;
} }
@ -353,7 +366,7 @@ static void cleanup(struct negotiatedata *neg_ctx)
if(neg_ctx->context != GSS_C_NO_CONTEXT) if(neg_ctx->context != GSS_C_NO_CONTEXT)
gss_delete_sec_context(&minor_status, &neg_ctx->context, GSS_C_NO_BUFFER); gss_delete_sec_context(&minor_status, &neg_ctx->context, GSS_C_NO_BUFFER);
if(neg_ctx->output_token.length != 0) if(neg_ctx->output_token.value)
gss_release_buffer(&minor_status, &neg_ctx->output_token); gss_release_buffer(&minor_status, &neg_ctx->output_token);
if(neg_ctx->server_name != GSS_C_NO_NAME) if(neg_ctx->server_name != GSS_C_NO_NAME)