X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6ce8434dcf6ff95db7bc75a97fd1144e54206dfe..6bc64765f:/mts/smtp/smtp.c?ds=inline diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c old mode 100755 new mode 100644 index 6fd178bc..7177e5d5 --- a/mts/smtp/smtp.c +++ b/mts/smtp/smtp.c @@ -9,7 +9,6 @@ #include #include "smtp.h" #include -#include #include #ifdef CYRUS_SASL @@ -26,7 +25,6 @@ #include #include #include -#include #endif /* CYRUS_SASL */ #ifdef TLS_SUPPORT @@ -99,7 +97,7 @@ static FILE *sm_wfp = NULL; static sasl_conn_t *conn = NULL; /* SASL connection state */ static int sasl_complete = 0; /* Has authentication succeded? */ static sasl_ssf_t sasl_ssf; /* Our security strength factor */ -static char *sasl_pw_context[2]; /* Context to pass into sm_get_pass */ +static char *sasl_pw_context[3]; /* Context to pass into sm_get_pass */ static int maxoutbuf; /* Maximum crypto output buffer */ static char *sasl_outbuffer; /* SASL output buffer for encryption */ static int sasl_outbuflen; /* Current length of data in outbuf */ @@ -109,10 +107,10 @@ static int sm_get_pass(sasl_conn_t *, void *, int, sasl_secret_t **); static sasl_callback_t callbacks[] = { { SASL_CB_USER, (sasl_callback_ft) sm_get_user, NULL }, #define SM_SASL_N_CB_USER 0 - { SASL_CB_PASS, (sasl_callback_ft) sm_get_pass, NULL }, -#define SM_SASL_N_CB_PASS 1 { SASL_CB_AUTHNAME, (sasl_callback_ft) sm_get_user, NULL }, -#define SM_SASL_N_CB_AUTHNAME 2 +#define SM_SASL_N_CB_AUTHNAME 1 + { SASL_CB_PASS, (sasl_callback_ft) sm_get_pass, NULL }, +#define SM_SASL_N_CB_PASS 2 { SASL_CB_LIST_END, NULL, NULL }, }; @@ -126,6 +124,8 @@ static SSL *ssl = NULL; static BIO *sbior = NULL; static BIO *sbiow = NULL; static BIO *io = NULL; + +static int tls_negotiate(void); #endif /* TLS_SUPPORT */ #if defined(CYRUS_SASL) || defined(TLS_SUPPORT) @@ -265,6 +265,25 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose, tls_active = 0; +#ifdef TLS_SUPPORT + /* + * If tls == 2, that means that the user requested "initial" TLS, + * which happens right after the connection has opened. Do that + * negotiation now + */ + + if (tls == 2) { + result = tls_negotiate(); + + /* + * Note: if tls_negotiate() fails it will call sm_end() for us, + * which closes the connection. + */ + if (result != RP_OK) + return result; + } +#endif /* TLS_SUPPORT */ + sm_alarmed = 0; alarm (SM_OPEN); result = smhear (); @@ -302,9 +321,7 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose, * restart the EHLO dialog after TLS negotiation is complete. */ - if (tls) { - BIO *ssl_bio; - + if (tls == 1) { if (! EHLOset("STARTTLS")) { sm_end(NOTOK); return sm_ierror("SMTP server does not support TLS"); @@ -322,86 +339,10 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose, * negotiation. Oblige them. */ - if (! sslctx) { - const SSL_METHOD *method; - - SSL_library_init(); - SSL_load_error_strings(); - - method = TLSv1_client_method(); /* Not sure about this */ - - sslctx = SSL_CTX_new(method); - - if (! sslctx) { - sm_end(NOTOK); - return sm_ierror("Unable to initialize OpenSSL context: %s", - ERR_error_string(ERR_get_error(), NULL)); - } - } - - ssl = SSL_new(sslctx); - - if (! ssl) { - sm_end(NOTOK); - return sm_ierror("Unable to create SSL connection: %s", - ERR_error_string(ERR_get_error(), NULL)); - } - - sbior = BIO_new_socket(fileno(sm_rfp), BIO_NOCLOSE); - sbiow = BIO_new_socket(fileno(sm_wfp), BIO_NOCLOSE); - - if (sbior == NULL || sbiow == NULL) { - sm_end(NOTOK); - return sm_ierror("Unable to create BIO endpoints: %s", - ERR_error_string(ERR_get_error(), NULL)); - } - - SSL_set_bio(ssl, sbior, sbiow); - SSL_set_connect_state(ssl); - - /* - * Set up a BIO to handle buffering for us - */ - - io = BIO_new(BIO_f_buffer()); - - if (! io) { - sm_end(NOTOK); - return sm_ierror("Unable to create a buffer BIO: %s", - ERR_error_string(ERR_get_error(), NULL)); - } - - ssl_bio = BIO_new(BIO_f_ssl()); - - if (! ssl_bio) { - sm_end(NOTOK); - return sm_ierror("Unable to create a SSL BIO: %s", - ERR_error_string(ERR_get_error(), NULL)); - } - - BIO_set_ssl(ssl_bio, ssl, BIO_CLOSE); - BIO_push(io, ssl_bio); - - /* - * Try doing the handshake now - */ - - if (BIO_do_handshake(io) < 1) { - sm_end(NOTOK); - return sm_ierror("Unable to negotiate SSL connection: %s", - ERR_error_string(ERR_get_error(), NULL)); - } + result = tls_negotiate(); - if (sm_debug) { - const SSL_CIPHER *cipher = SSL_get_current_cipher(ssl); - printf("SSL negotiation successful: %s(%d) %s\n", - SSL_CIPHER_get_name(cipher), - SSL_CIPHER_get_bits(cipher, NULL), - SSL_CIPHER_get_version(cipher)); - - } - - tls_active = 1; + if (result != RP_OK) + return result; doingEHLO = 1; result = smtalk (SM_HELO, "EHLO %s", client); @@ -877,17 +818,12 @@ sm_auth_sasl(char *user, int saslssf, char *mechlist, char *inhost) sasl_security_properties_t secprops; sasl_ssf_t *ssf; int *outbufmax; + struct nmh_creds creds = { 0, 0, 0 }; /* * Initialize the callback contexts */ - if (user == NULL) - user = getusername(); - - callbacks[SM_SASL_N_CB_USER].context = user; - callbacks[SM_SASL_N_CB_AUTHNAME].context = user; - /* * This is a _bit_ of a hack ... but if the hostname wasn't supplied * to us on the command line, then call getpeername and do a @@ -918,8 +854,15 @@ sm_auth_sasl(char *user, int saslssf, char *mechlist, char *inhost) strncpy(host, inhost, sizeof(host) - 1); } + nmh_get_credentials (host, user, 0, &creds); + + /* It's OK to copy the creds pointers here. The callbacks that + use them will only be called before this function returns. */ + callbacks[SM_SASL_N_CB_USER].context = creds.user; + callbacks[SM_SASL_N_CB_AUTHNAME].context = creds.user; sasl_pw_context[0] = host; - sasl_pw_context[1] = user; + sasl_pw_context[1] = creds.user; + sasl_pw_context[2] = creds.password; callbacks[SM_SASL_N_CB_PASS].context = sasl_pw_context; @@ -1020,7 +963,6 @@ sm_auth_sasl(char *user, int saslssf, char *mechlist, char *inhost) } else { result = sasl_decode64(sm_reply.text, sm_reply.length, outbuf, sizeof(outbuf), &outlen); - if (result != SASL_OK) { smtalk(SM_AUTH, "*"); sm_ierror("SASL base64 decode failed: %s", @@ -1129,7 +1071,6 @@ sm_get_pass(sasl_conn_t *conn, void *context, int id, sasl_secret_t **psecret) { char **pw_context = (char **) context; - char *pass = NULL; int len; NMH_UNUSED (conn); @@ -1137,20 +1078,14 @@ sm_get_pass(sasl_conn_t *conn, void *context, int id, if (! psecret || id != SASL_CB_PASS) return SASL_BADPARAM; - ruserpass(pw_context[0], &(pw_context[1]), &pass); - - len = strlen(pass); - - *psecret = (sasl_secret_t *) malloc(sizeof(sasl_secret_t) + len); + len = strlen (pw_context[2]); - if (! *psecret) { - free(pass); + if (! (*psecret = (sasl_secret_t *) malloc(sizeof(sasl_secret_t) + len))) { return SASL_NOMEM; } (*psecret)->len = len; - strcpy((char *) (*psecret)->data, pass); -/* free(pass); */ + strcpy((char *) (*psecret)->data, pw_context[2]); return SASL_OK; } @@ -1312,6 +1247,102 @@ sm_fwrite(char *buffer, int len) return ferror(sm_wfp) ? NOTOK : RP_OK; } +#ifdef TLS_SUPPORT +/* + * Negotiate Transport Layer Security + */ + +static int +tls_negotiate(void) +{ + BIO *ssl_bio; + + if (! sslctx) { + const SSL_METHOD *method; + + SSL_library_init(); + SSL_load_error_strings(); + + method = TLSv1_client_method(); /* Not sure about this */ + + /* Older ssl takes a non-const arg. */ + sslctx = SSL_CTX_new((SSL_METHOD *) method); + + if (! sslctx) { + sm_end(NOTOK); + return sm_ierror("Unable to initialize OpenSSL context: %s", + ERR_error_string(ERR_get_error(), NULL)); + } + } + + ssl = SSL_new(sslctx); + + if (! ssl) { + sm_end(NOTOK); + return sm_ierror("Unable to create SSL connection: %s", + ERR_error_string(ERR_get_error(), NULL)); + } + + sbior = BIO_new_socket(fileno(sm_rfp), BIO_NOCLOSE); + sbiow = BIO_new_socket(fileno(sm_wfp), BIO_NOCLOSE); + + if (sbior == NULL || sbiow == NULL) { + sm_end(NOTOK); + return sm_ierror("Unable to create BIO endpoints: %s", + ERR_error_string(ERR_get_error(), NULL)); + } + + SSL_set_bio(ssl, sbior, sbiow); + SSL_set_connect_state(ssl); + + /* + * Set up a BIO to handle buffering for us + */ + + io = BIO_new(BIO_f_buffer()); + + if (! io) { + sm_end(NOTOK); + return sm_ierror("Unable to create a buffer BIO: %s", + ERR_error_string(ERR_get_error(), NULL)); + } + + ssl_bio = BIO_new(BIO_f_ssl()); + + if (! ssl_bio) { + sm_end(NOTOK); + return sm_ierror("Unable to create a SSL BIO: %s", + ERR_error_string(ERR_get_error(), NULL)); + } + + BIO_set_ssl(ssl_bio, ssl, BIO_CLOSE); + BIO_push(io, ssl_bio); + + /* + * Try doing the handshake now + */ + + if (BIO_do_handshake(io) < 1) { + sm_end(NOTOK); + return sm_ierror("Unable to negotiate SSL connection: %s", + ERR_error_string(ERR_get_error(), NULL)); + } + + if (sm_debug) { + const SSL_CIPHER *cipher = SSL_get_current_cipher(ssl); + printf("SSL negotiation successful: %s(%d) %s\n", + SSL_CIPHER_get_name(cipher), + SSL_CIPHER_get_bits(cipher, NULL), + SSL_CIPHER_get_version(cipher)); + + } + + tls_active = 1; + + return RP_OK; +} +#endif /* TLS_SUPPORT */ + /* * Convenience functions to replace occurences of fputs() and fputc() */