mirror of
https://github.com/moparisthebest/curl
synced 2024-11-04 08:35:05 -05:00
0aa8da10bb
I had accidentally used the proxy server name for the host and the host server name for the proxy in commitad5e9bfd5dand6d6f9ca1d9. Whilst Windows SSPI was quite happy with this, GSS-API wasn't. Thanks-to: Michael Osipov
132 lines
3.7 KiB
C
132 lines
3.7 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#if !defined(CURL_DISABLE_HTTP) && defined(USE_SPNEGO)
|
|
|
|
#include "urldata.h"
|
|
#include "sendf.h"
|
|
#include "rawstr.h"
|
|
#include "http_negotiate.h"
|
|
#include "vauth/vauth.h"
|
|
#include "curl_printf.h"
|
|
|
|
/* The last #include files should be: */
|
|
#include "curl_memory.h"
|
|
#include "memdebug.h"
|
|
|
|
CURLcode Curl_input_negotiate(struct connectdata *conn, bool proxy,
|
|
const char *header)
|
|
{
|
|
struct SessionHandle *data = conn->data;
|
|
size_t len;
|
|
|
|
/* Point to the username, password, service and host */
|
|
const char *userp;
|
|
const char *passwdp;
|
|
const char *service;
|
|
const char *host;
|
|
|
|
/* Point to the correct struct with this */
|
|
struct negotiatedata *neg_ctx;
|
|
|
|
if(proxy) {
|
|
userp = conn->proxyuser;
|
|
passwdp = conn->proxypasswd;
|
|
service = data->set.str[STRING_PROXY_SERVICE_NAME];
|
|
host = conn->proxy.name;
|
|
neg_ctx = &data->state.proxyneg;
|
|
}
|
|
else {
|
|
userp = conn->user;
|
|
passwdp = conn->passwd;
|
|
service = data->set.str[STRING_SERVICE_NAME];
|
|
host = conn->host.name;
|
|
neg_ctx = &data->state.negotiate;
|
|
}
|
|
|
|
/* Not set means empty */
|
|
if(!userp)
|
|
userp = "";
|
|
|
|
if(!passwdp)
|
|
passwdp = "";
|
|
|
|
/* Obtain the input token, if any */
|
|
header += strlen("Negotiate");
|
|
while(*header && ISSPACE(*header))
|
|
header++;
|
|
|
|
len = strlen(header);
|
|
if(!len) {
|
|
/* Is this the first call in a new negotiation? */
|
|
if(neg_ctx->context) {
|
|
/* The server rejected our authentication and hasn't suppled any more
|
|
negotiation mechanisms */
|
|
return CURLE_LOGIN_DENIED;
|
|
}
|
|
}
|
|
|
|
/* Initilise the security context and decode our challenge */
|
|
return Curl_auth_decode_spnego_message(data, userp, passwdp, service, host,
|
|
header, neg_ctx);
|
|
}
|
|
|
|
CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy)
|
|
{
|
|
struct negotiatedata *neg_ctx = proxy ? &conn->data->state.proxyneg :
|
|
&conn->data->state.negotiate;
|
|
char *base64 = NULL;
|
|
size_t len = 0;
|
|
char *userp;
|
|
CURLcode result;
|
|
|
|
result = Curl_auth_create_spnego_message(conn->data, neg_ctx, &base64, &len);
|
|
if(result)
|
|
return result;
|
|
|
|
userp = aprintf("%sAuthorization: Negotiate %s\r\n", proxy ? "Proxy-" : "",
|
|
base64);
|
|
|
|
if(proxy) {
|
|
Curl_safefree(conn->allocptr.proxyuserpwd);
|
|
conn->allocptr.proxyuserpwd = userp;
|
|
}
|
|
else {
|
|
Curl_safefree(conn->allocptr.userpwd);
|
|
conn->allocptr.userpwd = userp;
|
|
}
|
|
|
|
free(base64);
|
|
|
|
return (userp == NULL) ? CURLE_OUT_OF_MEMORY : CURLE_OK;
|
|
}
|
|
|
|
void Curl_cleanup_negotiate(struct SessionHandle *data)
|
|
{
|
|
Curl_auth_spnego_cleanup(&data->state.negotiate);
|
|
Curl_auth_spnego_cleanup(&data->state.proxyneg);
|
|
}
|
|
|
|
#endif /* !CURL_DISABLE_HTTP && USE_SPNEGO */
|