X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_libesmtp.c;h=e8786d9672dc8d8e4593b2871069646939b1bd71;hp=a8eb110322fba8fcd169d66511b989b72a786865;hb=2bffc6c0ec2984441f8f66e23af8d3215f7a6f84;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281 diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c index a8eb110..e8786d9 100644 --- a/mutt_libesmtp.c +++ b/mutt_libesmtp.c @@ -1,5 +1,28 @@ +/* + * Copyright notice from original mutt: + * [none] + * + * Parts were written/modified by: + * Christian Gall + * Rocco Rutte + * + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. + */ + +#include + +#include +#include + #include "mutt.h" -#include +#include "mutt_libesmtp.h" + +#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H)) +#include +#endif + #include #include @@ -25,6 +48,8 @@ static char authpass[STRING] = ""; _mutt_libesmtp_perror(msg); \ FAIL(); \ } while (0) +#define extna(msg) { mutt_error (_("SMTP Extension '%s' not supported by MTA."), \ + msg); sleep (1); } /* * _mutt_libesmtp_ensure_init @@ -64,7 +89,7 @@ static void _mutt_libesmtp_perror (const char *msg) * Very similar to sendlib.c::add_args */ static int -_mutt_libesmtp_add_recipients (smtp_message_t message, ADDRESS * addr) +_mutt_libesmtp_add_recipients (smtp_message_t message, address_t * addr) { int ret = 0; @@ -82,7 +107,8 @@ Done: static int _mutt_libesmtp_auth_interact (auth_client_request_t request, - char **result, int fields, void *arg) + char **result, int fields, + void *arg __attribute__ ((unused))) { int i; @@ -101,7 +127,8 @@ _mutt_libesmtp_auth_interact (auth_client_request_t request, snprintf (prompt, sizeof (prompt), "%s%s: ", request[i].prompt, (request[i]. flags & AUTH_CLEARTEXT) ? " (not encrypted)" : ""); - mutt_get_password (prompt, authpass, sizeof (authpass)); + mutt_get_field_unbuffered (prompt, authpass, sizeof (authpass), + M_PASS); } result[i] = authpass; } @@ -119,7 +146,7 @@ static const char *_mutt_libesmtp_messagefp_cb (void **buf, int *len, int octets; if (*buf == NULL) - *buf = malloc (BUFLEN); + *buf = xmalloc(BUFLEN); if (len == NULL) { rewind ((FILE *) arg); @@ -133,7 +160,7 @@ static const char *_mutt_libesmtp_messagefp_cb (void **buf, int *len, char *p = strchr (*buf, '\0'); if (p[-1] == '\n' && p[-2] != '\r') { - strcpy (p - 1, "\r\n"); + m_strcpy(p - 1, (char *) *buf + BUFLEN - p + 1, "\r\n"); p++; } octets = p - (char *) *buf; @@ -143,14 +170,138 @@ static const char *_mutt_libesmtp_messagefp_cb (void **buf, int *len, return *buf; } +static int handle_invalid_peer_certificate (long vfy_result) { +#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H)) + mutt_error (_("Error verifying certificate: %s"), + NONULL (X509_verify_cert_error_string (vfy_result))); +#else + mutt_error (_("Error verifying certificate. Error Code: %lu"), vfy_result); +#endif + sleep(2); + return 1; /* Accept the problem */ +} + +static void event_cb (smtp_session_t session __attribute__ ((unused)), + int event_no, void *arg,...) +{ + va_list alist; + int *ok; + + va_start(alist, arg); + switch(event_no) { + case SMTP_EV_CONNECT: + case SMTP_EV_MAILSTATUS: + case SMTP_EV_RCPTSTATUS: + case SMTP_EV_MESSAGEDATA: + case SMTP_EV_MESSAGESENT: + case SMTP_EV_DISCONNECT: break; + case SMTP_EV_WEAK_CIPHER: { + int bits; + bits = va_arg(alist, long); ok = va_arg(alist, int*); + mutt_message (_("SMTP_EV_WEAK_CIPHER, bits=%d - accepted."), bits); + sleep(1); + *ok = 1; break; + } + case SMTP_EV_STARTTLS_OK: + mutt_message (_("Using TLS")); + sleep(1); + break; + case SMTP_EV_INVALID_PEER_CERTIFICATE: { + long vfy_result; + vfy_result = va_arg(alist, long); ok = va_arg(alist, int*); + *ok = handle_invalid_peer_certificate(vfy_result); + sleep(1); + break; + } + case SMTP_EV_NO_PEER_CERTIFICATE: { + ok = va_arg(alist, int*); + mutt_message (_("SMTP_EV_NO_PEER_CERTIFICATE - accepted.")); + sleep(1); + *ok = 1; break; + } + case SMTP_EV_WRONG_PEER_CERTIFICATE: { + ok = va_arg(alist, int*); + mutt_message (_("SMTP_EV_WRONG_PEER_CERTIFICATE - accepted.")); + sleep(1); + *ok = 1; break; + } + case SMTP_EV_NO_CLIENT_CERTIFICATE: { + ok = va_arg(alist, int*); + mutt_message (_("SMTP_EV_NO_CLIENT_CERTIFICATE - accepted.")); + sleep(1); + *ok = 1; break; + } + case SMTP_EV_EXTNA_DSN: + extna ("DSN"); + break; + case SMTP_EV_EXTNA_STARTTLS: + extna ("StartTLS"); + break; + case SMTP_EV_EXTNA_8BITMIME: + extna ("8BITMIME"); + break; + default: + mutt_message(_("Got unhandled event ID = %d - ignored."), event_no); + sleep(1); + } + va_end(alist); +} + +static void do_dsn_notify (smtp_message_t message, const char* from) { + int flags = Notify_NOTSET; + smtp_recipient_t self = NULL; + + if (m_strisempty(DsnNotify) || !message || m_strisempty(from) || + strstr (DsnNotify, "never") != NULL) + return; + + if (strstr (DsnNotify, "failure") != NULL) + flags |= Notify_FAILURE; + if (strstr (DsnNotify, "delay") != NULL) + flags |= Notify_DELAY; + if (strstr (DsnNotify, "success") != NULL) + flags |= Notify_SUCCESS; + + if (flags != Notify_NOTSET) { + if (!(self = smtp_add_recipient (message, from))) + return; + smtp_dsn_set_notify (self, flags); + } +} + +static void do_dsn_ret (smtp_message_t message) { + if (m_strisempty(DsnReturn) || !message) + return; + if (ascii_strncasecmp (DsnReturn, "hdrs", 4) == 0) + smtp_dsn_set_ret (message, Ret_HDRS); + else if (ascii_strncasecmp (DsnReturn, "full", 4) == 0) + smtp_dsn_set_ret (message, Ret_FULL); +} + +#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS)) +int mutt_libesmtp_check_usetls (const char* option, unsigned long p, + char* errbuf, size_t errlen) { + char* val = (char*) p; + if (m_strisempty(val)) + return (1); + if (m_strncmp(val, "enabled", 7) != 0 && + m_strncmp(val, "required", 8) != 0) { + if (errbuf) + snprintf (errbuf, errlen, _("'%s' is invalid for %s"), val, option); + return (0); + } + return (1); +} +#endif + /* - * mutt_invoke_libesmtp + * mutt_libesmtp_invoke * Sends a mail message to the provided recipients using libesmtp. * Returns 0 upon success, -1 upon failure (and prints an error * message). */ -int mutt_invoke_libesmtp (ADDRESS * from, /* the sender */ - ADDRESS * to, ADDRESS * cc, ADDRESS * bcc, /* recips */ +int mutt_libesmtp_invoke (address_t * from, /* the sender */ + address_t * to, address_t * cc, address_t * bcc, /* recips */ const char *msg, /* file containing message */ int eightbit) { /* message contains 8bit chars */ @@ -162,16 +313,25 @@ int mutt_invoke_libesmtp (ADDRESS * from, /* the sender */ FILE *fp = NULL; auth_context_t authctx = NULL; const smtp_status_t *status; + char* envfrom = from->mailbox; _mutt_libesmtp_ensure_init (); if ((session = smtp_create_session ()) == NULL) SMTPFAIL ("smtp_create_session"); +#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H)) + if (SmtpUseTLS != NULL && ascii_strncasecmp("enabled", SmtpUseTLS, 7) == 0) { + smtp_starttls_enable(session, Starttls_ENABLED); + } else if (SmtpUseTLS != NULL && ascii_strncasecmp("required", SmtpUseTLS, 8) == 0) { + smtp_starttls_enable(session, Starttls_REQUIRED); + } +#endif + /* Create hostname:port string and tell libesmtp */ /* len = SmtpHost len + colon + max port (65536 => 5 chars) + terminator */ - hostportlen = strlen (SmtpHost) + 7; - hostportstr = safe_malloc (hostportlen); + hostportlen = m_strlen(SmtpHost) + 7; + hostportstr = p_new(char, hostportlen); snprintf (hostportstr, hostportlen, "%s:%d", SmtpHost, SmtpPort); if (!smtp_set_server (session, hostportstr)) SMTPFAIL ("smtp_set_server"); @@ -186,12 +346,28 @@ int mutt_invoke_libesmtp (ADDRESS * from, /* the sender */ SMTPFAIL ("smtp_auth_set_context"); } +#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H)) + smtp_starttls_set_ctx (session, NULL); +#endif + smtp_set_eventcb (session, event_cb, NULL); + if ((message = smtp_add_message (session)) == NULL) SMTPFAIL ("smtp_add_message"); + /* Initialize envelope sender */ - if (!smtp_set_reverse_path (message, from->mailbox)) + if (option (OPTENVFROM) && EnvFrom) + envfrom = EnvFrom->mailbox; + if (!smtp_set_reverse_path (message, envfrom)) SMTPFAIL ("smtp_set_reverse_path"); + /* set up DSN for message */ + do_dsn_notify (message, envfrom); + do_dsn_ret (message); + + /* set up 8bitmime flag */ + if (eightbit && option (OPTUSE8BITMIME)) + smtp_8bitmime_set_body (message, E8bitmime_8BITMIME); + if ((fp = fopen (msg, "r")) == NULL) LIBCFAIL ("fopen"); if (!smtp_set_messagecb (message, _mutt_libesmtp_messagefp_cb, fp)) @@ -215,10 +391,9 @@ int mutt_invoke_libesmtp (ADDRESS * from, /* the sender */ } Done: - if (fp != NULL) - fclose (fp); + m_fclose(&fp); if (hostportstr != NULL) - free (hostportstr); + p_delete(&hostportstr); if (session != NULL) smtp_destroy_session (session); if (authctx != NULL)