/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2007 DINH Viet Hoa and the Claws Mail team
+ * Copyright (C) 2005-2012 DINH Viet Hoa and the Claws Mail team
*
* 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#ifdef HAVE_LIBETPAN
+#include <glib.h>
+#include <glib/gi18n.h>
#include "imap-thread.h"
#include <imap.h>
#include <sys/types.h>
#include "etpan-thread-manager.h"
#include "utils.h"
#include "mainwindow.h"
+#include "ssl.h"
#include "ssl_certificate.h"
#include "socket.h"
#include "remotefolder.h"
+#include "tags.h"
#define DISABLE_LOG_DURING_LOGIN
static void delete_imap(Folder *folder, mailimap *imap)
{
chashdatum key;
- chashdatum value;
key.data = &folder;
key.len = sizeof(folder);
- value.data = imap;
- value.len = 0;
chash_delete(session_hash, &key, NULL);
key.data = &imap;
GIOCondition condition,
gpointer data)
{
+#ifdef G_OS_WIN32
+ gsize bytes_read;
+ gchar ch;
+
+ if (condition & G_IO_IN)
+ g_io_channel_read_chars(source, &ch, 1, &bytes_read, NULL);
+#endif
etpan_thread_manager_loop(thread_manager);
return TRUE;
fd_thread_manager = etpan_thread_manager_get_fd(thread_manager);
+#ifndef G_OS_WIN32
io_channel = g_io_channel_unix_new(fd_thread_manager);
-
+#else
+ io_channel = g_io_channel_win32_new_fd(fd_thread_manager);
+#endif
thread_manager_signal = g_io_add_watch_full(io_channel, 0, G_IO_IN,
thread_manager_event,
(gpointer) NULL,
mailstream_network_delay.tv_usec = 0;
}
-void imap_main_done(void)
+void imap_main_done(gboolean have_connectivity)
{
+ imap_disconnect_all(have_connectivity);
etpan_thread_manager_stop(thread_manager);
#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
return;
struct connect_param {
mailimap * imap;
+ PrefsAccount *account;
const char * server;
int port;
};
static int etpan_certificate_check(const unsigned char *certificate, int len, void *data)
{
-#ifdef USE_OPENSSL
- struct connect_param *param = (struct connect_param *)data;
- X509 *cert = NULL;
-
- if (certificate == NULL || len < 0) {
- g_warning("no cert presented.\n");
- return 0;
- }
- cert = d2i_X509(NULL, (const unsigned char **)&certificate, len);
- if (cert == NULL) {
- g_warning("IMAP: can't get cert\n");
- return 0;
- } else if (ssl_certificate_check(cert, NULL,
- (gchar *)param->server, (gushort)param->port) == TRUE) {
- X509_free(cert);
- return 0;
- } else {
- X509_free(cert);
- return -1;
- }
-#elif USE_GNUTLS
+#ifdef USE_GNUTLS
struct connect_param *param = (struct connect_param *)data;
gnutls_x509_crt cert = NULL;
gnutls_datum tmp;
if (gnutls_x509_crt_import(cert, &tmp, GNUTLS_X509_FMT_DER) < 0) {
g_warning("IMAP: can't get cert\n");
return 0;
- } else if (ssl_certificate_check(cert, (guint)-1, NULL,
- (gchar *)param->server, (gushort)param->port) == TRUE) {
+ } else if (ssl_certificate_check(cert, (guint)-1, (gchar *)param->server,
+ (gushort)param->port) == TRUE) {
gnutls_x509_crt_deinit(cert);
return 0;
} else {
return 0;
}
+static void connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context, void * data)
+{
+#ifdef USE_GNUTLS
+ PrefsAccount *account = (PrefsAccount *)data;
+ const gchar *cert_path = NULL;
+ const gchar *password = NULL;
+ gnutls_x509_crt x509 = NULL;
+ gnutls_x509_privkey pkey = NULL;
+
+ if (account->in_ssl_client_cert_file && *account->in_ssl_client_cert_file)
+ cert_path = account->in_ssl_client_cert_file;
+ if (account->in_ssl_client_cert_pass && *account->in_ssl_client_cert_pass)
+ password = account->in_ssl_client_cert_pass;
+
+ if (mailstream_ssl_set_client_certificate_data(ssl_context, NULL, 0) < 0 ||
+ mailstream_ssl_set_client_private_key_data(ssl_context, NULL, 0) < 0)
+ debug_print("Impossible to set the client certificate.\n");
+ x509 = ssl_certificate_get_x509_from_pem_file(cert_path);
+ pkey = ssl_certificate_get_pkey_from_pem_file(cert_path);
+ if (!(x509 && pkey)) {
+ /* try pkcs12 format */
+ ssl_certificate_get_x509_and_pkey_from_p12_file(cert_path, password, &x509, &pkey);
+ }
+ if (x509 && pkey) {
+ unsigned char *x509_der = NULL, *pkey_der = NULL;
+ size_t x509_len, pkey_len;
+
+ x509_len = (size_t)gnutls_i2d_X509(x509, &x509_der);
+ pkey_len = (size_t)gnutls_i2d_PrivateKey(pkey, &pkey_der);
+ if (x509_len > 0 && pkey_len > 0) {
+ if (mailstream_ssl_set_client_certificate_data(ssl_context, x509_der, x509_len) < 0 ||
+ mailstream_ssl_set_client_private_key_data(ssl_context, pkey_der, pkey_len) < 0)
+ log_error(LOG_PROTOCOL, _("Impossible to set the client certificate.\n"));
+ g_free(x509_der);
+ g_free(pkey_der);
+ }
+ gnutls_x509_crt_deinit(x509);
+ gnutls_x509_privkey_deinit(pkey);
+ }
+#endif
+}
+
static void connect_ssl_run(struct etpan_thread_op * op)
{
int r;
CHECK_IMAP();
- r = mailimap_ssl_connect(param->imap,
- param->server, param->port);
+ r = mailimap_ssl_connect_with_callback(param->imap,
+ param->server, param->port,
+ connect_ssl_context_cb, param->account);
result->error = r;
}
param.imap = imap;
param.server = server;
param.port = port;
-
+ param.account = folder->account;
+
refresh_resolvers();
threaded_run(folder, ¶m, &result, connect_ssl_run);
return;
}
- tls_low = mailstream_low_tls_open(fd);
+ tls_low = mailstream_low_tls_open_with_callback(fd, connect_ssl_context_cb, param->account);
if (tls_low == NULL) {
debug_print("imap starttls run - can't tls_open\n");
result->error = MAILIMAP_ERROR_STREAM;
struct connect_param param;
struct starttls_result result;
int cert_len;
- unsigned char *certificate;
+ unsigned char *certificate = NULL;
debug_print("imap starttls - begin\n");
param.imap = get_imap(folder);
param.server = host;
param.port = port;
-
+ param.account = folder->account;
+
threaded_run(folder, ¶m, &result, starttls_run);
debug_print("imap starttls - end\n");
if (imap->imap_selection_info->sel_perm_flags) {
GSList *t_flags = NULL;
- clistiter *cur =
- clist_begin(imap->imap_selection_info->sel_perm_flags);
+ clistiter *cur = NULL;
+ if (imap->imap_selection_info->sel_perm_flags)
+ cur = clist_begin(imap->imap_selection_info->sel_perm_flags);
+
for (; cur; cur = clist_next(cur)) {
struct mailimap_flag_perm *flag = (struct mailimap_flag_perm *)clist_content(cur);
if (flag->fl_type == MAILIMAP_FLAG_PERM_ALL)
flag->fl_flag->fl_type == 6 &&
!strcmp(flag->fl_flag->fl_data.fl_extension, "*"))
*can_create_flags = TRUE;
- if (ok_flags) {
+ if (flag->fl_flag && ok_flags) {
MsgPermFlags c_flag = 0;
switch (flag->fl_flag->fl_type) {
case MAILIMAP_FLAG_ANSWERED:
c_flag = IMAP_FLAG_SEEN;
break;
case MAILIMAP_FLAG_KEYWORD:
- if (!strcasecmp(flag->fl_flag->fl_data.fl_keyword, "$Forwarded"))
+ if (!strcasecmp(flag->fl_flag->fl_data.fl_keyword, RTAG_FORWARDED))
c_flag = IMAP_FLAG_FORWARDED;
+ if (!strcasecmp(flag->fl_flag->fl_data.fl_keyword, RTAG_JUNK))
+ c_flag = IMAP_FLAG_SPAM;
+ if (!strcasecmp(flag->fl_flag->fl_data.fl_keyword, RTAG_NON_JUNK) ||
+ !strcasecmp(flag->fl_flag->fl_data.fl_keyword, RTAG_NO_JUNK) ||
+ !strcasecmp(flag->fl_flag->fl_data.fl_keyword, RTAG_NOT_JUNK))
+ c_flag = IMAP_FLAG_HAM;
break;
default:
break;
case IMAP_SEARCH_TYPE_FORWARDED:
search_type_key = mailimap_search_key_new(MAILIMAP_SEARCH_KEY_KEYWORD,
NULL, NULL, NULL, NULL, NULL,
- strdup("$Forwarded"), NULL, NULL, NULL, NULL,
+ strdup(RTAG_FORWARDED), NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, 0,
+ NULL, NULL, NULL, NULL, NULL,
+ NULL, 0, NULL, NULL, NULL);
+ break;
+ case IMAP_SEARCH_TYPE_SPAM:
+ search_type_key = mailimap_search_key_new(MAILIMAP_SEARCH_KEY_KEYWORD,
+ NULL, NULL, NULL, NULL, NULL,
+ strdup(RTAG_JUNK), NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, 0,
NULL, NULL, NULL, NULL, NULL,
NULL, 0, NULL, NULL, NULL);
static int
result_to_uid_list(clist * fetch_result, carray ** result)
{
- clistiter * cur;
+ clistiter * cur = NULL;
int r;
int res;
carray * tab;
goto err;
}
- for(cur = clist_begin(fetch_result) ; cur != NULL ;
- cur = clist_next(cur)) {
+ if (fetch_result)
+ cur = clist_begin(fetch_result);
+
+ for(; cur != NULL ; cur = clist_next(cur)) {
struct mailimap_msg_att * msg_att;
uint32_t uid;
uint32_t * puid;
static int
result_to_uid_flags_list(clist * fetch_result, carray ** result)
{
- clistiter * cur;
+ clistiter * cur = NULL;
int r;
int res;
carray * tab;
res = MAILIMAP_ERROR_MEMORY;
goto err;
}
-
- for(cur = clist_begin(fetch_result) ; cur != NULL ;
- cur = clist_next(cur)) {
+
+ if (fetch_result)
+ cur = clist_begin(fetch_result);
+
+ for(; cur != NULL ; cur = clist_next(cur)) {
struct mailimap_msg_att * msg_att;
uint32_t uid;
uint32_t * puid;
return r;
}
- if (clist_begin(fetch_result) == NULL) {
+ if (fetch_result == NULL || clist_begin(fetch_result) == NULL) {
mailimap_fetch_list_free(fetch_result);
return MAILIMAP_ERROR_FETCH;
}
text = NULL;
text_length = 0;
- for(cur = clist_begin(msg_att->att_list) ; cur != NULL ;
- cur = clist_next(cur)) {
+ if (msg_att->att_list)
+ cur = clist_begin(msg_att->att_list);
+ else
+ cur = NULL;
+
+ for(; cur != NULL ; cur = clist_next(cur)) {
msg_att_item = clist_content(cur);
if (msg_att_item->att_type == MAILIMAP_MSG_ATT_ITEM_STATIC) {
return r;
}
- if (clist_begin(fetch_result) == NULL) {
+ if (fetch_result == NULL || clist_begin(fetch_result) == NULL) {
mailimap_fetch_list_free(fetch_result);
return MAILIMAP_ERROR_FETCH;
}
text = NULL;
text_length = 0;
- for(cur = clist_begin(msg_att->att_list) ; cur != NULL ;
- cur = clist_next(cur)) {
+ if (msg_att->att_list)
+ cur = clist_begin(msg_att->att_list);
+ else
+ cur = NULL;
+
+ for(; cur != NULL ; cur = clist_next(cur)) {
msg_att_item = clist_content(cur);
if (msg_att_item->att_type == MAILIMAP_MSG_ATT_ITEM_STATIC) {
result->error = r;
if (r == MAILIMAP_NO_ERROR) {
- fd = open(param->filename, O_RDWR | O_CREAT, 0600);
+ fd = g_open(param->filename, O_RDWR | O_CREAT, 0600);
if (fd < 0) {
result->error = MAILIMAP_ERROR_FETCH;
goto free;
close:
close(fd);
unlink:
- g_unlink(param->filename);
+ claws_unlink(param->filename);
free:
/* mmap_string_unref is a simple free in libetpan
flags &= ~MSG_NEW;
break;
case MAILIMAP_FLAG_KEYWORD:
- if (!strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, "$Forwarded"))
+ if (!strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, RTAG_FORWARDED))
flags |= MSG_FORWARDED;
+ else if (!strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, RTAG_JUNK))
+ flags |= MSG_SPAM;
+ else if (!strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, RTAG_NON_JUNK) ||
+ !strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, RTAG_NO_JUNK) ||
+ !strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, RTAG_NOT_JUNK))
+ flags &= ~MSG_SPAM;
else if (s_tags)
tags = g_slist_prepend(tags, g_strdup(flag_fetch->fl_flag->fl_data.fl_keyword));
break;
ref_size = 0;
att_dyn = NULL;
- for(item_cur = clist_begin(msg_att->att_list) ; item_cur != NULL ;
- item_cur = clist_next(item_cur)) {
+ if (msg_att->att_list)
+ item_cur = clist_begin(msg_att->att_list);
+ else
+ item_cur = NULL;
+ for(; item_cur != NULL ; item_cur = clist_next(item_cur)) {
struct mailimap_msg_att_item * item;
item = clist_content(item_cur);
carray ** p_env_list)
{
clistiter * cur;
- unsigned int i;
carray * env_list;
- i = 0;
env_list = carray_new(16);
- for(cur = clist_begin(fetch_result) ; cur != NULL ;
- cur = clist_next(cur)) {
- struct mailimap_msg_att * msg_att;
- struct imap_fetch_env_info * env_info;
- GSList *tags = NULL;
-
- msg_att = clist_content(cur);
-
- env_info = fetch_to_env_info(msg_att, &tags);
- if (!env_info)
- return MAILIMAP_ERROR_MEMORY;
- carray_add(env_list, env_info, NULL);
- carray_add(env_list, tags, NULL);
+ if (fetch_result) {
+ for(cur = clist_begin(fetch_result) ; cur != NULL ;
+ cur = clist_next(cur)) {
+ struct mailimap_msg_att * msg_att;
+ struct imap_fetch_env_info * env_info;
+ GSList *tags = NULL;
+
+ msg_att = clist_content(cur);
+
+ env_info = fetch_to_env_info(msg_att, &tags);
+ if (!env_info)
+ return MAILIMAP_ERROR_MEMORY;
+ carray_add(env_list, env_info, NULL);
+ carray_add(env_list, tags, NULL);
+ }
+ * p_env_list = env_list;
+ } else {
+ * p_env_list = NULL;
}
-
- * p_env_list = env_list;
-
+
return MAIL_NO_ERROR;
}
static int imap_add_envelope_fetch_att(struct mailimap_fetch_type * fetch_type)
{
struct mailimap_fetch_att * fetch_att;
- int r;
+ int i;
char * header;
clist * hdrlist;
struct mailimap_header_list * imap_hdrlist;
struct mailimap_section * section;
+ char *headers[] = {
+ "Date", "From", "To", "Cc", "Subject", "Message-ID",
+ "References", "In-Reply-To", NULL
+ };
hdrlist = clist_new();
-
- header = strdup("Date");
- r = clist_append(hdrlist, header);
- header = strdup("From");
- r = clist_append(hdrlist, header);
- header = strdup("To");
- r = clist_append(hdrlist, header);
- header = strdup("Cc");
- r = clist_append(hdrlist, header);
- header = strdup("Subject");
- r = clist_append(hdrlist, header);
- header = strdup("Message-ID");
- r = clist_append(hdrlist, header);
- header = strdup("References");
- r = clist_append(hdrlist, header);
- header = strdup("In-Reply-To");
- r = clist_append(hdrlist, header);
+ i = 0;
+ while (headers[i] != NULL) {
+ header = strdup(headers[i]);
+ if (header == NULL || clist_append(hdrlist, header) != 0)
+ return MAIL_ERROR_MEMORY;
+ ++i;
+ }
imap_hdrlist = mailimap_header_list_new(hdrlist);
section = mailimap_section_new_header_fields(imap_hdrlist);
return r;
}
- if (clist_begin(fetch_result) == NULL) {
+ if (fetch_result == NULL || clist_begin(fetch_result) == NULL) {
res = MAILIMAP_ERROR_FETCH;
debug_print("clist_begin = NULL\n");
goto err;
}
size = stat_buf.st_size;
- fd = open(param->filename, O_RDONLY);
+ fd = g_open(param->filename, O_RDONLY, 0);
if (fd < 0) {
result->error = MAILIMAP_ERROR_APPEND;
return;
exit(0);
}
-#ifdef SOLARIS
if (servername)
- snprintf(env_buffer, ENV_BUFFER_SIZE,
- "ETPANSERVER=%s", servername);
+ g_setenv("ETPANSERVER", servername, TRUE);
else
- snprintf(env_buffer, ENV_BUFFER_SIZE, "ETPANSERVER=");
- putenv(env_buffer);
-#else
- if (servername)
- setenv("ETPANSERVER", servername, 1);
- else
- unsetenv("ETPANSERVER");
-#endif
+ g_unsetenv("ETPANSERVER");
-#ifdef SOLARIS
- if (port)
- snprintf(env_buffer, ENV_BUFFER_SIZE, "ETPANPORT=%d", port);
- else
- snprintf(env_buffer, ENV_BUFFER_SIZE, "ETPANPORT=");
- putenv(env_buffer);
-#else
if (port) {
char porttext[20];
snprintf(porttext, sizeof(porttext), "%d", port);
- setenv("ETPANPORT", porttext, 1);
+ g_setenv("ETPANPORT", porttext, TRUE);
}
else {
- unsetenv("ETPANPORT");
+ g_unsetenv("ETPANPORT");
}
-#endif
/* Not a lot we can do if there's an error other than bail. */
if (dup2(fd, 0) == -1)
/* Detach from the controlling tty if we have one. Otherwise,
SSH might do something stupid like trying to use it instead
of running $SSH_ASKPASS. Doh. */
- fd = open("/dev/tty", O_RDONLY);
+ fd = g_open("/dev/tty", O_RDONLY, 0);
if (fd != -1) {
ioctl(fd, TIOCNOTTY, NULL);
close(fd);
void imap_main_init(void)
{
}
-void imap_main_done(void)
+void imap_main_done(gboolean have_connectivity)
{
}
void imap_main_set_timeout(int sec)