curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-28 15:06:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

http NTLM: Tidied up http_ntlm prior to splitting the ntlm specific code

Browse Source
This commit is contained in:
Steve Holme 2011-08-09 22:53:48 +02:00 committed by Yang Tse
parent 209cf2df37
commit 5ed17de326
3 changed files with 149 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
lib/http_ntlm.c
View File

@ -164,7 +164,7 @@ static unsigned int readint_le(unsigned char *buf) /* must point to a
#if DEBUG_ME #if DEBUG_ME
# define DEBUG_OUT(x) x # define DEBUG_OUT(x) x
static void print_flags(FILE *handle, unsigned long flags) static void ntlm_print_flags(FILE *handle, unsigned long flags)
{ {
if(flags & NTLMFLAG_NEGOTIATE_UNICODE) if(flags & NTLMFLAG_NEGOTIATE_UNICODE)
fprintf(handle, "NTLMFLAG_NEGOTIATE_UNICODE "); fprintf(handle, "NTLMFLAG_NEGOTIATE_UNICODE ");
@ -232,7 +232,7 @@ static void print_flags(FILE *handle, unsigned long flags)
fprintf(handle, "NTLMFLAG_NEGOTIATE_56 "); fprintf(handle, "NTLMFLAG_NEGOTIATE_56 ");
} }
static void print_hex(FILE *handle, const char *buf, size_t len) static void ntlm_print_hex(FILE *handle, const char *buf, size_t len)
{ {
const char *p = buf; const char *p = buf;
fprintf(stderr, "0x"); fprintf(stderr, "0x");
@ -328,9 +328,9 @@ CURLntlm Curl_input_ntlm(struct connectdata *conn,
DEBUG_OUT({ DEBUG_OUT({
fprintf(stderr, "**** TYPE2 header flags=0x%08.8lx ", ntlm->flags); fprintf(stderr, "**** TYPE2 header flags=0x%08.8lx ", ntlm->flags);
print_flags(stderr, ntlm->flags); ntlm_print_flags(stderr, ntlm->flags);
fprintf(stderr, "\n nonce="); fprintf(stderr, "\n nonce=");
print_hex(stderr, (char *)ntlm->nonce, 8); ntlm_print_hex(stderr, (char *)ntlm->nonce, 8);
fprintf(stderr, "\n****\n"); fprintf(stderr, "\n****\n");
fprintf(stderr, "**** Header %s\n ", header); fprintf(stderr, "**** Header %s\n ", header);
}); });
@ -632,13 +632,11 @@ static CURLcode mk_nt_hash(struct SessionHandle *data,
} }
#endif #endif
#endif #endif
#ifdef USE_WINDOWS_SSPI #ifdef USE_WINDOWS_SSPI
static void static void ntlm_sspi_cleanup(struct ntlmdata *ntlm)
ntlm_sspi_cleanup(struct ntlmdata *ntlm)
{ {
if(ntlm->type_2) { if(ntlm->type_2) {
free(ntlm->type_2); free(ntlm->type_2);
@ -1007,8 +1005,8 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
const char *domain = ""; /* empty */ const char *domain = ""; /* empty */
char host[HOSTNAME_MAX + 1] = ""; /* empty */ char host[HOSTNAME_MAX + 1] = ""; /* empty */
#ifndef USE_WINDOWS_SSPI #ifndef USE_WINDOWS_SSPI
size_t domlen = strlen(domain); size_t domlen = 0;
size_t hostlen = strlen(host); size_t hostlen = 0;
size_t hostoff; /* host name offset */ size_t hostoff; /* host name offset */
size_t domoff; /* domain name offset */ size_t domoff; /* domain name offset */
#endif #endif
@ -1024,6 +1022,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
/* point to the name and password for this */ /* point to the name and password for this */
const char *userp; const char *userp;
const char *passwdp; const char *passwdp;
/* point to the correct struct with this */ /* point to the correct struct with this */
struct ntlmdata *ntlm; struct ntlmdata *ntlm;
struct auth *authp; struct auth *authp;
@ -1078,7 +1077,9 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
SECURITY_STATUS status; SECURITY_STATUS status;
ULONG attrs; ULONG attrs;
const char *user; const char *user;
int domlen; size_t domlen = 0;
size_t userlen = 0;
size_t passwdlen = 0;
TimeStamp tsDummy; /* For Windows 9x compatibility of SPPI calls */ TimeStamp tsDummy; /* For Windows 9x compatibility of SPPI calls */
ntlm_sspi_cleanup(ntlm); ntlm_sspi_cleanup(ntlm);
@ -1098,7 +1099,13 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
domlen = 0; domlen = 0;
} }
if(user && *user) { if(user)
userlen = strlen(user);
if(passwdp)
passwdlen = strlen(passwdp);
if(userlen > 0) {
/* note: initialize all of this before doing the mallocs so that /* note: initialize all of this before doing the mallocs so that
* it can be cleaned up later without leaking memory. * it can be cleaned up later without leaking memory.
*/ */
@ -1106,12 +1113,15 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
memset(ntlm->p_identity, 0, sizeof(*ntlm->p_identity)); memset(ntlm->p_identity, 0, sizeof(*ntlm->p_identity));
if((ntlm->identity.User = (unsigned char *)strdup(user)) == NULL) if((ntlm->identity.User = (unsigned char *)strdup(user)) == NULL)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
ntlm->identity.UserLength = strlen(user);
ntlm->identity.UserLength = userlen;
if((ntlm->identity.Password = (unsigned char *)strdup(passwdp)) == NULL) if((ntlm->identity.Password = (unsigned char *)strdup(passwdp)) == NULL)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
ntlm->identity.PasswordLength = strlen(passwdp); ntlm->identity.PasswordLength = strlen(passwdp);
if((ntlm->identity.Domain = malloc(domlen + 1)) == NULL) if((ntlm->identity.Domain = malloc(domlen + 1)) == NULL)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
strncpy((char *)ntlm->identity.Domain, domain, domlen); strncpy((char *)ntlm->identity.Domain, domain, domlen);
ntlm->identity.Domain[domlen] = '\0'; ntlm->identity.Domain[domlen] = '\0';
ntlm->identity.DomainLength = domlen; ntlm->identity.DomainLength = domlen;
@ -1121,10 +1131,9 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
ntlm->p_identity = NULL; ntlm->p_identity = NULL;
} }
if(s_pSecFn->AcquireCredentialsHandleA( if(s_pSecFn->AcquireCredentialsHandleA(NULL, (char *)"NTLM", SECPKG_CRED_OUTBOUND,
NULL, (char *)"NTLM", SECPKG_CRED_OUTBOUND, NULL, ntlm->p_identity, NULL, ntlm->p_identity, NULL, NULL,
NULL, NULL, &ntlm->handle, &tsDummy &ntlm->handle, &tsDummy) != SEC_E_OK) {
) != SEC_E_OK) {
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
} }
@ -1145,8 +1154,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
&ntlm->c_handle, &desc, &ntlm->c_handle, &desc,
&attrs, &tsDummy); &attrs, &tsDummy);
if(status == SEC_I_COMPLETE_AND_CONTINUE || if(status == SEC_I_COMPLETE_AND_CONTINUE || status == SEC_I_CONTINUE_NEEDED) {
status == SEC_I_CONTINUE_NEEDED) {
s_pSecFn->CompleteAuthToken(&ntlm->c_handle, &desc); s_pSecFn->CompleteAuthToken(&ntlm->c_handle, &desc);
} }
else if(status != SEC_E_OK) { else if(status != SEC_E_OK) {
@ -1179,7 +1187,8 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
#else #else
#define NTLM2FLAG 0 #define NTLM2FLAG 0
#endif #endif
snprintf((char *)ntlmbuf, sizeof(ntlmbuf), NTLMSSP_SIGNATURE "%c" snprintf((char *)ntlmbuf, sizeof(ntlmbuf),
NTLMSSP_SIGNATURE "%c"
"\x01%c%c%c" /* 32-bit type = 1 */ "\x01%c%c%c" /* 32-bit type = 1 */
"%c%c%c%c" /* 32-bit NTLM flag field */ "%c%c%c%c" /* 32-bit NTLM flag field */
"%c%c" /* domain length */ "%c%c" /* domain length */
@ -1195,13 +1204,11 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
0, /* trailing zero */ 0, /* trailing zero */
0, 0, 0, /* part of type-1 long */ 0, 0, 0, /* part of type-1 long */
LONGQUARTET( LONGQUARTET(NTLMFLAG_NEGOTIATE_OEM |
NTLMFLAG_NEGOTIATE_OEM|
NTLMFLAG_REQUEST_TARGET | NTLMFLAG_REQUEST_TARGET |
NTLMFLAG_NEGOTIATE_NTLM_KEY | NTLMFLAG_NEGOTIATE_NTLM_KEY |
NTLM2FLAG | NTLM2FLAG |
NTLMFLAG_NEGOTIATE_ALWAYS_SIGN NTLMFLAG_NEGOTIATE_ALWAYS_SIGN),
),
SHORTPAIR(domlen), SHORTPAIR(domlen),
SHORTPAIR(domlen), SHORTPAIR(domlen),
SHORTPAIR(domoff), SHORTPAIR(domoff),
@ -1210,7 +1217,8 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
SHORTPAIR(hostlen), SHORTPAIR(hostlen),
SHORTPAIR(hostoff), SHORTPAIR(hostoff),
0, 0, 0, 0,
host /* this is empty */, domain /* this is empty */); host, /* this is empty */
domain /* this is empty */);
/* initial packet length */ /* initial packet length */
size = 32 + hostlen + domlen; size = 32 + hostlen + domlen;
@ -1229,7 +1237,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
NTLMFLAG_NEGOTIATE_NTLM_KEY | NTLMFLAG_NEGOTIATE_NTLM_KEY |
NTLM2FLAG | NTLM2FLAG |
NTLMFLAG_NEGOTIATE_ALWAYS_SIGN); NTLMFLAG_NEGOTIATE_ALWAYS_SIGN);
print_flags(stderr, ntlm_print_flags(stderr,
NTLMFLAG_NEGOTIATE_OEM | NTLMFLAG_NEGOTIATE_OEM |
NTLMFLAG_REQUEST_TARGET | NTLMFLAG_REQUEST_TARGET |
NTLMFLAG_NEGOTIATE_NTLM_KEY | NTLMFLAG_NEGOTIATE_NTLM_KEY |
@ -1274,8 +1282,10 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
{ {
#ifdef USE_WINDOWS_SSPI #ifdef USE_WINDOWS_SSPI
SecBuffer type_2, type_3; SecBuffer type_2;
SecBufferDesc type_2_desc, type_3_desc; SecBuffer type_3;
SecBufferDesc type_2_desc;
SecBufferDesc type_3_desc;
SECURITY_STATUS status; SECURITY_STATUS status;
ULONG attrs; ULONG attrs;
TimeStamp tsDummy; /* For Windows 9x compatibility of SPPI calls */ TimeStamp tsDummy; /* For Windows 9x compatibility of SPPI calls */
@ -1321,7 +1331,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
bool unicode = (ntlm->flags & NTLMFLAG_NEGOTIATE_UNICODE) ? TRUE : FALSE; bool unicode = (ntlm->flags & NTLMFLAG_NEGOTIATE_UNICODE) ? TRUE : FALSE;
size_t useroff; size_t useroff;
const char *user; const char *user;
size_t userlen; size_t userlen = 0;
CURLcode res; CURLcode res;
user = strchr(userp, '\\'); user = strchr(userp, '\\');
@ -1335,6 +1345,8 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
} }
else else
user = userp; user = userp;
if(user)
userlen = strlen(user); userlen = strlen(user);
if(Curl_gethostname(host, HOSTNAME_MAX)) { if(Curl_gethostname(host, HOSTNAME_MAX)) {
@ -1384,6 +1396,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
/* 8 bytes random data as challenge in lmresp */ /* 8 bytes random data as challenge in lmresp */
memcpy(lmresp, entropy, 8); memcpy(lmresp, entropy, 8);
/* Pad with zeros */ /* Pad with zeros */
memset(lmresp + 8, 0, 0x10); memset(lmresp + 8, 0, 0x10);
@ -1450,7 +1463,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
/* Create the big type-3 message binary blob */ /* Create the big type-3 message binary blob */
size = snprintf((char *)ntlmbuf, sizeof(ntlmbuf), size = snprintf((char *)ntlmbuf, sizeof(ntlmbuf),
NTLMSSP_SIGNATURE "%c" NTLMSSP_SIGNATURE "%c"
"\x03%c%c%c" /* type-3, 32 bits */ "\x03%c%c%c" /* 32-bit type = 3 */
"%c%c" /* LanManager length */ "%c%c" /* LanManager length */
"%c%c" /* LanManager allocated space */ "%c%c" /* LanManager allocated space */
@ -1482,14 +1495,14 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
"%c%c" /* session key offset (unknown purpose) */ "%c%c" /* session key offset (unknown purpose) */
"%c%c" /* 2 zeroes */ "%c%c" /* 2 zeroes */
"%c%c%c%c" /* flags */ "%c%c%c%c", /* flags */
/* domain string */ /* domain string */
/* user string */ /* user string */
/* host string */ /* host string */
/* LanManager response */ /* LanManager response */
/* NT response */ /* NT response */
,
0, /* zero termination */ 0, /* zero termination */
0, 0, 0, /* type-3 long, the 24 upper bits */ 0, 0, 0, /* type-3 long, the 24 upper bits */
@ -1533,6 +1546,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
DEBUGASSERT(size==64); DEBUGASSERT(size==64);
DEBUGASSERT(size == (size_t)lmrespoff); DEBUGASSERT(size == (size_t)lmrespoff);
/* We append the binary hashes */ /* We append the binary hashes */
if(size < (sizeof(ntlmbuf) - 0x18)) { if(size < (sizeof(ntlmbuf) - 0x18)) {
memcpy(&ntlmbuf[size], lmresp, 0x18); memcpy(&ntlmbuf[size], lmresp, 0x18);
@ -1541,7 +1555,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
DEBUG_OUT({ DEBUG_OUT({
fprintf(stderr, "**** TYPE3 header lmresp="); fprintf(stderr, "**** TYPE3 header lmresp=");
print_hex(stderr, (char *)&ntlmbuf[lmrespoff], 0x18); ntlm_print_hex(stderr, (char *)&ntlmbuf[lmrespoff], 0x18);
}); });
#if USE_NTRESPONSES #if USE_NTRESPONSES
@ -1553,7 +1567,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
DEBUG_OUT({ DEBUG_OUT({
fprintf(stderr, "\n ntresp="); fprintf(stderr, "\n ntresp=");
print_hex(stderr, (char *)&ntlmbuf[ntrespoff], 0x18); ntlm_print_hex(stderr, (char *)&ntlmbuf[ntrespoff], 0x18);
}); });
#endif #endif
@ -1561,11 +1575,10 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
DEBUG_OUT({ DEBUG_OUT({
fprintf(stderr, "\n flags=0x%02.2x%02.2x%02.2x%02.2x 0x%08.8x ", fprintf(stderr, "\n flags=0x%02.2x%02.2x%02.2x%02.2x 0x%08.8x ",
LONGQUARTET(ntlm->flags), ntlm->flags); LONGQUARTET(ntlm->flags), ntlm->flags);
print_flags(stderr, ntlm->flags); ntlm_print_flags(stderr, ntlm->flags);
fprintf(stderr, "\n****\n"); fprintf(stderr, "\n****\n");
}); });
/* Make sure that the domain, user and host strings fit in the target /* Make sure that the domain, user and host strings fit in the target
buffer before we copy them there. */ buffer before we copy them there. */
if(size + userlen + domlen + hostlen >= sizeof(ntlmbuf)) { if(size + userlen + domlen + hostlen >= sizeof(ntlmbuf)) {
@ -1638,9 +1651,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
return CURLE_OK; return CURLE_OK;
} }
void Curl_http_ntlm_cleanup(struct connectdata *conn)
void
Curl_ntlm_cleanup(struct connectdata *conn)
{ {
#ifdef USE_WINDOWS_SSPI #ifdef USE_WINDOWS_SSPI
ntlm_sspi_cleanup(&conn->ntlm); ntlm_sspi_cleanup(&conn->ntlm);
@ -1653,6 +1664,5 @@ Curl_ntlm_cleanup(struct connectdata *conn)
#endif #endif
} }
#endif /* USE_NTLM */ #endif /* USE_NTLM */
#endif /* !CURL_DISABLE_HTTP */ #endif /* !CURL_DISABLE_HTTP */

5
lib/http_ntlm.h
View File

@ -44,10 +44,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn, bool proxy);
CURLcode Curl_output_ntlm_sso(struct connectdata *conn, bool proxy); CURLcode Curl_output_ntlm_sso(struct connectdata *conn, bool proxy);
#endif #endif
void Curl_ntlm_cleanup(struct connectdata *conn); void Curl_http_ntlm_cleanup(struct connectdata *conn);
#ifndef USE_NTLM
#define Curl_ntlm_cleanup(x)
#endif
/* Flag bits definitions based on http://davenport.sourceforge.net/ntlm.html */ /* Flag bits definitions based on http://davenport.sourceforge.net/ntlm.html */

4
lib/url.c
View File

@ -2617,7 +2617,9 @@ CURLcode Curl_disconnect(struct connectdata *conn, bool dead_connection)
if(has_host_ntlm || has_proxy_ntlm) { if(has_host_ntlm || has_proxy_ntlm) {
data->state.authproblem = FALSE; data->state.authproblem = FALSE;
Curl_ntlm_cleanup(conn); #ifdef USE_NTLM
Curl_http_ntlm_cleanup(conn);
#endif
} }
} }