/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "defs.h"
#include <glib.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtksignal.h>
+#include <gtk/gtkwindow.h>
+#include <gtk/gtkclist.h>
#include <stdio.h>
#include <string.h>
+#include <sys/time.h>
+#include <unistd.h>
#include "intl.h"
#include "send.h"
#include "socket.h"
+#include "ssl.h"
#include "smtp.h"
+#include "esmtp.h"
+#include "prefs_common.h"
#include "prefs_account.h"
#include "account.h"
#include "compose.h"
+#include "progressdialog.h"
+#include "inputdialog.h"
+#include "manage_window.h"
#include "procmsg.h"
#include "procheader.h"
#include "utils.h"
+#include "gtkutils.h"
-#define SMTP_PORT 25
+typedef struct _SendProgressDialog SendProgressDialog;
-static gint send_message_smtp (GSList *to_list, const gchar *from,
- const gchar *server, gushort port,
- const gchar *domain, const gchar *userid,
- const gchar *passwd, gboolean use_smtp_auth,
- FILE *fp);
-static gint send_smtp_open (const gchar *server, gushort port,
+struct _SendProgressDialog
+{
+ ProgressDialog *dialog;
+ GList *queue_list;
+ gboolean cancelled;
+};
+
+#if USE_SSL
+static SockInfo *send_smtp_open (const gchar *server, gushort port,
+ const gchar *domain, gboolean use_smtp_auth,
+ SSLSMTPType ssl_type);
+#else
+static SockInfo *send_smtp_open (const gchar *server, gushort port,
const gchar *domain, gboolean use_smtp_auth);
+#endif
-#define SEND_EXIT_IF_ERROR(f, s) \
-{ \
- if ((f) < 0) { \
- log_warning("Error occurred while %s\n", s); \
- if (smtp_sock > 0) sock_close(smtp_sock); \
- return -1; \
- } \
-}
+static gint send_message_data (SendProgressDialog *dialog, SockInfo *sock,
+ FILE *fp, gint size);
+
+static SendProgressDialog *send_progress_dialog_create(void);
+static void send_progress_dialog_destroy(SendProgressDialog *dialog);
+static void send_cancel(GtkWidget *widget, gpointer data);
+
+static gchar *send_query_password(const gchar *server, const gchar *user);
-#define SEND_EXIT_IF_NOTOK(f, s) \
-{ \
- if ((f) != SM_OK) { \
- log_warning("Error occurred while %s\n", s); \
- if (smtp_quit(smtp_sock) != SM_OK) \
- log_warning("Error occurred while sending QUIT\n"); \
- sock_close(smtp_sock); \
- return -1; \
- } \
-}
gint send_message(const gchar *file, PrefsAccount *ac_prefs, GSList *to_list)
{
FILE *fp;
gint val;
- gushort port;
- gchar *domain;
g_return_val_if_fail(file != NULL, -1);
g_return_val_if_fail(ac_prefs != NULL, -1);
return -1;
}
- port = ac_prefs->set_smtpport ? ac_prefs->smtpport : SMTP_PORT;
- domain = ac_prefs->set_domain ? ac_prefs->domain : NULL;
+ if (prefs_common.use_extsend && prefs_common.extsend_cmd) {
+ val = send_message_local(prefs_common.extsend_cmd, fp);
+ fclose(fp);
+ return val;
+ }
- val = send_message_smtp(to_list, ac_prefs->address,
- ac_prefs->smtp_server, port, domain,
- ac_prefs->userid, ac_prefs->passwd,
- ac_prefs->use_smtp_auth, fp);
+ val = send_message_smtp(ac_prefs, to_list, fp);
fclose(fp);
return val;
{
Q_SENDER = 0,
Q_SMTPSERVER = 1,
- Q_RECIPIENTS = 2
+ Q_RECIPIENTS = 2,
+ Q_ACCOUNT_ID = 3
};
gint send_message_queue(const gchar *file)
static HeaderEntry qentry[] = {{"S:", NULL, FALSE},
{"SSV:", NULL, FALSE},
{"R:", NULL, FALSE},
+ {"AID:", NULL, FALSE},
{NULL, NULL, FALSE}};
FILE *fp;
gint val;
GSList *to_list = NULL;
gchar buf[BUFFSIZE];
gint hnum;
+ PrefsAccount *ac = NULL;
g_return_val_if_fail(file != NULL, -1);
case Q_RECIPIENTS:
to_list = address_list_append(to_list, p);
break;
+ case Q_ACCOUNT_ID:
+ ac = account_find_from_id(atoi(p));
+ break;
default:
}
}
- if (!to_list || !from || !server) {
+ if (!to_list || !from) {
g_warning(_("Queued message header is broken.\n"));
val = -1;
+ } else if (prefs_common.use_extsend && prefs_common.extsend_cmd) {
+ val = send_message_local(prefs_common.extsend_cmd, fp);
} else {
- gushort port;
- gchar *domain;
- PrefsAccount *ac;
-
- ac = account_find_from_smtp_server(from, server);
if (!ac) {
- g_warning(_("Account not found. Using current account...\n"));
- ac = cur_account;
+ ac = account_find_from_smtp_server(from, server);
+ if (!ac) {
+ g_warning(_("Account not found. "
+ "Using current account...\n"));
+ ac = cur_account;
+ }
}
- if (ac) {
- port = ac->set_smtpport ? ac->smtpport : SMTP_PORT;
- domain = ac->set_domain ? ac->domain : NULL;
- val = send_message_smtp
- (to_list, from, server, port, domain,
- ac->userid, ac->passwd, ac->use_smtp_auth, fp);
- } else {
+ if (ac)
+ val = send_message_smtp(ac, to_list, fp);
+ else {
+ PrefsAccount tmp_ac;
+
g_warning(_("Account not found.\n"));
- val = send_message_smtp
- (to_list, from, server, SMTP_PORT, NULL,
- NULL, NULL, FALSE, fp);
+
+ memset(&tmp_ac, 0, sizeof(PrefsAccount));
+ tmp_ac.address = from;
+ tmp_ac.smtp_server = server;
+ tmp_ac.smtpport = SMTP_PORT;
+ val = send_message_smtp(&tmp_ac, to_list, fp);
}
}
return val;
}
-static gint send_message_smtp(GSList *to_list, const gchar *from,
- const gchar *server, gushort port,
- const gchar *domain, const gchar *userid,
- const gchar* passwd, gboolean use_smtp_auth,
+gint send_message_local(const gchar *command, FILE *fp)
+{
+ FILE *pipefp;
+ gchar buf[BUFFSIZE];
+
+ g_return_val_if_fail(command != NULL, -1);
+ g_return_val_if_fail(fp != NULL, -1);
+
+ pipefp = popen(command, "w");
+ if (!pipefp) {
+ g_warning(_("Can't execute external command: %s\n"), command);
+ return -1;
+ }
+
+ while (fgets(buf, sizeof(buf), fp) != NULL) {
+ strretchomp(buf);
+ /* escape when a dot appears on the top */
+ if (buf[0] == '.')
+ fputc('.', pipefp);
+ fputs(buf, pipefp);
+ fputc('\n', pipefp);
+ }
+
+ pclose(pipefp);
+
+ return 0;
+}
+
+#define EXIT_IF_CANCELLED() \
+{ \
+ if (dialog->cancelled) { \
+ sock_close(smtp_sock); \
+ send_progress_dialog_destroy(dialog); \
+ return -1; \
+ } \
+}
+
+#define SEND_EXIT_IF_ERROR(f, s) \
+{ \
+ EXIT_IF_CANCELLED(); \
+ if (!(f)) { \
+ log_warning("Error occurred while %s\n", s); \
+ sock_close(smtp_sock); \
+ send_progress_dialog_destroy(dialog); \
+ return -1; \
+ } \
+}
+
+#define SEND_EXIT_IF_NOTOK(f, s) \
+{ \
+ gint ok; \
+ \
+ EXIT_IF_CANCELLED(); \
+ if ((ok = (f)) != SM_OK) { \
+ log_warning("Error occurred while %s\n", s); \
+ if (ok == SM_AUTHFAIL) { \
+ log_warning("SMTP AUTH failed\n"); \
+ if (ac_prefs->tmp_pass) { \
+ g_free(ac_prefs->tmp_pass); \
+ ac_prefs->tmp_pass = NULL; \
+ } \
+ } \
+ if (smtp_quit(smtp_sock) != SM_OK) \
+ log_warning("Error occurred while sending QUIT\n"); \
+ sock_close(smtp_sock); \
+ send_progress_dialog_destroy(dialog); \
+ return -1; \
+ } \
+}
+
+gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list,
FILE *fp)
{
- gint smtp_sock;
+ SockInfo *smtp_sock = NULL;
+ SendProgressDialog *dialog;
+ GtkCList *clist;
+ const gchar *text[3];
gchar buf[BUFFSIZE];
+ gushort port;
+ gchar *domain;
+ gchar *user = NULL;
+ gchar *pass = NULL;
GSList *cur;
+ gint size;
+ g_return_val_if_fail(ac_prefs != NULL, -1);
+ g_return_val_if_fail(ac_prefs->address != NULL, -1);
+ g_return_val_if_fail(ac_prefs->smtp_server != NULL, -1);
g_return_val_if_fail(to_list != NULL, -1);
- g_return_val_if_fail(from != NULL, -1);
- g_return_val_if_fail(server != NULL, -1);
g_return_val_if_fail(fp != NULL, -1);
- log_message(_("Connecting to SMTP server: %s ...\n"), server);
+ size = get_left_file_size(fp);
+ if (size < 0) return -1;
+
+#if USE_SSL
+ port = ac_prefs->set_smtpport ? ac_prefs->smtpport :
+ ac_prefs->ssl_smtp == SSL_SMTP_TUNNEL ? SSMTP_PORT : SMTP_PORT;
+#else
+ port = ac_prefs->set_smtpport ? ac_prefs->smtpport : SMTP_PORT;
+#endif
+ domain = ac_prefs->set_domain ? ac_prefs->domain : NULL;
+
+ if (ac_prefs->use_smtp_auth) {
+ if (ac_prefs->smtp_userid) {
+ user = ac_prefs->smtp_userid;
+ if(ac_prefs->smtp_passwd)
+ pass = ac_prefs->smtp_passwd;
+ else if (ac_prefs->tmp_pass)
+ pass = ac_prefs->tmp_pass;
+ else {
+ pass = send_query_password(ac_prefs->smtp_server,
+ ac_prefs->smtp_userid);
+ if (!pass) pass = g_strdup("");
+ ac_prefs->tmp_pass = pass;
+ }
+ } else {
+ user = ac_prefs->userid;
+ if (ac_prefs->passwd) {
+ pass = ac_prefs->passwd;
+ } else if (ac_prefs->tmp_pass)
+ pass = ac_prefs->tmp_pass;
+ else {
+ pass = send_query_password(ac_prefs->smtp_server,
+ ac_prefs->userid);
+ if (!pass) pass = g_strdup("");
+ ac_prefs->tmp_pass = pass;
+ }
+ }
+ }
+
+ dialog = send_progress_dialog_create();
+ text[0] = NULL;
+ text[1] = ac_prefs->smtp_server;
+ text[2] = _("Standby");
+ clist = GTK_CLIST(dialog->dialog->clist);
+ gtk_clist_append(clist, (gchar **)text);
+
+ g_snprintf(buf, sizeof(buf), _("Connecting to SMTP server: %s ..."),
+ ac_prefs->smtp_server);
+ log_message("%s\n", buf);
+ progress_dialog_set_label(dialog->dialog, buf);
+ gtk_clist_set_text(clist, 0, 2, _("Connecting"));
+ GTK_EVENTS_FLUSH();
+
+#if USE_SSL
+ SEND_EXIT_IF_ERROR((smtp_sock = send_smtp_open
+ (ac_prefs->smtp_server, port, domain,
+ ac_prefs->use_smtp_auth, ac_prefs->ssl_smtp)),
+ "connecting to server");
+#else
SEND_EXIT_IF_ERROR((smtp_sock = send_smtp_open
- (server, port, domain, use_smtp_auth)),
+ (ac_prefs->smtp_server, port, domain,
+ ac_prefs->use_smtp_auth)),
"connecting to server");
+#endif
+
+ progress_dialog_set_label(dialog->dialog, _("Sending MAIL FROM..."));
+ gtk_clist_set_text(clist, 0, 2, _("Sending"));
+ GTK_EVENTS_FLUSH();
+
SEND_EXIT_IF_NOTOK
- (smtp_from(smtp_sock, from, userid, passwd, use_smtp_auth),
+ (smtp_from(smtp_sock, ac_prefs->address, user,
+ pass, ac_prefs->use_smtp_auth),
"sending MAIL FROM");
+
+ progress_dialog_set_label(dialog->dialog, _("Sending RCPT TO..."));
+ GTK_EVENTS_FLUSH();
+
for (cur = to_list; cur != NULL; cur = cur->next)
SEND_EXIT_IF_NOTOK(smtp_rcpt(smtp_sock, (gchar *)cur->data),
"sending RCPT TO");
+
+ progress_dialog_set_label(dialog->dialog, _("Sending DATA..."));
+ GTK_EVENTS_FLUSH();
+
SEND_EXIT_IF_NOTOK(smtp_data(smtp_sock), "sending DATA");
/* send main part */
+ SEND_EXIT_IF_ERROR(send_message_data(dialog, smtp_sock, fp, size) == 0,
+ "sending data");
+
+ progress_dialog_set_label(dialog->dialog, _("Quitting..."));
+ GTK_EVENTS_FLUSH();
+
+ SEND_EXIT_IF_NOTOK(smtp_eom(smtp_sock), "terminating data");
+ SEND_EXIT_IF_NOTOK(smtp_quit(smtp_sock), "sending QUIT");
+
+ sock_close(smtp_sock);
+ send_progress_dialog_destroy(dialog);
+
+ return 0;
+}
+
+#undef EXIT_IF_CANCELLED
+#undef SEND_EXIT_IF_ERROR
+#undef SEND_EXIT_IF_NOTOK
+
+#define EXIT_IF_CANCELLED() \
+{ \
+ if (dialog->cancelled) return -1; \
+}
+
+#define SEND_EXIT_IF_ERROR(f) \
+{ \
+ EXIT_IF_CANCELLED(); \
+ if ((f) <= 0) return -1; \
+}
+
+#define SEND_DIALOG_UPDATE() \
+{ \
+ gettimeofday(&tv_cur, NULL); \
+ if (tv_cur.tv_sec - tv_prev.tv_sec > 0 || \
+ tv_cur.tv_usec - tv_prev.tv_usec > UI_REFRESH_INTERVAL) { \
+ g_snprintf(str, sizeof(str), \
+ _("Sending message (%d / %d bytes)"), \
+ bytes, size); \
+ progress_dialog_set_label(dialog->dialog, str); \
+ progress_dialog_set_percentage \
+ (dialog->dialog, (gfloat)bytes / (gfloat)size); \
+ GTK_EVENTS_FLUSH(); \
+ gettimeofday(&tv_prev, NULL); \
+ } \
+}
+
+static gint send_message_data(SendProgressDialog *dialog, SockInfo *sock,
+ FILE *fp, gint size)
+{
+ gchar buf[BUFFSIZE];
+ gchar str[BUFFSIZE];
+ gint bytes = 0;
+ struct timeval tv_prev, tv_cur;
+
+ gettimeofday(&tv_prev, NULL);
+
+ /* output header part */
+ while (fgets(buf, sizeof(buf), fp) != NULL) {
+ bytes += strlen(buf);
+ strretchomp(buf);
+
+ SEND_DIALOG_UPDATE();
+
+ if (!g_strncasecmp(buf, "Bcc:", 4)) {
+ gint next;
+
+ for (;;) {
+ next = fgetc(fp);
+ if (next == EOF)
+ break;
+ else if (next != ' ' && next != '\t') {
+ ungetc(next, fp);
+ break;
+ }
+ if (fgets(buf, sizeof(buf), fp) == NULL)
+ break;
+ else
+ bytes += strlen(buf);
+ }
+ } else {
+ SEND_EXIT_IF_ERROR(sock_puts(sock, buf));
+ if (buf[0] == '\0')
+ break;
+ }
+ }
+
+ /* output body part */
while (fgets(buf, sizeof(buf), fp) != NULL) {
+ bytes += strlen(buf);
strretchomp(buf);
+ SEND_DIALOG_UPDATE();
+
/* escape when a dot appears on the top */
if (buf[0] == '.')
- SEND_EXIT_IF_ERROR(sock_write(smtp_sock, ".", 1),
- "sending data");
+ SEND_EXIT_IF_ERROR(sock_write(sock, ".", 1));
- SEND_EXIT_IF_ERROR(sock_puts(smtp_sock, buf), "sending data");
+ SEND_EXIT_IF_ERROR(sock_puts(sock, buf));
}
- SEND_EXIT_IF_NOTOK(smtp_eom(smtp_sock), "terminating data");
- SEND_EXIT_IF_NOTOK(smtp_quit(smtp_sock), "sending QUIT");
+ g_snprintf(str, sizeof(str), _("Sending message (%d / %d bytes)"),
+ bytes, size);
+ progress_dialog_set_label(dialog->dialog, str);
+ progress_dialog_set_percentage
+ (dialog->dialog, (gfloat)bytes / (gfloat)size);
+ GTK_EVENTS_FLUSH();
- sock_close(smtp_sock);
return 0;
}
-static gint send_smtp_open(const gchar *server, gushort port,
- const gchar *domain, gboolean use_smtp_auth)
+#undef EXIT_IF_CANCELLED
+#undef SEND_EXIT_IF_ERROR
+#undef SEND_DIALOG_UPDATE
+
+#if USE_SSL
+static SockInfo *send_smtp_open(const gchar *server, gushort port,
+ const gchar *domain, gboolean use_smtp_auth,
+ SSLSMTPType ssl_type)
+#else
+static SockInfo *send_smtp_open(const gchar *server, gushort port,
+ const gchar *domain, gboolean use_smtp_auth)
+#endif
{
- SockInfo *sockinfo;
- gint sock;
+ SockInfo *sock;
gint val;
- g_return_val_if_fail(server != NULL, -1);
+ g_return_val_if_fail(server != NULL, NULL);
- if ((sockinfo = sock_connect(server, port)) == NULL) {
+ if ((sock = sock_connect(server, port)) == NULL) {
log_warning(_("Can't connect to SMTP server: %s:%d\n"),
server, port);
- return -1;
+ return NULL;
}
- sock = sockinfo->sock;
- sock_sockinfo_free(sockinfo);
- if (smtp_ok(sock) == SM_OK) {
- val = smtp_helo(sock, domain ? domain : get_domain_name(),
- use_smtp_auth);
- if (val == SM_OK) return sock;
+#if USE_SSL
+ if (ssl_type == SSL_SMTP_TUNNEL && !ssl_init_socket(sock)) {
+ log_warning(_("SSL connection failed"));
+ sock_close(sock);
+ return NULL;
}
+#endif
+
+ if (smtp_ok(sock) != SM_OK) {
+ log_warning(_("Error occurred while connecting to %s:%d\n"),
+ server, port);
+ sock_close(sock);
+ return NULL;
+ }
+
+#if USE_SSL
+ val = smtp_helo(sock, domain ? domain : get_domain_name(),
+ use_smtp_auth || ssl_type == SSL_SMTP_STARTTLS);
+#else
+ val = smtp_helo(sock, domain ? domain : get_domain_name(),
+ use_smtp_auth);
+#endif
+
+ if (val != SM_OK) {
+ log_warning(_("Error occurred while sending HELO\n"));
+ sock_close(sock);
+ return NULL;
+ }
+
+#if USE_SSL
+ if (ssl_type == SSL_SMTP_STARTTLS) {
+ val = esmtp_starttls(sock);
+ if (val != SM_OK) {
+ log_warning(_("Error occurred while sending STARTTLS\n"));
+ sock_close(sock);
+ return NULL;
+ }
+ if (!ssl_init_socket_with_method(sock, SSL_METHOD_TLSv1)) {
+ sock_close(sock);
+ return NULL;
+ }
+ val = esmtp_ehlo(sock, domain ? domain : get_domain_name());
+ if (val != SM_OK) {
+ log_warning(_("Error occurred while sending EHLO\n"));
+ sock_close(sock);
+ return NULL;
+ }
+ }
+#endif
+
+ return sock;
+}
+
+
+static SendProgressDialog *send_progress_dialog_create(void)
+{
+ SendProgressDialog *dialog;
+ ProgressDialog *progress;
+
+ dialog = g_new0(SendProgressDialog, 1);
+
+ progress = progress_dialog_create();
+ gtk_window_set_title(GTK_WINDOW(progress->window),
+ _("Sending message"));
+ gtk_signal_connect(GTK_OBJECT(progress->cancel_btn), "clicked",
+ GTK_SIGNAL_FUNC(send_cancel), dialog);
+ gtk_signal_connect(GTK_OBJECT(progress->window), "delete_event",
+ GTK_SIGNAL_FUNC(gtk_true), NULL);
+ gtk_window_set_modal(GTK_WINDOW(progress->window), TRUE);
+ manage_window_set_transient(GTK_WINDOW(progress->window));
+
+ progress_dialog_set_value(progress, 0.0);
+
+ gtk_widget_show_now(progress->window);
+
+ dialog->dialog = progress;
+ dialog->queue_list = NULL;
+ dialog->cancelled = FALSE;
+
+ return dialog;
+}
+
+static void send_progress_dialog_destroy(SendProgressDialog *dialog)
+{
+ g_return_if_fail(dialog != NULL);
+
+ progress_dialog_destroy(dialog->dialog);
+ g_free(dialog);
+}
+
+static void send_cancel(GtkWidget *widget, gpointer data)
+{
+ SendProgressDialog *dialog = data;
+
+ dialog->cancelled = TRUE;
+}
+
+static gchar *send_query_password(const gchar *server, const gchar *user)
+{
+ gchar *message;
+ gchar *pass;
- log_warning(_("Error occurred while sending HELO\n"));
- sock_close(sock);
+ message = g_strdup_printf(_("Input password for %s on %s:"),
+ user, server);
+ pass = input_dialog_with_invisible(_("Input password"), message, NULL);
+ g_free(message);
- return -1;
+ return pass;
}
projects / claws.git / blobdiff