X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_libesmtp.c;h=7142fbdcc8c7cad594991b4e9ec116afa790c477;hp=a0674cd76e7a645cc3851ab34d9e567c6a941af6;hb=e518a71f587454ec71cbdd6b37246f77235d4143;hpb=28c2fbe53cf73c57fd80bf332b4f4674ee09198b diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c index a0674cd..7142fbd 100644 --- a/mutt_libesmtp.c +++ b/mutt_libesmtp.c @@ -2,28 +2,26 @@ * 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. */ -#if HAVE_CONFIG_H -#include "config.h" -#endif + +#include + +#include #include "mutt.h" -#include "ascii.h" -#include "enter.h" -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" #if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H)) #include #endif -#include - #include #include @@ -49,6 +47,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 @@ -88,7 +88,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; @@ -144,7 +144,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); @@ -158,7 +158,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; @@ -168,16 +168,18 @@ static const char *_mutt_libesmtp_messagefp_cb (void **buf, int *len, return *buf; } -#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H)) 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 */ } -#endif -void event_cb (smtp_session_t session, int event_no, void *arg,...) +static void event_cb (smtp_session_t session, int event_no, void *arg,...) { va_list alist; int *ok; @@ -226,21 +228,77 @@ void event_cb (smtp_session_t session, int event_no, void *arg,...) 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 event: %d - ignored."), event_no); + 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 */ @@ -252,6 +310,7 @@ 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 (); @@ -268,8 +327,8 @@ int mutt_invoke_libesmtp (ADDRESS * from, /* the sender */ /* Create hostname:port string and tell libesmtp */ /* len = SmtpHost len + colon + max port (65536 => 5 chars) + terminator */ - hostportlen = str_len (SmtpHost) + 7; - hostportstr = mem_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"); @@ -291,10 +350,21 @@ int mutt_invoke_libesmtp (ADDRESS * from, /* the sender */ 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)) @@ -318,10 +388,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)