#include "procmsg.h"
#include "procheader.h"
#include "folder.h"
-#include "statusbar.h"
#include "prefs_account.h"
#include "codeconv.h"
#include "utils.h"
#include "log.h"
#define IMAP4_PORT 143
-#if USE_SSL
+#if USE_OPENSSL
#define IMAPS_PORT 993
#endif
FolderItem *item);
static GSList *imap_parse_list (Folder *folder,
IMAPSession *session,
- const gchar *real_path);
+ const gchar *real_path,
+ gchar *separator);
static void imap_create_missing_folders (Folder *folder);
static FolderItem *imap_create_special_folder
guint32 last_uid);
static void imap_delete_all_cached_messages (FolderItem *item);
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_open (const gchar *server,
gushort port,
SSLType ssl_type);
gushort port);
#endif
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_open_tunnel(const gchar *server,
const gchar *tunnelcmd,
SSLType ssl_type);
const gchar *tunnelcmd);
#endif
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_init_sock(SockInfo *sock, SSLType ssl_type);
#else
static SockInfo *imap_init_sock(SockInfo *sock);
static void imap_parse_namespace (IMAPSession *session,
IMAPFolder *folder);
+static void imap_get_namespace_by_list (IMAPSession *session,
+ IMAPFolder *folder);
static IMAPNameSpace *imap_find_namespace (IMAPFolder *folder,
const gchar *path);
static gchar imap_get_path_separator (IMAPFolder *folder,
static IMAPSession *imap_session_get(Folder *folder)
{
RemoteFolder *rfolder = REMOTE_FOLDER(folder);
+ Session *session = NULL;
gushort port;
g_return_val_if_fail(folder != NULL, NULL);
g_return_val_if_fail(folder->type == F_IMAP, NULL);
g_return_val_if_fail(folder->account != NULL, NULL);
-#if USE_SSL
+#if USE_OPENSSL
port = folder->account->set_imapport ? folder->account->imapport
: folder->account->ssl_imap == SSL_TUNNEL
? IMAPS_PORT : IMAP4_PORT;
: IMAP4_PORT;
#endif
- if (!rfolder->session) {
- rfolder->session =
- imap_session_new(folder->account);
- if (rfolder->session) {
- if (!IMAP_SESSION(rfolder->session)->authenticated)
- imap_session_authenticate(IMAP_SESSION(rfolder->session), folder->account);
- if (IMAP_SESSION(rfolder->session)->authenticated) {
- imap_parse_namespace(IMAP_SESSION(rfolder->session),
- IMAP_FOLDER(folder));
- rfolder->session->last_access_time = time(NULL);
- imap_reset_uid_lists(folder);
- } else {
- session_destroy(rfolder->session);
- rfolder->session = NULL;
- }
- }
- statusbar_pop_all();
- return IMAP_SESSION(rfolder->session);
+ /* Make sure we have a session */
+ if (rfolder->session != NULL) {
+ session = rfolder->session;
+ } else {
+ imap_reset_uid_lists(folder);
+ session = imap_session_new(folder->account);
+ }
+ if(session == NULL)
+ return NULL;
+
+ /* Make sure session is authenticated */
+ if (!IMAP_SESSION(session)->authenticated)
+ imap_session_authenticate(IMAP_SESSION(session), folder->account);
+ if (!IMAP_SESSION(session)->authenticated) {
+ session_destroy(session);
+ rfolder->session = NULL;
+ return NULL;
}
+ /* Make sure we have parsed the IMAP namespace */
+ imap_parse_namespace(IMAP_SESSION(session),
+ IMAP_FOLDER(folder));
+
/* I think the point of this code is to avoid sending a
* keepalive if we've used the session recently and therefore
* think it's still alive. Unfortunately, most of the code
* A better solution than sending a NOOP every time would be
* for every command to be prepared to retry until it is
* successfully sent. -- mbp */
- if (time(NULL) - rfolder->session->last_access_time < SESSION_TIMEOUT) {
- rfolder->session->last_access_time = time(NULL);
- statusbar_pop_all();
- return IMAP_SESSION(rfolder->session);
- }
-
- if (imap_cmd_noop(rfolder->session->sock) != IMAP_SUCCESS) {
- log_warning(_("IMAP4 connection to %s:%d has been"
- " disconnected. Reconnecting...\n"),
- folder->account->recv_server, port);
- session_destroy(rfolder->session);
- rfolder->session =
- imap_session_new(folder->account);
- if (rfolder->session) {
- if (!IMAP_SESSION(rfolder->session)->authenticated)
- imap_session_authenticate(IMAP_SESSION(rfolder->session), folder->account);
- if (IMAP_SESSION(rfolder->session)->authenticated) {
- imap_parse_namespace(IMAP_SESSION(rfolder->session),
- IMAP_FOLDER(folder));
- rfolder->session->last_access_time = time(NULL);
- imap_reset_uid_lists(folder);
+ if (time(NULL) - session->last_access_time > SESSION_TIMEOUT) {
+ /* verify that the session is still alive */
+ if (imap_cmd_noop(session->sock) != IMAP_SUCCESS) {
+ /* Check if this is the first try to establish a
+ connection, if yes we don't try to reconnect */
+ if (rfolder->session == NULL) {
+ log_warning(_("Connecting %s:%d failed"),
+ folder->account->recv_server, port);
+ session_destroy(session);
+ session = NULL;
} else {
- session_destroy(rfolder->session);
+ log_warning(_("IMAP4 connection to %s:%d has been"
+ " disconnected. Reconnecting...\n"),
+ folder->account->recv_server, port);
+ session_destroy(session);
+ /* Clear folders session to make imap_session_get create
+ a new session, because of rfolder->session == NULL
+ it will not try to reconnect again and so avoid an
+ endless loop */
rfolder->session = NULL;
+ session = SESSION(imap_session_get(folder));
}
}
}
- if (rfolder->session)
- rfolder->session->last_access_time = time(NULL);
- statusbar_pop_all();
- return IMAP_SESSION(rfolder->session);
+ rfolder->session = session;
+ if (session) {
+ session->last_access_time = time(NULL);
+ }
+ return IMAP_SESSION(session);
}
Session *imap_session_new(const PrefsAccount *account)
gushort port;
gboolean is_preauth;
-#ifdef USE_SSL
+#ifdef USE_OPENSSL
/* FIXME: IMAP over SSL only... */
SSLType ssl_type;
if (account->set_tunnelcmd) {
log_message(_("creating tunneled IMAP4 connection\n"));
-#if USE_SSL
+#if USE_OPENSSL
if ((imap_sock = imap_open_tunnel(account->recv_server,
account->tunnelcmd,
ssl_type)) == NULL)
log_message(_("creating IMAP4 connection to %s:%d ...\n"),
account->recv_server, port);
-#if USE_SSL
+#if USE_OPENSSL
if ((imap_sock = imap_open(account->recv_server, port,
ssl_type)) == NULL)
#else
}
/* Only need to log in if the connection was not PREAUTH */
- imap_greeting(imap_sock, &is_preauth);
+ if (imap_greeting(imap_sock, &is_preauth) != IMAP_SUCCESS) {
+ sock_close(imap_sock);
+ return NULL;
+ }
log_message("IMAP connection is %s-authenticated\n",
(is_preauth) ? "pre" : "un");
- session = g_new(IMAPSession, 1);
+ session = g_new(IMAPSession, 1);
SESSION(session)->type = SESSION_IMAP;
SESSION(session)->server = g_strdup(account->recv_server);
SESSION(session)->sock = imap_sock;
if (imap_cmd_login(SESSION(session)->sock, account->userid, pass) != IMAP_SUCCESS) {
imap_cmd_logout(SESSION(session)->sock);
- sock_close(SESSION(session)->sock);
return;
}
mlist = procmsg_read_cache(item, FALSE);
item->last_num = procmsg_get_last_num_in_msg_list(mlist);
procmsg_set_flags(mlist, item);
- statusbar_pop_all();
return mlist;
}
last_uid = first_uid;
} else {
imap_delete_all_cached_messages(item);
- statusbar_pop_all();
return NULL;
}
item->last_num = last_uid;
catch:
- statusbar_pop_all();
return mlist;
}
ok = imap_select(session, IMAP_FOLDER(folder), item->path,
NULL, NULL, NULL, NULL);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
- g_warning(_("can't select mailbox %s\n"), item->path);
+ g_warning("can't select mailbox %s\n", item->path);
g_free(filename);
return NULL;
}
debug_print("getting message %d...\n", uid);
ok = imap_cmd_fetch(SESSION(session)->sock, (guint32)uid, filename);
- statusbar_pop_all();
-
if (ok != IMAP_SUCCESS) {
- g_warning(_("can't fetch message %d\n"), uid);
+ g_warning("can't fetch message %d\n", uid);
g_free(filename);
return NULL;
}
ok = imap_status(session, IMAP_FOLDER(folder), dest->path,
&messages, &recent, &uid_next, &uid_validity, &unseen);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
- g_warning(_("can't append message %s\n"), file);
+ g_warning("can't append message %s\n", file);
return -1;
}
g_free(destdir);
if (ok != IMAP_SUCCESS) {
- g_warning(_("can't append message %s\n"), file);
+ g_warning("can't append message %s\n", file);
return -1;
}
if (!session) return -1;
if (msginfo->folder == dest) {
- g_warning(_("the src folder is identical to the dest.\n"));
+ g_warning("the src folder is identical to the dest.\n");
return -1;
}
ok = imap_status(session, IMAP_FOLDER(folder), dest->path,
&messages, &recent, &uid_next, &uid_validity, &unseen);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
- g_warning(_("can't copy message\n"));
+ g_warning("can't copy message\n");
return -1;
}
/* ensure source folder selected */
ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
NULL, NULL, NULL, NULL);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS)
return -1;
}
g_free(destdir);
- statusbar_pop_all();
if (ok == IMAP_SUCCESS)
return uid_next;
msginfo = (MsgInfo *)cur->data;
if (msginfo->folder == dest) {
- g_warning(_("the src folder is identical to the dest.\n"));
+ g_warning("the src folder is identical to the dest.\n");
continue;
}
/* ensure source folder selected */
ok = imap_select(session, IMAP_FOLDER(folder),
msginfo->folder->path, NULL, NULL, NULL, NULL);
- statusbar_pop_all();
if (remove_source)
debug_print("Moving message %s%c%d to %s ...\n",
ok = imap_cmd_expunge(SESSION(session)->sock);
g_free(destdir);
- statusbar_pop_all();
if (ok == IMAP_SUCCESS)
return 0;
ok = imap_select(session, IMAP_FOLDER(folder), item->path,
NULL, NULL, NULL, NULL);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS)
return ok;
ok = imap_set_message_flags
(IMAP_SESSION(REMOTE_FOLDER(folder)->session),
(guint32)uid, (guint32)uid, IMAP_FLAG_DELETED, TRUE);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't set deleted flags: %d\n"), uid);
return ok;
}
ok = imap_cmd_expunge(SESSION(session)->sock);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't expunge\n"));
return ok;
ok = imap_select(session, IMAP_FOLDER(folder), item->path,
NULL, NULL, NULL, NULL);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS)
return ok;
ok = imap_set_message_flags
(IMAP_SESSION(REMOTE_FOLDER(folder)->session),
uid, uid, IMAP_FLAG_DELETED, TRUE);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't set deleted flags: %d\n"), uid);
return ok;
}
ok = imap_cmd_expunge(SESSION(session)->sock);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't expunge\n"));
return ok;
ok = imap_select(session, IMAP_FOLDER(folder), item->path,
&exists, &recent, &unseen, &uid_validity);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS)
return ok;
if (exists == 0)
imap_cmd_gen_send(SESSION(session)->sock,
"STORE 1:%d +FLAGS (\\Deleted)", exists);
ok = imap_cmd_ok(SESSION(session)->sock, NULL);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't set deleted flags: 1:%d\n"), exists);
return ok;
}
ok = imap_cmd_expunge(SESSION(session)->sock);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't expunge\n"));
return ok;
ok = imap_status(session, IMAP_FOLDER(folder), item->path,
&messages, &recent, &uid_next, &uid_validity, &unseen);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) return -1;
item->new = unseen > 0 ? recent : 0;
wildcard_path);
strtailchomp(real_path, separator);
- item_list = imap_parse_list(folder, session, real_path);
+ item_list = imap_parse_list(folder, session, real_path, NULL);
g_free(real_path);
for (cur = item_list; cur != NULL; cur = cur->next) {
return IMAP_SUCCESS;
}
-static GSList *imap_parse_list(Folder *folder, IMAPSession *session, const gchar *real_path)
+static GSList *imap_parse_list(Folder *folder, IMAPSession *session,
+ const gchar *real_path, gchar *separator)
{
gchar buf[IMAPBUFSIZE];
gchar flags[256];
- gchar separator[16];
+ gchar separator_str[16];
gchar *p;
gchar *name;
gchar *loc_name, *loc_path;
if (!p) continue;
while (*p == ' ') p++;
- p = strchr_cpy(p, ' ', separator, sizeof(separator));
+ p = strchr_cpy(p, ' ', separator_str, sizeof(separator_str));
if (!p) continue;
- extract_quote(separator, '"');
- if (!strcmp(separator, "NIL"))
- separator[0] = '\0';
+ extract_quote(separator_str, '"');
+ if (!strcmp(separator_str, "NIL"))
+ separator_str[0] = '\0';
+ if (separator)
+ *separator = separator_str[0];
buf[0] = '\0';
while (*p == ' ') p++;
buf, sizeof(buf), str);
else
strncpy2(buf, p, sizeof(buf));
- strtailchomp(buf, separator[0]);
+ strtailchomp(buf, separator_str[0]);
if (buf[0] == '\0') continue;
if (!strcmp(buf, real_path)) continue;
- if (separator[0] != '\0')
- subst_char(buf, separator[0], '/');
+ if (separator_str[0] != '\0')
+ subst_char(buf, separator_str[0], '/');
name = g_basename(buf);
if (name[0] == '.') continue;
}
g_string_free(str, TRUE);
- statusbar_pop_all();
return item_list;
}
new_item = imap_create_folder(folder, item, name);
if (!new_item) {
- g_warning(_("Can't create '%s'\n"), name);
+ g_warning("Can't create '%s'\n", name);
if (!folder->inbox) return NULL;
new_item = imap_create_folder(folder, folder->inbox, name);
if (!new_item)
- g_warning(_("Can't create '%s' under INBOX\n"), name);
+ g_warning("Can't create '%s' under INBOX\n", name);
else
new_item->stype = stype;
} else
argbuf = g_ptr_array_new();
ok = imap_cmd_list(SESSION(session)->sock, NULL, imap_path,
argbuf);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't create mailbox: LIST failed\n"));
g_free(imap_path);
if (!exist) {
ok = imap_cmd_create(SESSION(session)->sock, imap_path);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't create mailbox\n"));
g_free(imap_path);
session->mbox = NULL;
ok = imap_cmd_examine(SESSION(session)->sock, "INBOX",
&exists, &recent, &unseen, &uid_validity);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
g_free(real_oldpath);
return -1;
imap_path_separator_subst(real_newpath, separator);
ok = imap_cmd_rename(SESSION(session)->sock, real_oldpath, real_newpath);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't rename mailbox: %s to %s\n"),
real_oldpath, real_newpath);
ok = imap_cmd_examine(SESSION(session)->sock, "INBOX",
&exists, &recent, &unseen, &uid_validity);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
g_free(path);
return -1;
}
ok = imap_cmd_delete(SESSION(session)->sock, path);
- statusbar_pop_all();
if (ok != IMAP_SUCCESS) {
log_warning(_("can't delete mailbox\n"));
g_free(path);
debug_print("done.\n");
}
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_open_tunnel(const gchar *server,
const gchar *tunnelcmd,
SSLType ssl_type)
log_warning(_("Can't establish IMAP4 session with: %s\n"),
server);
return NULL;
-#if USE_SSL
+#if USE_OPENSSL
return imap_init_sock(sock, ssl_type);
#else
return imap_init_sock(sock);
}
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_open(const gchar *server, gushort port,
SSLType ssl_type)
#else
return NULL;
}
-#if USE_SSL
+#if USE_OPENSSL
if (ssl_type == SSL_TUNNEL && !ssl_init_socket(sock)) {
log_warning(_("Can't establish IMAP4 session with: %s:%d\n"),
server, port);
#endif
}
-#if USE_SSL
+#if USE_OPENSSL
static SockInfo *imap_init_sock(SockInfo *sock, SSLType ssl_type)
#else
static SockInfo *imap_init_sock(SockInfo *sock)
#endif
{
imap_cmd_count = 0;
-#if USE_SSL
+#if USE_OPENSSL
if (ssl_type == SSL_STARTTLS) {
gint ok;
if (imap_cmd_namespace(SESSION(session)->sock, &ns_str)
!= IMAP_SUCCESS) {
log_warning(_("can't get namespace\n"));
+ imap_get_namespace_by_list(session, folder);
return;
}
g_free(ns_str);
}
+static void imap_get_namespace_by_list(IMAPSession *session, IMAPFolder *folder)
+{
+ GSList *item_list, *cur;
+ gchar separator = '\0';
+ IMAPNameSpace *namespace;
+
+ g_return_if_fail(session != NULL);
+ g_return_if_fail(folder != NULL);
+
+ if (folder->ns_personal != NULL ||
+ folder->ns_others != NULL ||
+ folder->ns_shared != NULL)
+ return;
+
+ imap_cmd_gen_send(SESSION(session)->sock, "LIST \"\" \"\"");
+ item_list = imap_parse_list(NULL, session, "", &separator);
+ for (cur = item_list; cur != NULL; cur = cur->next)
+ folder_item_destroy(FOLDER_ITEM(cur->data));
+ g_slist_free(item_list);
+
+ namespace = g_new(IMAPNameSpace, 1);
+ namespace->name = g_strdup("");
+ namespace->separator = separator;
+ folder->ns_personal = g_list_append(NULL, namespace);
+}
+
static IMAPNameSpace *imap_find_namespace_from_list(GList *ns_list,
const gchar *path)
{
if (cd == (iconv_t)-1) {
cd = iconv_open(conv_get_current_charset_str(), "UTF-7");
if (cd == (iconv_t)-1) {
- g_warning(_("iconv cannot convert UTF-7 to %s\n"),
+ g_warning("iconv cannot convert UTF-7 to %s\n",
conv_get_current_charset_str());
iconv_ok = FALSE;
return g_strdup(mutf7_str);
to_p = to_str = g_malloc(to_len + 1);
if (iconv(cd, &norm_utf7_p, &norm_utf7_len, &to_p, &to_len) == -1) {
- g_warning(_("iconv cannot convert UTF-7 to %s\n"),
+ g_warning("iconv cannot convert UTF-7 to %s\n",
conv_get_current_charset_str());
g_string_free(norm_utf7, TRUE);
g_free(to_str);
if (cd == (iconv_t)-1) {
cd = iconv_open("UTF-7", conv_get_current_charset_str());
if (cd == (iconv_t)-1) {
- g_warning(_("iconv cannot convert %s to UTF-7\n"),
+ g_warning("iconv cannot convert %s to UTF-7\n",
conv_get_current_charset_str());
iconv_ok = FALSE;
return g_strdup(from);
from_len -= mblen;
if (iconv(cd, &from_tmp, &mblen,
&norm_utf7_p, &norm_utf7_len) == -1) {
- g_warning(_("iconv cannot convert %s to UTF-7\n"),
+ g_warning("iconv cannot convert %s to UTF-7\n",
conv_get_current_charset_str());
return g_strdup(from);
}
projects / claws.git / blobdiff