+/*
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
#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 <sys/socket.h>
#endif
#include <fcntl.h>
+#ifndef G_OS_WIN32
#include <sys/mman.h>
#include <sys/wait.h>
-
+#endif
#include <gtk/gtk.h>
#include <log.h>
#include "etpan-thread-manager.h"
+#include "etpan-ssl.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 guint thread_manager_signal = 0;
static GIOChannel * io_channel = NULL;
-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;
- key.len = sizeof(imap);
- chash_delete(courier_workaround_hash, &key, NULL);
- debug_print("removing mailimap %p\n", imap);
- mailimap_free(imap);
-}
-
static gboolean thread_manager_event(GIOChannel * source,
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;
}
+static void imap_logger_noop(int direction, const char * str, size_t size)
+{
+ /* inhibit logging */
+}
+
static void imap_logger_cmd(int direction, const char * str, size_t size)
{
gchar *buf;
int i = 0;
if (size > 8192) {
- log_print("IMAP4%c [CMD data - %zd bytes]\n", direction?'>':'<', size);
+ log_print(LOG_PROTOCOL, "IMAP4%c [CMD data - %zd bytes]\n", direction?'>':'<', size);
return;
}
buf = malloc(size+1);
lines = g_strsplit(buf, "\n", -1);
while (lines[i] && *lines[i]) {
- log_print("IMAP4%c %s\n", direction?'>':'<', lines[i]);
+ log_print(LOG_PROTOCOL, "IMAP4%c %s\n", direction?'>':'<', lines[i]);
i++;
}
g_strfreev(lines);
gchar **lines;
int i = 0;
- if (size > 8192) {
- log_print("IMAP4%c [FETCH data - %zd bytes]\n", direction?'>':'<', size);
+ if (size > 128 && !direction) {
+ log_print(LOG_PROTOCOL, "IMAP4%c [FETCH data - %zd bytes]\n", direction?'>':'<', size);
return;
}
if (direction != 0 || (buf[0] == '*' && buf[1] == ' ') || size < 32) {
while (lines[i] && *lines[i]) {
- log_print("IMAP4%c %s\n", direction?'>':'<', lines[i]);
+ log_print(LOG_PROTOCOL, "IMAP4%c %s\n", direction?'>':'<', lines[i]);
i++;
}
} else {
- log_print("IMAP4%c [data - %zd bytes]\n", direction?'>':'<', size);
+ log_print(LOG_PROTOCOL, "IMAP4%c [data - %zd bytes]\n", direction?'>':'<', size);
}
g_strfreev(lines);
free(buf);
int i = 0;
if (size > 8192) {
- log_print("IMAP4%c [UID data - %zd bytes]\n", direction?'>':'<', size);
+ log_print(LOG_PROTOCOL, "IMAP4%c [UID data - %zd bytes]\n", direction?'>':'<', size);
return;
}
buf = malloc(size+1);
while (lines[i] && *lines[i]) {
int llen = strlen(lines[i]);
if (llen < 64)
- log_print("IMAP4%c %s\n", direction?'>':'<', lines[i]);
+ log_print(LOG_PROTOCOL, "IMAP4%c %s\n", direction?'>':'<', lines[i]);
else {
gchar tmp[64];
strncpy2(tmp, lines[i], 63);
- log_print("IMAP4%c %s[... - %zd bytes more]\n", direction?'>':'<', tmp,
+ log_print(LOG_PROTOCOL, "IMAP4%c %s[... - %d bytes more]\n", direction?'>':'<', tmp,
llen-64);
}
i++;
free(buf);
}
-void imap_logger_append(int direction, const char * str, size_t size)
+static void imap_logger_append(int direction, const char * str, size_t size)
{
gchar *buf;
gchar **lines;
int i = 0;
if (size > 8192) {
- log_print("IMAP4%c [APPEND data - %zd bytes]\n", direction?'>':'<', size);
+ log_print(LOG_PROTOCOL, "IMAP4%c [APPEND data - %zd bytes]\n", direction?'>':'<', size);
return;
} else if (direction == 0 && size > 64) {
- log_print("IMAP4%c [APPEND data - %zd bytes]\n", direction?'>':'<', size);
+ log_print(LOG_PROTOCOL, "IMAP4%c [APPEND data - %zd bytes]\n", direction?'>':'<', size);
return;
}
buf = malloc(size+1);
if (direction == 0 || (buf[0] == '*' && buf[1] == ' ') || size < 64) {
while (lines[i] && *lines[i]) {
- log_print("IMAP4%c %s\n", direction?'>':'<', lines[i]);
+ log_print(LOG_PROTOCOL, "IMAP4%c %s\n", direction?'>':'<', lines[i]);
i++;
}
} else {
- log_print("IMAP4%c [data - %zd bytes]\n", direction?'>':'<', size);
+ log_print(LOG_PROTOCOL, "IMAP4%c [data - %zd bytes]\n", direction?'>':'<', size);
}
g_strfreev(lines);
free(buf);
}
#define ETPAN_DEFAULT_NETWORK_TIMEOUT 60
-static gboolean etpan_skip_ssl_cert_check = FALSE;
+gboolean etpan_skip_ssl_cert_check = FALSE;
extern void mailsasl_ref(void);
void imap_main_init(gboolean skip_ssl_cert_check)
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;
+#endif
etpan_thread_manager_join(thread_manager);
g_source_remove(thread_manager_signal);
struct etpan_thread * thread;
chashdatum key;
chashdatum value;
-
+ int r;
+
key.data = &folder;
key.len = sizeof(folder);
-
- chash_get(imap_hash, &key, &value);
+
+ r = chash_get(imap_hash, &key, &value);
+ if (r < 0)
+ return NULL;
+
thread = value.data;
-
+
return thread;
}
return NULL;
imap = value.data;
-
+ debug_print("found imap %p\n", imap);
return imap;
}
+static gboolean cb_show_error(gpointer data)
+{
+ mainwindow_show_error();
+ return FALSE;
+}
static void generic_cb(int cancelled, void * result, void * callback_data)
{
- int * p_finished;
+ struct etpan_thread_op * op;
- p_finished = callback_data;
+ op = (struct etpan_thread_op *) callback_data;
debug_print("generic_cb\n");
-
- * p_finished = 1;
+ if (op->imap && op->imap->imap_response_info &&
+ op->imap->imap_response_info->rsp_alert) {
+ log_error(LOG_PROTOCOL, "IMAP4< Alert: %s\n",
+ op->imap->imap_response_info->rsp_alert);
+ g_timeout_add(10, cb_show_error, NULL);
+ }
+ op->finished = 1;
}
-static void threaded_run(Folder * folder, void * param, void * result,
- void (* func)(struct etpan_thread_op * ))
+/* Please do *not* blindly use imap pointers after this function returns,
+ * someone may have deleted it while this function was waiting for completion.
+ * Check return value to see if imap is still valid.
+ * Run get_imap(folder) again to get a fresh and valid pointer.
+ */
+static int threaded_run(Folder * folder, void * param, void * result,
+ void (* func)(struct etpan_thread_op * ))
{
struct etpan_thread_op * op;
struct etpan_thread * thread;
- int finished;
+ struct mailimap * imap = get_imap(folder);
imap_folder_ref(folder);
op = etpan_thread_op_new();
+
+ op->imap = imap;
op->param = param;
op->result = result;
- op->cancellable = 0;
op->run = func;
op->callback = generic_cb;
- op->callback_data = &finished;
- op->cleanup = NULL;
-
- finished = 0;
-
+ op->callback_data = op;
+
thread = get_thread(folder);
etpan_thread_op_schedule(thread, op);
- while (!finished) {
+ while (!op->finished) {
gtk_main_iteration();
}
-
+
etpan_thread_op_free(op);
imap_folder_unref(folder);
+
+ if (imap != get_imap(folder)) {
+ g_warning("returning from operation on a stale imap %p", imap);
+ return 1;
+ }
+
+ return 0;
}
struct connect_param {
mailimap * imap;
+ PrefsAccount *account;
const char * server;
int port;
};
} \
}
+
+static void delete_imap_run(struct etpan_thread_op * op)
+{
+ mailimap * imap = op->imap;
+
+ /* we don't want libetpan to logout */
+ if (imap->imap_stream) {
+ mailstream_close(imap->imap_stream);
+ imap->imap_stream = NULL;
+ }
+
+ mailimap_free(imap);
+}
+
+static void threaded_delete_imap(Folder *folder, mailimap *imap)
+{
+ struct etpan_thread_op * op;
+
+ /* No need to wait for completion, threaded_run() won't work here. */
+ op = etpan_thread_op_new();
+ op->imap = imap;
+ op->run = delete_imap_run;
+ op->cleanup = etpan_thread_op_free;
+
+ etpan_thread_op_schedule(get_thread(folder), op);
+
+ debug_print("threaded delete imap posted\n");
+}
+
+static void delete_imap(Folder *folder, mailimap *imap)
+{
+ chashdatum key;
+
+ key.data = &folder;
+ key.len = sizeof(folder);
+ chash_delete(session_hash, &key, NULL);
+
+ if (!imap)
+ return;
+ key.data = &imap;
+ key.len = sizeof(imap);
+ chash_delete(courier_workaround_hash, &key, NULL);
+ /* We can't just free imap here as there may be ops on it pending
+ * in the thread. Posting freeing as an op will synchronize against
+ * existing jobs and as imap is already removed from session_hash
+ * we are sure no new ops can be posted. */
+ threaded_delete_imap(folder, imap);
+}
+
static void connect_run(struct etpan_thread_op * op)
{
int r;
struct connect_result result;
chashdatum key;
chashdatum value;
- mailimap * imap;
+ mailimap * imap, * oldimap;
- imap = get_imap(folder);
- if (imap) {
- debug_print("deleting old imap %p\n", imap);
- delete_imap(folder, imap);
- }
+ oldimap = get_imap(folder);
imap = mailimap_new(0, NULL);
+ if (oldimap) {
+ debug_print("deleting old imap %p\n", oldimap);
+ delete_imap(folder, oldimap);
+ }
+
key.data = &folder;
key.len = sizeof(folder);
value.data = imap;
value.len = 0;
chash_set(session_hash, &key, &value, NULL);
-
+
param.imap = imap;
param.server = server;
param.port = port;
-
+
refresh_resolvers();
threaded_run(folder, ¶m, &result, connect_run);
-
- debug_print("connect ok %i\n", result.error);
-
- return result.error;
-}
-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, &certificate, len);
- if (cert == NULL) {
- g_warning("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;
- }
-#else
- return 0;
-#endif
-}
+ debug_print("connect ok %i with imap %p\n", result.error, imap);
+ return result.error;
+}
+#ifdef USE_GNUTLS
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,
+ etpan_connect_ssl_context_cb, param->account);
result->error = r;
}
struct connect_result result;
chashdatum key;
chashdatum value;
- mailimap * imap;
- unsigned char *certificate = NULL;
- int cert_len;
+ mailimap * imap, * oldimap;
+ gboolean accept_if_valid = FALSE;
- imap = get_imap(folder);
- if (imap) {
- debug_print("deleting old imap %p\n", imap);
- delete_imap(folder, imap);
- }
+ oldimap = get_imap(folder);
imap = mailimap_new(0, NULL);
-
+
+ if (oldimap) {
+ debug_print("deleting old imap %p\n", oldimap);
+ delete_imap(folder, oldimap);
+ }
+
key.data = &folder;
key.len = sizeof(folder);
value.data = imap;
value.len = 0;
chash_set(session_hash, &key, &value, NULL);
-
+
param.imap = imap;
param.server = server;
param.port = port;
-
+ param.account = folder->account;
+
+ if (folder->account)
+ accept_if_valid = folder->account->ssl_certs_auto_accept;
+
refresh_resolvers();
- threaded_run(folder, ¶m, &result, connect_ssl_run);
+ if (threaded_run(folder, ¶m, &result, connect_ssl_run))
+ return MAILIMAP_ERROR_INVAL;
if ((result.error == MAILIMAP_NO_ERROR_AUTHENTICATED ||
result.error == MAILIMAP_NO_ERROR_NON_AUTHENTICATED) && !etpan_skip_ssl_cert_check) {
- cert_len = (int)mailstream_ssl_get_certificate(imap->imap_stream, &certificate);
- if (etpan_certificate_check(certificate, cert_len, ¶m) < 0)
- return -1;
- if (certificate)
- free(certificate);
+ if (etpan_certificate_check(imap->imap_stream, server, port,
+ accept_if_valid) != TRUE)
+ result.error = MAILIMAP_ERROR_SSL;
}
- debug_print("connect %d\n", result.error);
-
+ debug_print("connect %d with imap %p\n", result.error, imap);
+
return result.error;
}
-
+#endif
struct capa_param {
mailimap * imap;
};
}
-struct mailimap_capability_data * imap_threaded_capability(Folder *folder, int *ok)
+int imap_threaded_capability(Folder *folder, struct mailimap_capability_data ** caps)
{
struct capa_param param;
struct capa_result result;
debug_print("capa %d\n", result.error);
- if (ok)
- *ok = result.error;
+ if (result.error == MAILIMAP_NO_ERROR)
+ *caps = result.caps;
- return result.caps;
+ return result.error;
}
param.imap = imap;
- threaded_run(folder, ¶m, &result, disconnect_run);
-
- if (imap == get_imap(folder)) {
+ if (threaded_run(folder, ¶m, &result, disconnect_run)) {
+ debug_print("imap already deleted %p\n", imap);
+ } else {
debug_print("deleting old imap %p\n", imap);
delete_imap(folder, imap);
- } else {
- debug_print("imap already deleted %p\n", imap);
}
debug_print("disconnect ok\n");
mailimap * imap;
const char * base;
const char * wildcard;
+ gboolean sub_only;
};
struct list_result {
CHECK_IMAP();
list = NULL;
- r = mailimap_list(param->imap, param->base,
- param->wildcard, &list);
+ if (param->base == NULL || param->wildcard == NULL) {
+ result->list = list;
+ result->error = -1;
+ debug_print("no base or wildcard (%p %p)\n", param->base, param->wildcard);
+ return;
+ }
+ if (param->sub_only)
+ r = mailimap_lsub(param->imap, param->base,
+ param->wildcard, &list);
+ else
+ r = mailimap_list(param->imap, param->base,
+ param->wildcard, &list);
result->error = r;
result->list = list;
debug_print("imap list run - end\n");
param.imap = get_imap(folder);
param.base = base;
param.wildcard = wildcard;
-
+ param.sub_only = FALSE;
+
threaded_run(folder, ¶m, &result, list_run);
* p_result = result.list;
return result.error;
}
+int imap_threaded_lsub(Folder * folder, const char * base,
+ const char * wildcard,
+ clist ** p_result)
+{
+ struct list_param param;
+ struct list_result result;
+
+ debug_print("imap lsub - begin\n");
+
+ param.imap = get_imap(folder);
+ param.base = base;
+ param.wildcard = wildcard;
+ param.sub_only = TRUE;
+
+ threaded_run(folder, ¶m, &result, list_run);
+
+ * p_result = result.list;
+
+ debug_print("imap lsub - end %p\n", result.list);
+
+ return result.error;
+}
+
+struct subscribe_param {
+ mailimap * imap;
+ const char * mb;
+ gboolean subscribe;
+};
+
+struct subscribe_result {
+ int error;
+};
+
+static void subscribe_run(struct etpan_thread_op * op)
+{
+ struct subscribe_param * param;
+ struct subscribe_result * result;
+ int r;
+
+ param = op->param;
+ result = op->result;
+
+ CHECK_IMAP();
+
+ if (param->mb == NULL) {
+ result->error = -1;
+ debug_print("no mb\n");
+ return;
+ }
+ if (param->subscribe)
+ r = mailimap_subscribe(param->imap, param->mb);
+ else
+ r = mailimap_unsubscribe(param->imap, param->mb);
+ result->error = r;
+ debug_print("imap %ssubscribe run - end %d\n", param->subscribe?"":"un", r);
+}
+
+int imap_threaded_subscribe(Folder * folder, const char * mb,
+ gboolean subscribe)
+{
+ struct subscribe_param param;
+ struct subscribe_result result;
+
+ debug_print("imap list - begin\n");
+
+ param.imap = get_imap(folder);
+ param.mb = mb;
+ param.subscribe = subscribe;
+ threaded_run(folder, ¶m, &result, subscribe_run);
+
+ return result.error;
+}
struct login_param {
mailimap * imap;
old_debug = mailstream_debug;
mailstream_debug = 0;
#endif
- if (!strcmp(param->type, "LOGIN"))
+ if (!strcmp(param->type, "plaintext"))
r = mailimap_login(param->imap,
param->login, param->password);
else if (!strcmp(param->type, "GSSAPI"))
param->type, param->server, NULL, NULL,
param->login, param->login,
param->password, NULL);
- else
+ else if (!strcmp(param->type, "SCRAM-SHA-1"))
+ /* 7th argument has to be NULL here, to stop libetpan sending the
+ * a= attribute in its initial SCRAM-SHA-1 message to server. At least
+ * Dovecot 2.2 doesn't seem to like that, and will not authenticate
+ * succesfully. */
+ r = mailimap_authenticate(param->imap,
+ param->type, NULL, NULL, NULL,
+ NULL, param->login,
+ param->password, NULL);
+ else
r = mailimap_authenticate(param->imap,
param->type, NULL, NULL, NULL,
param->login, param->login,
#endif
result->error = r;
+ if (param->imap->imap_response)
+ imap_logger_cmd(0, param->imap->imap_response, strlen(param->imap->imap_response));
debug_print("imap login run - end %i\n", r);
}
debug_print("imap login - begin\n");
+ if (!folder)
+ return MAILIMAP_ERROR_INVAL;
+
param.imap = get_imap(folder);
param.login = login;
param.password = password;
debug_print("imap noop run - end %i\n", r);
}
-int imap_threaded_noop(Folder * folder, unsigned int * p_exists)
+int imap_threaded_noop(Folder * folder, unsigned int * p_exists,
+ unsigned int *p_recent,
+ unsigned int *p_expunge,
+ unsigned int *p_unseen,
+ unsigned int *p_uidnext,
+ unsigned int *p_uidval)
{
struct noop_param param;
struct noop_result result;
imap = get_imap(folder);
param.imap = imap;
-
- threaded_run(folder, ¶m, &result, noop_run);
-
- if (imap->imap_selection_info != NULL) {
+
+ if (threaded_run(folder, ¶m, &result, noop_run))
+ return MAILIMAP_ERROR_INVAL;
+
+ if (result.error == 0 && imap && imap->imap_selection_info != NULL) {
* p_exists = imap->imap_selection_info->sel_exists;
- }
- else {
+ * p_recent = imap->imap_selection_info->sel_recent;
+ * p_unseen = imap->imap_selection_info->sel_unseen;
+ * p_uidnext = imap->imap_selection_info->sel_uidnext;
+ * p_uidval = imap->imap_selection_info->sel_uidvalidity;
+ } else {
* p_exists = 0;
- }
-
- debug_print("imap noop - end\n");
+ * p_recent = 0;
+ * p_unseen = 0;
+ * p_uidnext = 0;
+ * p_uidval = 0;
+ }
+ if (result.error == 0 && imap && imap->imap_response_info != NULL &&
+ imap->imap_response_info->rsp_expunged != NULL) {
+ * p_expunge = clist_count(imap->imap_response_info->rsp_expunged);
+ } else {
+ * p_expunge = 0;
+ }
+ debug_print("imap noop - end [EXISTS %d RECENT %d EXPUNGE %d UNSEEN %d UIDNEXT %d UIDVAL %d]\n",
+ *p_exists, *p_recent, *p_expunge, *p_unseen,
+ *p_uidnext, *p_uidval);
return result.error;
}
-
+#ifdef USE_GNUTLS
struct starttls_result {
int error;
};
return;
}
- tls_low = mailstream_low_tls_open(fd);
+ tls_low = mailstream_low_tls_open_with_callback(fd, etpan_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;
-
+ gboolean accept_if_valid = FALSE;
+
debug_print("imap starttls - begin\n");
-
+
param.imap = get_imap(folder);
param.server = host;
param.port = port;
-
- threaded_run(folder, ¶m, &result, starttls_run);
-
+ param.account = folder->account;
+
+ if (folder->account)
+ accept_if_valid = folder->account->ssl_certs_auto_accept;
+
+ if (threaded_run(folder, ¶m, &result, starttls_run))
+ return MAILIMAP_ERROR_INVAL;
+
debug_print("imap starttls - end\n");
- if (result.error == 0 && !etpan_skip_ssl_cert_check) {
- cert_len = (int)mailstream_ssl_get_certificate(param.imap->imap_stream, &certificate);
- if (etpan_certificate_check(certificate, cert_len, ¶m) < 0)
- result.error = MAILIMAP_ERROR_STREAM;
- if (certificate)
- free(certificate);
+ if (result.error == 0 && param.imap && !etpan_skip_ssl_cert_check) {
+ if (etpan_certificate_check(param.imap->imap_stream, host, port,
+ accept_if_valid) != TRUE)
+ return MAILIMAP_ERROR_SSL;
}
return result.error;
}
-
-
+#endif
struct create_param {
mailimap * imap;
int imap_threaded_select(Folder * folder, const char * mb,
gint * exists, gint * recent, gint * unseen,
- guint32 * uid_validity)
+ guint32 * uid_validity,gint *can_create_flags,
+ GSList **ok_flags)
{
struct select_param param;
struct select_result result;
mailimap * imap;
-
+
debug_print("imap select - begin\n");
imap = get_imap(folder);
param.imap = imap;
param.mb = mb;
- threaded_run(folder, ¶m, &result, select_run);
-
+ if (threaded_run(folder, ¶m, &result, select_run))
+ return MAILIMAP_ERROR_INVAL;
+
if (result.error != MAILIMAP_NO_ERROR)
return result.error;
- if (imap->imap_selection_info == NULL)
+ if (!imap || imap->imap_selection_info == NULL)
return MAILIMAP_ERROR_PARSE;
* exists = imap->imap_selection_info->sel_exists;
* recent = imap->imap_selection_info->sel_recent;
* unseen = imap->imap_selection_info->sel_unseen;
* uid_validity = imap->imap_selection_info->sel_uidvalidity;
-
+ * can_create_flags = FALSE;
+
+ if (imap->imap_selection_info->sel_perm_flags) {
+ GSList *t_flags = NULL;
+ 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)
+ *can_create_flags = TRUE;
+ else if (flag->fl_flag &&
+ flag->fl_flag->fl_type == 6 &&
+ !strcmp(flag->fl_flag->fl_data.fl_extension, "*"))
+ *can_create_flags = TRUE;
+ if (flag->fl_flag && ok_flags) {
+ MsgPermFlags c_flag = 0;
+ switch (flag->fl_flag->fl_type) {
+ case MAILIMAP_FLAG_ANSWERED:
+ c_flag = IMAP_FLAG_ANSWERED;
+ break;
+ case MAILIMAP_FLAG_FLAGGED:
+ c_flag = IMAP_FLAG_FLAGGED;
+ break;
+ case MAILIMAP_FLAG_DELETED:
+ c_flag = IMAP_FLAG_DELETED;
+ break;
+ case MAILIMAP_FLAG_DRAFT:
+ c_flag = IMAP_FLAG_DRAFT;
+ break;
+ case MAILIMAP_FLAG_SEEN:
+ c_flag = IMAP_FLAG_SEEN;
+ break;
+ case MAILIMAP_FLAG_KEYWORD:
+ 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;
+ }
+ if (c_flag != 0) {
+ t_flags = g_slist_prepend(t_flags,
+ GUINT_TO_POINTER(c_flag));
+ }
+ }
+ }
+ if (ok_flags)
+ *ok_flags = t_flags;
+ }
debug_print("imap select - end\n");
return result.error;
}
-
-
-struct examine_param {
- mailimap * imap;
- const char * mb;
-};
-
-struct examine_result {
- int error;
-};
-
-static void examine_run(struct etpan_thread_op * op)
+static void close_run(struct etpan_thread_op * op)
{
- struct examine_param * param;
- struct examine_result * result;
+ struct select_param * param;
+ struct select_result * result;
int r;
param = op->param;
CHECK_IMAP();
- r = mailimap_examine(param->imap, param->mb);
+ r = mailimap_close(param->imap);
+
+ result->error = r;
+ debug_print("imap close run - end %i\n", r);
+}
+
+int imap_threaded_close(Folder * folder)
+{
+ struct select_param param;
+ struct select_result result;
+ mailimap * imap;
+
+ debug_print("imap close - begin\n");
+
+ imap = get_imap(folder);
+ param.imap = imap;
+
+ threaded_run(folder, ¶m, &result, close_run);
+
+ if (result.error != MAILIMAP_NO_ERROR)
+ return result.error;
+
+ debug_print("imap close - end\n");
+
+ return result.error;
+}
+
+struct examine_param {
+ mailimap * imap;
+ const char * mb;
+};
+
+struct examine_result {
+ int error;
+};
+
+static void examine_run(struct etpan_thread_op * op)
+{
+ struct examine_param * param;
+ struct examine_result * result;
+ int r;
+
+ param = op->param;
+ result = op->result;
+
+ CHECK_IMAP();
+
+ r = mailimap_examine(param->imap, param->mb);
result->error = r;
debug_print("imap examine run - end %i\n", r);
param.imap = imap;
param.mb = mb;
- threaded_run(folder, ¶m, &result, examine_run);
-
+ if (threaded_run(folder, ¶m, &result, examine_run))
+ return MAILIMAP_ERROR_INVAL;
+
if (result.error != MAILIMAP_NO_ERROR)
return result.error;
- if (imap->imap_selection_info == NULL)
+ if (!imap || imap->imap_selection_info == NULL)
return MAILIMAP_ERROR_PARSE;
* exists = imap->imap_selection_info->sel_exists;
struct search_param {
mailimap * imap;
int type;
+ const char *charset;
struct mailimap_set * set;
+ IMAPSearchKey* key;
};
struct search_result {
static struct mailimap_set *sc_mailimap_set_copy(struct mailimap_set *orig)
{
clist *list = orig ? orig->set_list : NULL;
- clist *newlist = clist_new();
+ clist *newlist;
clistiter *cur;
-
+
if (!orig)
return NULL;
- for (cur = clist_begin(list); cur; cur = clist_next(cur))
- clist_append(newlist,
+
+ newlist = clist_new();
+ if (!newlist)
+ return NULL;
+
+ for (cur = clist_begin(list); cur; cur = clist_next(cur)) {
+ if (clist_append(newlist,
sc_mailimap_set_item_copy(
- (struct mailimap_set_item *)clist_content(cur)));
+ (struct mailimap_set_item *)clist_content(cur))) != 0) {
+ clist_free(newlist);
+ return NULL;
+ }
+ }
return mailimap_set_new(newlist);
}
struct search_param * param;
struct search_result * result;
int r;
- struct mailimap_search_key * key = NULL;
- struct mailimap_search_key * uid_key = NULL;
- struct mailimap_search_key * search_type_key;
- clist * search_result;
+ struct mailimap_search_key * key = NULL;
+ struct mailimap_search_key * uid_key = NULL;
+ struct mailimap_search_key * search_type_key = NULL;
+ clist * search_result;
+
+ param = op->param;
+ result = op->result;
+
+ CHECK_IMAP();
+
+ /* we copy the mailimap_set because freeing the key is recursive */
+ if (param->set != NULL) {
+ uid_key = mailimap_search_key_new_uid(sc_mailimap_set_copy(param->set));
+ } else if (param->type == IMAP_SEARCH_TYPE_SIMPLE) {
+ uid_key = mailimap_search_key_new_all();
+ }
+ switch (param->type) {
+ case IMAP_SEARCH_TYPE_SIMPLE:
+ search_type_key = NULL;
+ break;
+ case IMAP_SEARCH_TYPE_SEEN:
+ search_type_key = imap_search_new(IMAP_SEARCH_CRITERIA_READ, NULL, NULL, 0);
+ break;
+ case IMAP_SEARCH_TYPE_UNSEEN:
+ search_type_key = imap_search_new(IMAP_SEARCH_CRITERIA_UNREAD, NULL, NULL, 0);
+ break;
+ case IMAP_SEARCH_TYPE_ANSWERED:
+ search_type_key = imap_search_new(IMAP_SEARCH_CRITERIA_REPLIED, NULL, NULL, 0);
+ break;
+ case IMAP_SEARCH_TYPE_FLAGGED:
+ search_type_key = imap_search_new(IMAP_SEARCH_CRITERIA_MARKED, NULL, NULL, 0);
+ break;
+ case IMAP_SEARCH_TYPE_DELETED:
+ search_type_key = imap_search_new(IMAP_SEARCH_CRITERIA_DELETED, NULL, NULL, 0);
+ break;
+ case IMAP_SEARCH_TYPE_FORWARDED:
+ search_type_key = imap_search_new(IMAP_SEARCH_CRITERIA_TAG, NULL, RTAG_FORWARDED, 0);
+ break;
+ case IMAP_SEARCH_TYPE_SPAM:
+ search_type_key = imap_search_new(IMAP_SEARCH_CRITERIA_TAG, NULL, RTAG_JUNK, 0);
+ break;
+ case IMAP_SEARCH_TYPE_KEYED:
+ search_type_key = param->key;
+ break;
+ }
+
+ if (search_type_key != NULL) {
+ if (param->set != NULL) {
+ key = mailimap_search_key_new_multiple_empty();
+ mailimap_search_key_multiple_add(key, search_type_key);
+ mailimap_search_key_multiple_add(key, uid_key);
+ } else {
+ key = search_type_key;
+ }
+ } else if (uid_key != NULL) {
+ key = uid_key;
+ }
+
+ if (key == NULL) {
+ g_warning("no key!");
+ result = op->result;
+ result->error = -1;
+ result->search_result = NULL;
+ } else {
+ mailstream_logger = imap_logger_uid;
+
+ r = mailimap_uid_search(param->imap, param->charset, key, &search_result);
+
+ mailstream_logger = imap_logger_cmd;
+
+ /* free the key (with the imapset) */
+ mailimap_search_key_free(key);
+
+ result->error = r;
+ result->search_result = search_result;
+ }
+ debug_print("imap search run - end %i\n", result->error);
+}
+
+int imap_threaded_search(Folder * folder, int search_type, IMAPSearchKey* key,
+ const char *charset, struct mailimap_set * set,
+ clist ** search_result)
+{
+ struct search_param param;
+ struct search_result result;
+ mailimap * imap;
+
+ debug_print("imap search - begin\n");
+
+ imap = get_imap(folder);
+ param.imap = imap;
+ param.set = set;
+ param.charset = charset;
+ param.type = search_type;
+ param.key = key;
+
+ threaded_run(folder, ¶m, &result, search_run);
+
+ if (result.error != MAILIMAP_NO_ERROR)
+ return result.error;
+
+ debug_print("imap search - end\n");
+
+ * search_result = result.search_result;
+
+ return result.error;
+}
+
+
+struct _IMAPSearchKey {
+ struct mailimap_search_key* key;
+};
+
+IMAPSearchKey* imap_search_new(gint criteria,
+ const gchar *header,
+ const gchar *expr,
+ int value)
+{
+ char* sk_bcc = NULL;
+ struct mailimap_date* sk_before = NULL;
+ char* sk_body = NULL;
+ char* sk_cc = NULL;
+ char* sk_from = NULL;
+ char* sk_keyword = NULL;
+ struct mailimap_date* sk_on = NULL;
+ struct mailimap_date* sk_since = NULL;
+ char* sk_subject = NULL;
+ char* sk_text = NULL;
+ char* sk_to = NULL;
+ char* sk_unkeyword = NULL;
+ char* sk_header_name = NULL;
+ char* sk_header_value = NULL;
+ uint32_t sk_larger = 0;
+ struct mailimap_search_key* sk_not = NULL;
+ struct mailimap_search_key* sk_or1 = NULL;
+ struct mailimap_search_key* sk_or2 = NULL;
+ struct mailimap_date* sk_sentbefore = NULL;
+ struct mailimap_date* sk_senton = NULL;
+ struct mailimap_date* sk_sentsince = NULL;
+ uint32_t sk_smaller = 0;
+ struct mailimap_set* sk_uid = NULL;
+ struct mailimap_set* sk_set = NULL;
+ clist* sk_multiple = NULL;
+ int etpan_matcher_type;
+
+ switch (criteria) {
+ case IMAP_SEARCH_CRITERIA_ALL: etpan_matcher_type = MAILIMAP_SEARCH_KEY_ALL; break;
+ case IMAP_SEARCH_CRITERIA_READ: etpan_matcher_type = MAILIMAP_SEARCH_KEY_SEEN; break;
+ case IMAP_SEARCH_CRITERIA_UNREAD: etpan_matcher_type = MAILIMAP_SEARCH_KEY_UNSEEN; break;
+ case IMAP_SEARCH_CRITERIA_NEW: etpan_matcher_type = MAILIMAP_SEARCH_KEY_NEW; break;
+ case IMAP_SEARCH_CRITERIA_MARKED: etpan_matcher_type = MAILIMAP_SEARCH_KEY_FLAGGED; break;
+ case IMAP_SEARCH_CRITERIA_REPLIED: etpan_matcher_type = MAILIMAP_SEARCH_KEY_ANSWERED; break;
+ case IMAP_SEARCH_CRITERIA_DELETED: etpan_matcher_type = MAILIMAP_SEARCH_KEY_DELETED; break;
+
+ case IMAP_SEARCH_CRITERIA_TAG:
+ sk_keyword = strdup(expr);
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_KEYWORD;
+ break;
+
+ case IMAP_SEARCH_CRITERIA_SUBJECT:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_SUBJECT;
+ sk_subject = strdup(expr);
+ break;
+
+ case IMAP_SEARCH_CRITERIA_TO:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_TO;
+ sk_to = strdup(expr);
+ break;
+
+ case IMAP_SEARCH_CRITERIA_CC:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_CC;
+ sk_cc = strdup(expr);
+ break;
+
+ case IMAP_SEARCH_CRITERIA_AGE_GREATER:
+ case IMAP_SEARCH_CRITERIA_AGE_LOWER:
+ {
+ struct tm tm;
+ time_t limit = time(NULL) - 60 * 60 * 24 * value;
+
+ tzset();
+ localtime_r(&limit, &tm);
+ if (criteria == IMAP_SEARCH_CRITERIA_AGE_GREATER) {
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_SENTBEFORE;
+ sk_sentbefore = mailimap_date_new(tm.tm_mday, tm.tm_mon, tm.tm_year + 1900);
+ } else {
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_SENTSINCE;
+ sk_sentsince = mailimap_date_new(tm.tm_mday, tm.tm_mon, tm.tm_year + 1900);
+ }
+ break;
+ }
+
+ case IMAP_SEARCH_CRITERIA_BODY:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_BODY;
+ sk_body = strdup(expr);
+ break;
+
+ case IMAP_SEARCH_CRITERIA_MESSAGE:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_TEXT;
+ sk_text = strdup(expr);
+ break;
+
+ case IMAP_SEARCH_CRITERIA_HEADER:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_HEADER;
+ sk_header_name = strdup(header);
+ sk_header_value = strdup(expr);
+ break;
+
+ case IMAP_SEARCH_CRITERIA_FROM:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_FROM;
+ sk_from = strdup(expr);
+ break;
+
+ case IMAP_SEARCH_CRITERIA_SIZE_GREATER:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_LARGER;
+ sk_larger = value;
+ break;
+
+ case IMAP_SEARCH_CRITERIA_SIZE_SMALLER:
+ etpan_matcher_type = MAILIMAP_SEARCH_KEY_SMALLER;
+ sk_smaller = value;
+ break;
+
+ default:
+ return NULL;
+ }
+
+ return mailimap_search_key_new(etpan_matcher_type,
+ sk_bcc, sk_before, sk_body, sk_cc, sk_from, sk_keyword,
+ sk_on, sk_since, sk_subject, sk_text, sk_to,
+ sk_unkeyword, sk_header_name,sk_header_value, sk_larger,
+ sk_not, sk_or1, sk_or2, sk_sentbefore, sk_senton,
+ sk_sentsince, sk_smaller, sk_uid, sk_set, sk_multiple);
+}
+
+IMAPSearchKey* imap_search_not(IMAPSearchKey* key)
+{
+ return mailimap_search_key_new_not(key);
+}
+
+IMAPSearchKey* imap_search_or(IMAPSearchKey* l, IMAPSearchKey* r)
+{
+ return mailimap_search_key_new_or(l, r);
+}
+
+IMAPSearchKey* imap_search_and(IMAPSearchKey* l, IMAPSearchKey* r)
+{
+ IMAPSearchKey* result = mailimap_search_key_new_multiple_empty();
+ mailimap_search_key_multiple_add(result, l);
+ mailimap_search_key_multiple_add(result, r);
+
+ return result;
+}
+
+void imap_search_free(IMAPSearchKey* key)
+{
+ if (!key)
+ return;
+
+ mailimap_search_key_free(key);
+}
+
+
+
+static int imap_get_msg_att_info(struct mailimap_msg_att * msg_att,
+ uint32_t * puid,
+ char ** pheaders,
+ size_t * pref_size,
+ struct mailimap_msg_att_dynamic ** patt_dyn);
+
+static int
+result_to_uid_list(clist * fetch_result, carray ** result)
+{
+ clistiter * cur = NULL;
+ int r;
+ int res;
+ carray * tab;
+
+ tab = carray_new(128);
+ if (tab == NULL) {
+ res = MAILIMAP_ERROR_MEMORY;
+ goto err;
+ }
+
+ 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;
+
+ msg_att = clist_content(cur);
+
+ uid = 0;
+ imap_get_msg_att_info(msg_att, &uid, NULL, NULL, NULL);
+
+ puid = malloc(sizeof(* puid));
+ if (puid == NULL) {
+ res = MAILIMAP_ERROR_MEMORY;
+ goto free_list;
+ }
+ * puid = uid;
+
+ r = carray_add(tab, puid, NULL);
+ if (r < 0) {
+ free(puid);
+ res = MAILIMAP_ERROR_MEMORY;
+ goto free_list;
+ }
+ }
+
+ * result = tab;
+
+ return MAILIMAP_NO_ERROR;
+
+ free_list:
+ imap_fetch_uid_list_free(tab);
+ err:
+ return res;
+}
+
+static int imap_get_messages_list(mailimap * imap,
+ uint32_t first_index,
+ carray ** result)
+{
+ carray * env_list;
+ int r;
+ struct mailimap_fetch_att * fetch_att;
+ struct mailimap_fetch_type * fetch_type;
+ struct mailimap_set * set;
+ clist * fetch_result;
+ int res;
+
+ set = mailimap_set_new_interval(first_index, 0);
+ if (set == NULL) {
+ res = MAILIMAP_ERROR_MEMORY;
+ goto err;
+ }
+
+ fetch_type = mailimap_fetch_type_new_fetch_att_list_empty();
+ if (fetch_type == NULL) {
+ res = MAILIMAP_ERROR_MEMORY;
+ goto free_set;
+ }
+
+ fetch_att = mailimap_fetch_att_new_uid();
+ if (fetch_att == NULL) {
+ res = MAILIMAP_ERROR_MEMORY;
+ goto free_fetch_type;
+ }
+
+ r = mailimap_fetch_type_new_fetch_att_list_add(fetch_type, fetch_att);
+ if (r != MAILIMAP_NO_ERROR) {
+ mailimap_fetch_att_free(fetch_att);
+ res = MAILIMAP_ERROR_MEMORY;
+ goto free_fetch_type;
+ }
+
+ mailstream_logger = imap_logger_fetch;
+
+ r = mailimap_uid_fetch(imap, set,
+ fetch_type, &fetch_result);
+
+ mailstream_logger = imap_logger_cmd;
+ mailimap_fetch_type_free(fetch_type);
+ mailimap_set_free(set);
+
+ if (r != MAILIMAP_NO_ERROR) {
+ res = r;
+ goto err;
+ }
+
+ env_list = NULL;
+ r = result_to_uid_list(fetch_result, &env_list);
+ mailimap_fetch_list_free(fetch_result);
+
+ * result = env_list;
+
+ return MAILIMAP_NO_ERROR;
+
+ free_fetch_type:
+ mailimap_fetch_type_free(fetch_type);
+ free_set:
+ mailimap_set_free(set);
+ err:
+ return res;
+}
+
+
+
+
+struct fetch_uid_param {
+ mailimap * imap;
+ uint32_t first_index;
+};
+
+struct fetch_uid_result {
+ int error;
+ carray * fetch_result;
+};
+
+static void fetch_uid_run(struct etpan_thread_op * op)
+{
+ struct fetch_uid_param * param;
+ struct fetch_uid_result * result;
+ carray * fetch_result;
+ int r;
param = op->param;
result = op->result;
CHECK_IMAP();
- /* we copy the mailimap_set because freeing the key is recursive */
- if (param->set != NULL) {
- uid_key = mailimap_search_key_new_uid(sc_mailimap_set_copy(param->set));
- } else if (param->type == IMAP_SEARCH_TYPE_SIMPLE) {
- uid_key = mailimap_search_key_new_all();
- }
- search_type_key = NULL;
- switch (param->type) {
- case IMAP_SEARCH_TYPE_SIMPLE:
- search_type_key = NULL;
- break;
-
- case IMAP_SEARCH_TYPE_SEEN:
- search_type_key = mailimap_search_key_new(MAILIMAP_SEARCH_KEY_SEEN,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, 0,
- NULL, NULL, NULL, NULL, NULL,
- NULL, 0, NULL, NULL, NULL);
- break;
-
- case IMAP_SEARCH_TYPE_UNSEEN:
- search_type_key = mailimap_search_key_new(MAILIMAP_SEARCH_KEY_UNSEEN,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, 0,
- NULL, NULL, NULL, NULL, NULL,
- NULL, 0, NULL, NULL, NULL);
- break;
-
- case IMAP_SEARCH_TYPE_ANSWERED:
- search_type_key = mailimap_search_key_new(MAILIMAP_SEARCH_KEY_ANSWERED,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, 0,
- NULL, NULL, NULL, NULL, NULL,
- NULL, 0, NULL, NULL, NULL);
- break;
-
- case IMAP_SEARCH_TYPE_FLAGGED:
- search_type_key = mailimap_search_key_new(MAILIMAP_SEARCH_KEY_FLAGGED,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, 0,
- NULL, NULL, NULL, NULL, NULL,
- NULL, 0, NULL, NULL, NULL);
- break;
- case IMAP_SEARCH_TYPE_DELETED:
- search_type_key = mailimap_search_key_new(MAILIMAP_SEARCH_KEY_DELETED,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, 0,
- NULL, NULL, NULL, NULL, NULL,
- NULL, 0, NULL, NULL, NULL);
- break;
- }
-
- if (search_type_key != NULL) {
- if (param->set != NULL) {
- key = mailimap_search_key_new_multiple_empty();
- mailimap_search_key_multiple_add(key, search_type_key);
- mailimap_search_key_multiple_add(key, uid_key);
- } else {
- key = search_type_key;
- }
- } else if (uid_key != NULL) {
- key = uid_key;
- }
-
- if (key == NULL) {
- g_warning("no key!");
- result = op->result;
- result->error = -1;
- result->search_result = NULL;
- } else {
- mailstream_logger = imap_logger_uid;
-
- r = mailimap_uid_search(param->imap, NULL, key, &search_result);
-
- mailstream_logger = imap_logger_cmd;
+ fetch_result = NULL;
+ mailstream_logger = imap_logger_noop;
+ log_print(LOG_PROTOCOL, "IMAP4- [fetching UIDs...]\n");
- /* free the key (with the imapset) */
- mailimap_search_key_free(key);
+ r = imap_get_messages_list(param->imap, param->first_index,
+ &fetch_result);
+
+ mailstream_logger = imap_logger_cmd;
- result->error = r;
- result->search_result = search_result;
- }
- debug_print("imap search run - end %i\n", result->error);
+ result->error = r;
+ result->fetch_result = fetch_result;
+ debug_print("imap fetch_uid run - end %i\n", r);
}
-int imap_threaded_search(Folder * folder, int search_type,
- struct mailimap_set * set, clist ** search_result)
+int imap_threaded_fetch_uid(Folder * folder, uint32_t first_index,
+ carray ** fetch_result)
{
- struct search_param param;
- struct search_result result;
+ struct fetch_uid_param param;
+ struct fetch_uid_result result;
mailimap * imap;
- debug_print("imap search - begin\n");
-
+ debug_print("imap fetch_uid - begin\n");
+
imap = get_imap(folder);
param.imap = imap;
- param.set = set;
- param.type = search_type;
+ param.first_index = first_index;
- threaded_run(folder, ¶m, &result, search_run);
+ threaded_run(folder, ¶m, &result, fetch_uid_run);
if (result.error != MAILIMAP_NO_ERROR)
return result.error;
- debug_print("imap search - end\n");
+ debug_print("imap fetch_uid - end\n");
- * search_result = result.search_result;
+ * fetch_result = result.fetch_result;
return result.error;
}
+void imap_fetch_uid_list_free(carray * uid_list)
+{
+ unsigned int i;
+
+ for(i = 0 ; i < carray_count(uid_list) ; i ++) {
+ uint32_t * puid;
+
+ puid = carray_get(uid_list, i);
+ free(puid);
+ }
+ carray_free(uid_list);
+}
+
+
+static int imap_flags_to_flags(struct mailimap_msg_att_dynamic * att_dyn, GSList **tags);
+
static int
-uid_list_to_env_list(clist * fetch_result, carray ** result)
+result_to_uid_flags_list(clist * fetch_result, carray ** result)
{
- clistiter * cur;
+ clistiter * cur = NULL;
int r;
int res;
carray * tab;
- unsigned int i;
-
+ GSList *tags = NULL;
+
tab = carray_new(128);
if (tab == NULL) {
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;
- clistiter * item_cur;
uint32_t uid;
- size_t size;
uint32_t * puid;
+ struct mailimap_msg_att_dynamic * att_dyn;
+ int flags;
+ int * pflags;
+ tags = NULL;
+
msg_att = clist_content(cur);
uid = 0;
- size = 0;
- for(item_cur = clist_begin(msg_att->att_list) ;
- item_cur != NULL ;
- item_cur = clist_next(item_cur)) {
- struct mailimap_msg_att_item * item;
-
- item = clist_content(item_cur);
-
- switch (item->att_type) {
- case MAILIMAP_MSG_ATT_ITEM_STATIC:
- switch (item->att_data.att_static->att_type) {
- case MAILIMAP_MSG_ATT_UID:
- uid = item->att_data.att_static->att_data.att_uid;
- break;
- }
- }
- }
+ att_dyn = NULL;
+ imap_get_msg_att_info(msg_att, &uid, NULL, NULL, &att_dyn);
+ if (uid == 0)
+ continue;
+ if (att_dyn == NULL)
+ continue;
+
+ flags = imap_flags_to_flags(att_dyn, &tags);
puid = malloc(sizeof(* puid));
if (puid == NULL) {
goto free_list;
}
* puid = uid;
-
+
r = carray_add(tab, puid, NULL);
if (r < 0) {
free(puid);
res = MAILIMAP_ERROR_MEMORY;
goto free_list;
}
+ pflags = malloc(sizeof(* pflags));
+ if (pflags == NULL) {
+ res = MAILIMAP_ERROR_MEMORY;
+ goto free_list;
+ }
+ * pflags = flags;
+ r = carray_add(tab, pflags, NULL);
+ if (r < 0) {
+ free(pflags);
+ res = MAILIMAP_ERROR_MEMORY;
+ goto free_list;
+ }
+ r = carray_add(tab, tags, NULL);
+ if (r < 0) {
+ free(pflags);
+ res = MAILIMAP_ERROR_MEMORY;
+ goto free_list;
+ }
}
* result = tab;
return MAILIMAP_NO_ERROR;
free_list:
- for(i = 0 ; i < carray_count(tab) ; i++)
- mailmessage_free(carray_get(tab, i));
+ imap_fetch_uid_flags_list_free(tab);
+ slist_free_strings_full(tags);
err:
return res;
}
-static int imap_get_messages_list(mailimap * imap,
- uint32_t first_index,
- carray ** result)
+static int imap_get_messages_flags_list(mailimap * imap,
+ uint32_t first_index,
+ carray ** result)
{
carray * env_list;
int r;
goto free_set;
}
+ fetch_att = mailimap_fetch_att_new_flags();
+ if (fetch_att == NULL) {
+ res = MAILIMAP_ERROR_MEMORY;
+ goto free_fetch_type;
+ }
+
+ r = mailimap_fetch_type_new_fetch_att_list_add(fetch_type, fetch_att);
+ if (r != MAILIMAP_NO_ERROR) {
+ mailimap_fetch_att_free(fetch_att);
+ res = MAILIMAP_ERROR_MEMORY;
+ goto free_fetch_type;
+ }
+
fetch_att = mailimap_fetch_att_new_uid();
if (fetch_att == NULL) {
res = MAILIMAP_ERROR_MEMORY;
goto free_fetch_type;
}
+ mailstream_logger = imap_logger_fetch;
+
r = mailimap_uid_fetch(imap, set,
fetch_type, &fetch_result);
+ mailstream_logger = imap_logger_cmd;
mailimap_fetch_type_free(fetch_type);
mailimap_set_free(set);
}
env_list = NULL;
- r = uid_list_to_env_list(fetch_result, &env_list);
+ r = result_to_uid_flags_list(fetch_result, &env_list);
mailimap_fetch_list_free(fetch_result);
* result = env_list;
-
-struct fetch_uid_param {
- mailimap * imap;
- uint32_t first_index;
-};
-
-struct fetch_uid_result {
- int error;
- carray * fetch_result;
-};
-
-static void fetch_uid_run(struct etpan_thread_op * op)
+static void fetch_uid_flags_run(struct etpan_thread_op * op)
{
struct fetch_uid_param * param;
struct fetch_uid_result * result;
CHECK_IMAP();
fetch_result = NULL;
- r = imap_get_messages_list(param->imap, param->first_index,
- &fetch_result);
+ r = imap_get_messages_flags_list(param->imap, param->first_index,
+ &fetch_result);
result->error = r;
result->fetch_result = fetch_result;
debug_print("imap fetch_uid run - end %i\n", r);
}
-int imap_threaded_fetch_uid(Folder * folder, uint32_t first_index,
- carray ** fetch_result)
+int imap_threaded_fetch_uid_flags(Folder * folder, uint32_t first_index,
+ carray ** fetch_result)
{
struct fetch_uid_param param;
struct fetch_uid_result result;
param.imap = imap;
param.first_index = first_index;
- threaded_run(folder, ¶m, &result, fetch_uid_run);
+ mailstream_logger = imap_logger_noop;
+ log_print(LOG_PROTOCOL, "IMAP4- [fetching flags...]\n");
+
+ threaded_run(folder, ¶m, &result, fetch_uid_flags_run);
+
+ mailstream_logger = imap_logger_cmd;
+
if (result.error != MAILIMAP_NO_ERROR)
return result.error;
}
-void imap_fetch_uid_list_free(carray * uid_list)
+void imap_fetch_uid_flags_list_free(carray * uid_flags_list)
{
unsigned int i;
- for(i = 0 ; i < carray_count(uid_list) ; i ++) {
- uint32_t * puid;
+ for(i = 0 ; i < carray_count(uid_flags_list) ; i += 3) {
+ void * data;
- puid = carray_get(uid_list, i);
- free(puid);
+ data = carray_get(uid_flags_list, i);
+ free(data);
+ data = carray_get(uid_flags_list, i + 1);
+ free(data);
}
- carray_free(uid_list);
+ carray_free(uid_flags_list);
}
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) {
goto free_fetch_att;
}
+ mailstream_logger = imap_logger_fetch;
+
r = mailimap_uid_fetch(imap, set, fetch_type, &fetch_result);
+ mailstream_logger = imap_logger_cmd;
mailimap_fetch_type_free(fetch_type);
mailimap_set_free(set);
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;
}
r = fwrite(content, 1, content_size, f);
- if (r == 0) {
+ if (r < content_size) {
+ result->error = MAILIMAP_ERROR_FETCH;
goto fclose;
}
r = fclose(f);
if (r == EOF) {
- g_unlink(param->filename);
- goto close;
+ result->error = MAILIMAP_ERROR_FETCH;
+ goto unlink;
}
goto free;
close:
close(fd);
unlink:
- g_unlink(param->filename);
+ claws_unlink(param->filename);
free:
+ /* mmap_string_unref is a simple free in libetpan
+ * when it has MMAP_UNAVAILABLE defined */
if (mmap_string_unref(content) != 0)
free(content);
}
- debug_print("imap fetch_content run - end %i\n", r);
+ debug_print("imap fetch_content run - end %i\n", result->error);
}
int imap_threaded_fetch_content(Folder * folder, uint32_t msg_index,
-static int imap_flags_to_flags(struct mailimap_msg_att_dynamic * att_dyn)
+static int imap_flags_to_flags(struct mailimap_msg_att_dynamic * att_dyn, GSList **s_tags)
{
int flags;
clist * flag_list;
clistiter * cur;
-
+ GSList *tags = NULL;
+
flags = MSG_UNREAD;
flag_list = att_dyn->att_list;
flags &= ~MSG_UNREAD;
flags &= ~MSG_NEW;
break;
+ case MAILIMAP_FLAG_KEYWORD:
+ 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;
}
}
}
-
+ if (s_tags)
+ *s_tags = tags;
return flags;
}
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);
}
static struct imap_fetch_env_info *
-fetch_to_env_info(struct mailimap_msg_att * msg_att)
+fetch_to_env_info(struct mailimap_msg_att * msg_att, GSList **tags)
{
struct imap_fetch_env_info * info;
uint32_t uid;
char * headers;
size_t size;
struct mailimap_msg_att_dynamic * att_dyn;
-
+
imap_get_msg_att_info(msg_att, &uid, &headers, &size,
&att_dyn);
info->uid = uid;
info->headers = strdup(headers);
info->size = size;
- info->flags = imap_flags_to_flags(att_dyn);
+ info->flags = imap_flags_to_flags(att_dyn, tags);
return info;
}
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;
-
- msg_att = clist_content(cur);
- env_info = fetch_to_env_info(msg_att);
- if (!env_info)
- return MAILIMAP_ERROR_MEMORY;
- carray_add(env_list, env_info, NULL);
+ if (fetch_result) {
+ carray * env_list;
+ 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
+ || carray_add(env_list, env_info, NULL) != 0
+ || carray_add(env_list, tags, NULL) != 0) {
+ carray_free(env_list);
+ return MAILIMAP_ERROR_MEMORY;
+ }
+ }
+ * p_env_list = env_list;
+ } else {
+ * p_env_list = NULL;
}
-
- * p_env_list = env_list;
-
+
return MAIL_NO_ERROR;
}
-int imap_add_envelope_fetch_att(struct mailimap_fetch_type * fetch_type)
+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);
-
+ if (!hdrlist)
+ return MAIL_ERROR_MEMORY;
+ i = 0;
+ while (headers[i] != NULL) {
+ header = strdup(headers[i]);
+ if (header == NULL || clist_append(hdrlist, header) != 0) {
+ clist_free(hdrlist);
+ return MAIL_ERROR_MEMORY;
+ }
+ ++i;
+ }
+
imap_hdrlist = mailimap_header_list_new(hdrlist);
section = mailimap_section_new_header_fields(imap_hdrlist);
fetch_att = mailimap_fetch_att_new_body_peek_section(section);
mailimap_fetch_type_new_fetch_att_list_add(fetch_type, fetch_att);
-
+
return MAIL_NO_ERROR;
}
-int imap_add_header_fetch_att(struct mailimap_fetch_type * fetch_type)
+static int imap_add_header_fetch_att(struct mailimap_fetch_type * fetch_type)
{
struct mailimap_fetch_att * fetch_att;
struct mailimap_section * section;
else
r = imap_add_header_fetch_att(fetch_type);
+ mailstream_logger = imap_logger_fetch;
+
r = mailimap_uid_fetch(imap, set, fetch_type, &fetch_result);
+ mailstream_logger = imap_logger_cmd;
switch (r) {
case MAILIMAP_NO_ERROR:
break;
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;
param.imap = imap;
param.set = set;
- threaded_run(folder, ¶m, &result, fetch_env_run);
-
+ if (threaded_run(folder, ¶m, &result, fetch_env_run))
+ return MAILIMAP_ERROR_INVAL;
+
if (result.error != MAILIMAP_NO_ERROR) {
chashdatum key;
chashdatum value;
{
unsigned int i;
- for(i = 0 ; i < carray_count(env_list) ; i ++) {
+ for(i = 0 ; i < carray_count(env_list) ; i += 2) {
struct imap_fetch_env_info * env_info;
env_info = carray_get(env_list, i);
int r;
char * data;
size_t size;
+#ifndef G_OS_WIN32
struct stat stat_buf;
int fd;
+#endif
guint32 uid = 0, val = 0;
param = op->param;
CHECK_IMAP();
+#ifndef G_OS_WIN32
r = stat(param->filename, &stat_buf);
if (r < 0) {
result->error = MAILIMAP_ERROR_APPEND;
}
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;
result->error = MAILIMAP_ERROR_APPEND;
return;
}
-
+#else
+ data = file_read_to_str_no_recode(param->filename);
+ if (data == NULL) {
+ result->error = MAILIMAP_ERROR_APPEND;
+ return;
+ }
+ size = strlen(data);
+#endif
mailstream_logger = imap_logger_append;
r = mailimap_uidplus_append(param->imap, param->mailbox,
mailstream_logger = imap_logger_cmd;
+#ifndef G_OS_WIN32
munmap(data, size);
close(fd);
+#else
+ g_free(data);
+#endif
result->error = r;
result->uid = uid;
#define ENV_BUFFER_SIZE 512
-
+#ifndef G_OS_WIN32
static void do_exec_command(int fd, const char * command,
const char * servername, uint16_t port)
{
exit(0);
}
-#ifdef SOLARIS
- if (servername)
- snprintf(env_buffer, ENV_BUFFER_SIZE,
- "ETPANSERVER=%s", servername);
- else
- snprintf(env_buffer, ENV_BUFFER_SIZE, "ETPANSERVER=");
- putenv(env_buffer);
-#else
if (servername)
- setenv("ETPANSERVER", servername, 1);
+ g_setenv("ETPANSERVER", servername, TRUE);
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);
return sockfds[0];
}
-int socket_connect_cmd(mailimap * imap, const char * command,
+static int socket_connect_cmd(mailimap * imap, const char * command,
const char * server, int port)
{
int fd;
if (r != MAILIMAP_NO_ERROR_AUTHENTICATED
&& r != MAILIMAP_NO_ERROR_NON_AUTHENTICATED) {
mailstream_close(s);
+ if (imap)
+ imap->imap_stream = NULL;
return r;
}
struct connect_cmd_result result;
chashdatum key;
chashdatum value;
- mailimap * imap;
+ mailimap * imap, * oldimap;
- imap = get_imap(folder);
- if (imap) {
- debug_print("deleting old imap %p\n", imap);
- delete_imap(folder, imap);
- }
+ oldimap = get_imap(folder);
imap = mailimap_new(0, NULL);
+ if (oldimap) {
+ debug_print("deleting old imap %p\n", oldimap);
+ delete_imap(folder, oldimap);
+ }
+
key.data = &folder;
key.len = sizeof(folder);
value.data = imap;
threaded_run(folder, ¶m, &result, connect_cmd_run);
- debug_print("connect_cmd ok %i\n", result.error);
+ debug_print("connect_cmd ok %i with imap %p\n", result.error, imap);
return result.error;
}
+#endif /* G_OS_WIN32 */
+
+void imap_threaded_cancel(Folder * folder)
+{
+ mailimap * imap;
+
+ imap = get_imap(folder);
+ if (imap->imap_stream != NULL)
+ mailstream_cancel(imap->imap_stream);
+}
+
#else
void imap_main_init(void)
{
}
-void imap_main_done(void)
+void imap_main_done(gboolean have_connectivity)
{
}
void imap_main_set_timeout(int sec)
{
}
+void imap_threaded_cancel(Folder * folder);
+{
+}
+
#endif
projects / claws.git / blobdiff