X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/5903c6ff59527362e869fedb565c56935ce8dd68..1d28cc061677bd07d9bed48dd84bd5c590247043:/src/src/auths/spa.c diff --git a/src/src/auths/spa.c b/src/src/auths/spa.c index f14ca5e54..222ccea86 100644 --- a/src/src/auths/spa.c +++ b/src/src/auths/spa.c @@ -2,8 +2,10 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2009 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ +/* Copyright (c) The Exim Maintainers 2020 */ /* See the file NOTICE for conditions of use and distribution. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* This file, which provides support for Microsoft's Secure Password Authentication, was contributed by Marc Prud'hommeaux. Tom Kistner added SPA @@ -46,13 +48,13 @@ References: optionlist auth_spa_options[] = { { "client_domain", opt_stringptr, - (void *)(offsetof(auth_spa_options_block, spa_domain)) }, + OPT_OFF(auth_spa_options_block, spa_domain) }, { "client_password", opt_stringptr, - (void *)(offsetof(auth_spa_options_block, spa_password)) }, + OPT_OFF(auth_spa_options_block, spa_password) }, { "client_username", opt_stringptr, - (void *)(offsetof(auth_spa_options_block, spa_username)) }, + OPT_OFF(auth_spa_options_block, spa_username) }, { "server_password", opt_stringptr, - (void *)(offsetof(auth_spa_options_block, spa_serverpassword)) } + OPT_OFF(auth_spa_options_block, spa_serverpassword) } }; /* Size of the options list. An extern variable has to be used so that its @@ -76,8 +78,8 @@ auth_spa_options_block auth_spa_option_defaults = { /* Dummy values */ void auth_spa_init(auth_instance *ablock) {} int auth_spa_server(auth_instance *ablock, uschar *data) {return 0;} -int auth_spa_client(auth_instance *ablock, smtp_inblock *inblock, - smtp_outblock *outblock, int timeout, uschar *buffer, int buffsize) {return 0;} +int auth_spa_client(auth_instance *ablock, void * sx, int timeout, + uschar *buffer, int buffsize) {return 0;} #else /*!MACRO_PREDEF*/ @@ -139,42 +141,35 @@ SPAAuthChallenge challenge; SPAAuthResponse response; SPAAuthResponse *responseptr = &response; uschar msgbuf[2048]; -uschar *clearpass; +uschar *clearpass, *s; +unsigned off; /* send a 334, MS Exchange style, and grab the client's request, unless we already have it via an initial response. */ -if ((*data == '\0') && - (auth_get_no64_data(&data, US"NTLM supported") != OK)) - { - /* something borked */ +if (!*data && auth_get_no64_data(&data, US"NTLM supported") != OK) return FAIL; - } -if (spa_base64_to_bits(CS (&request), sizeof(request), CCS (data)) < 0) +if (spa_base64_to_bits(CS &request, sizeof(request), CCS data) < 0) { DEBUG(D_auth) debug_printf("auth_spa_server(): bad base64 data in " - "request: %s\n", data); + "request: %s\n", data); return FAIL; } /* create a challenge and send it back */ -spa_build_auth_challenge(&request,&challenge); -spa_bits_to_base64 (msgbuf, (unsigned char*)&challenge, - spa_request_length(&challenge)); +spa_build_auth_challenge(&request, &challenge); +spa_bits_to_base64(msgbuf, US &challenge, spa_request_length(&challenge)); if (auth_get_no64_data(&data, msgbuf) != OK) - { - /* something borked */ return FAIL; - } /* dump client response */ -if (spa_base64_to_bits(CS (&response), sizeof(response), CCS (data)) < 0) +if (spa_base64_to_bits(CS &response, sizeof(response), CCS data) < 0) { DEBUG(D_auth) debug_printf("auth_spa_server(): bad base64 data in " - "response: %s\n", data); + "response: %s\n", data); return FAIL; } @@ -194,9 +189,19 @@ that causes failure if the size of msgbuf is exceeded. ****/ { int i; - char *p = ((char*)responseptr) + IVAL(&responseptr->uUser.offset,0); + char * p; int len = SVAL(&responseptr->uUser.len,0)/2; + if ( (off = IVAL(&responseptr->uUser.offset,0)) >= sizeof(SPAAuthResponse) + || len >= sizeof(responseptr->buffer)/2 + || (p = (CS responseptr) + off) + len*2 >= CS (responseptr+1) + ) + { + DEBUG(D_auth) + debug_printf("auth_spa_server(): bad uUser spec in response\n"); + return FAIL; + } + if (len + 1 >= sizeof(msgbuf)) return FAIL; for (i = 0; i < len; ++i) { @@ -221,10 +226,8 @@ debug_print_string(ablock->server_debug_string); /* customized debug */ /* look up password */ -clearpass = expand_string(ob->spa_serverpassword); -if (clearpass == NULL) - { - if (expand_string_forcedfail) +if (!(clearpass = expand_string(ob->spa_serverpassword))) + if (f.expand_string_forcedfail) { DEBUG(D_auth) debug_printf("auth_spa_server(): forced failure while " "expanding spa_serverpassword\n"); @@ -236,22 +239,25 @@ if (clearpass == NULL) "spa_serverpassword: %s\n", expand_string_message); return DEFER; } - } /* create local hash copy */ -spa_smb_encrypt (clearpass, challenge.challengeData, lmRespData); -spa_smb_nt_encrypt (clearpass, challenge.challengeData, ntRespData); +spa_smb_encrypt(clearpass, challenge.challengeData, lmRespData); +spa_smb_nt_encrypt(clearpass, challenge.challengeData, ntRespData); /* compare NT hash (LM may not be available) */ -if (memcmp(ntRespData, - ((unsigned char*)responseptr)+IVAL(&responseptr->ntResponse.offset,0), - 24) == 0) - /* success. we have a winner. */ +off = IVAL(&responseptr->ntResponse.offset,0); +if (off >= sizeof(SPAAuthResponse) - 24) { - return auth_check_serv_cond(ablock); + DEBUG(D_auth) + debug_printf("auth_spa_server(): bad ntRespData spec in response\n"); + return FAIL; } +s = (US responseptr) + off; + +if (memcmp(ntRespData, s, 24) == 0) + return auth_check_serv_cond(ablock); /* success. we have a winner. */ /* Expand server_condition as an authorization check (PH) */ @@ -268,8 +274,7 @@ return FAIL; int auth_spa_client( auth_instance *ablock, /* authenticator block */ - smtp_inblock *inblock, /* connection inblock */ - smtp_outblock *outblock, /* connection outblock */ + void * sx, /* connection */ int timeout, /* command timeout */ uschar *buffer, /* buffer for reading response */ int buffsize) /* size of buffer */ @@ -289,7 +294,7 @@ char *username, *password; if (!(username = CS expand_string(ob->spa_username))) { - if (expand_string_forcedfail) return CANCELLED; + if (f.expand_string_forcedfail) return CANCELLED; string_format(buffer, buffsize, "expansion of \"%s\" failed in %s " "authenticator: %s", ob->spa_username, ablock->name, expand_string_message); @@ -298,7 +303,7 @@ if (!(username = CS expand_string(ob->spa_username))) if (!(password = CS expand_string(ob->spa_password))) { - if (expand_string_forcedfail) return CANCELLED; + if (f.expand_string_forcedfail) return CANCELLED; string_format(buffer, buffsize, "expansion of \"%s\" failed in %s " "authenticator: %s", ob->spa_password, ablock->name, expand_string_message); @@ -306,61 +311,56 @@ if (!(password = CS expand_string(ob->spa_password))) } if (ob->spa_domain) - { if (!(domain = CS expand_string(ob->spa_domain))) { - if (expand_string_forcedfail) return CANCELLED; + if (f.expand_string_forcedfail) return CANCELLED; string_format(buffer, buffsize, "expansion of \"%s\" failed in %s " "authenticator: %s", ob->spa_domain, ablock->name, expand_string_message); return ERROR; } - } /* Original code */ -if (smtp_write_command(outblock, SCMD_FLUSH, "AUTH %s\r\n", - ablock->public_name) < 0) +if (smtp_write_command(sx, SCMD_FLUSH, "AUTH %s\r\n", ablock->public_name) < 0) return FAIL_SEND; /* wait for the 3XX OK message */ -if (!smtp_read_response(inblock, US buffer, buffsize, '3', timeout)) +if (!smtp_read_response(sx, US buffer, buffsize, '3', timeout)) return FAIL; DSPA("\n\n%s authenticator: using domain %s\n\n", ablock->name, domain); -spa_build_auth_request (&request, CS username, domain); -spa_bits_to_base64 (US msgbuf, (unsigned char*)&request, - spa_request_length(&request)); +spa_build_auth_request(&request, CS username, domain); +spa_bits_to_base64(US msgbuf, US &request, spa_request_length(&request)); DSPA("\n\n%s authenticator: sending request (%s)\n\n", ablock->name, msgbuf); /* send the encrypted password */ -if (smtp_write_command(outblock, SCMD_FLUSH, "%s\r\n", msgbuf) < 0) +if (smtp_write_command(sx, SCMD_FLUSH, "%s\r\n", msgbuf) < 0) return FAIL_SEND; /* wait for the auth challenge */ -if (!smtp_read_response(inblock, US buffer, buffsize, '3', timeout)) +if (!smtp_read_response(sx, US buffer, buffsize, '3', timeout)) return FAIL; /* convert the challenge into the challenge struct */ DSPA("\n\n%s authenticator: challenge (%s)\n\n", ablock->name, buffer + 4); -spa_base64_to_bits (CS (&challenge), sizeof(challenge), CCS (buffer + 4)); +spa_base64_to_bits(CS (&challenge), sizeof(challenge), CCS (buffer + 4)); -spa_build_auth_response (&challenge, &response, CS username, CS password); -spa_bits_to_base64 (US msgbuf, (unsigned char*)&response, - spa_request_length(&response)); +spa_build_auth_response(&challenge, &response, CS username, CS password); +spa_bits_to_base64(US msgbuf, US &response, spa_request_length(&response)); DSPA("\n\n%s authenticator: challenge response (%s)\n\n", ablock->name, msgbuf); /* send the challenge response */ -if (smtp_write_command(outblock, SCMD_FLUSH, "%s\r\n", msgbuf) < 0) +if (smtp_write_command(sx, SCMD_FLUSH, "%s\r\n", msgbuf) < 0) return FAIL_SEND; /* If we receive a success response from the server, authentication has succeeded. There may be more data to send, but is there any point in provoking an error here? */ -if (smtp_read_response(inblock, US buffer, buffsize, '2', timeout)) +if (smtp_read_response(sx, US buffer, buffsize, '2', timeout)) return OK; /* Not a success response. If errno != 0 there is some kind of transmission