#if defined(USE_SSL) || defined(USE_GNUTLS)
# include "mutt_ssl.h"
#endif
+#include "buffy.h"
#include "lib/mem.h"
#include "lib/intl.h"
static void imap_set_flag (IMAP_DATA * idata, int aclbit, int flag,
const char *str, char *flags, size_t flsize);
-/* imap_access: Check permissions on an IMAP mailbox. */
+/* imap_access: Check permissions on an IMAP mailbox.
+ * TODO: ACL checks. Right now we assume if it exists we can
+ * mess with it. */
int imap_access (const char *path, int flags)
{
IMAP_DATA *idata;
}
imap_fix_path (idata, mx.mbox, mailbox, sizeof (mailbox));
+
+ /* we may already be in the folder we're checking */
+ if (!ascii_strcmp(idata->mailbox, mx.mbox)) {
+ FREE (&mx.mbox);
+ return 0;
+ }
+
FREE (&mx.mbox);
imap_munge_mbox_name (mbox, sizeof (mbox), mailbox);
- /* TODO: ACL checks. Right now we assume if it exists we can mess with it. */
if (mutt_bit_isset (idata->capabilities, IMAP4REV1))
snprintf (buf, sizeof (buf), "STATUS %s (UIDVALIDITY)", mbox);
else if (mutt_bit_isset (idata->capabilities, STATUS))
idata->state = IMAP_CONNECTED;
if (imap_cmd_step (idata) != IMAP_CMD_CONTINUE) {
- mutt_error (_("Unexpected response received from server: %s"),
- idata->cmd.buf);
- mutt_sleep (1);
-
mutt_socket_close (idata->conn);
idata->state = IMAP_DISCONNECTED;
return -1;
goto bail;
#if defined(USE_SSL) || defined(USE_GNUTLS)
/* Attempt STARTTLS if available and desired. */
- if (mutt_bit_isset (idata->capabilities, STARTTLS) && !idata->conn->ssf) {
+ if (!idata->conn->ssf && (option(OPTSSLFORCETLS) ||
+ mutt_bit_isset (idata->capabilities, STARTTLS))) {
int rc;
- if ((rc = query_quadoption (OPT_SSLSTARTTLS,
- _("Secure connection with TLS?"))) == -1)
+ if (option (OPTSSLFORCETLS))
+ rc = M_YES;
+ else if ((rc = query_quadoption (OPT_SSLSTARTTLS,
+ _("Secure connection with TLS?"))) == -1)
goto err_close_conn;
if (rc == M_YES) {
if ((rc = imap_exec (idata, "STARTTLS", IMAP_CMD_FAIL_OK)) == -1)
}
}
}
+
+ if (option(OPTSSLFORCETLS) && ! idata->conn->ssf) {
+ mutt_error _("Encrypted connection unavailable");
+ mutt_sleep (1);
+ goto err_close_conn;
+ }
#endif
}
else if (ascii_strncasecmp ("* PREAUTH", idata->cmd.buf, 9) == 0) {
{
CONNECTION *conn;
IMAP_DATA *idata;
- char buf[LONG_STRING], mbox[LONG_STRING];
+ char buf[LONG_STRING];
char mailbox[LONG_STRING];
- int r;
IMAP_MBOX mx;
if (imap_parse_path (ctx->path, &mx))
/* in APPEND mode, we appear to hijack an existing IMAP connection -
* ctx is brand new and mostly empty */
- if (!(idata = imap_conn_find (&(mx.account), 0)))
- goto fail;
+ if (!(idata = imap_conn_find (&(mx.account), 0))) {
+ FREE(&mx.mbox);
+ return (-1);
+ }
conn = idata->conn;
ctx->magic = M_IMAP;
ctx->data = idata;
- /* check mailbox existance */
-
imap_fix_path (idata, mx.mbox, mailbox, sizeof (mailbox));
- /* We may be appending to the same folder we've selected. */
- if (!ascii_strcmp(idata->mailbox, mx.mbox)) {
- FREE (&mx.mbox);
- return 0;
- }
-
- imap_munge_mbox_name (mbox, sizeof (mbox), mailbox);
+ FREE(&mx.mbox);
- if (mutt_bit_isset (idata->capabilities, IMAP4REV1))
- snprintf (buf, sizeof (buf), "STATUS %s (UIDVALIDITY)", mbox);
- else if (mutt_bit_isset (idata->capabilities, STATUS))
- /* We have no idea what the other guy wants. UW imapd 8.3 wants this
- * (but it does not work if another mailbox is selected) */
- snprintf (buf, sizeof (buf), "STATUS %s (UID-VALIDITY)", mbox);
- else {
- /* STATUS not supported */
- mutt_message _("Unable to append to IMAP mailboxes at this server");
-
- goto fail;
- }
-
- r = imap_exec (idata, buf, IMAP_CMD_FAIL_OK);
- if (r == -2) {
- /* command failed cause folder doesn't exist */
- snprintf (buf, sizeof (buf), _("Create %s?"), mailbox);
- if (option (OPTCONFIRMCREATE) && mutt_yesorno (buf, 1) < 1)
- goto fail;
+ /* really we should also check for W_OK */
+ if (!imap_access (ctx->path, F_OK))
+ return 0;
- if (imap_create_mailbox (idata, mailbox) < 0)
- goto fail;
- }
- else if (r == -1)
- /* Hmm, some other failure */
- goto fail;
+ snprintf (buf, sizeof (buf), _("Create %s?"), mailbox);
+ if (option (OPTCONFIRMCREATE) && mutt_yesorno (buf, 1) < 1)
+ return -1;
- FREE (&mx.mbox);
- return 0;
+ if (imap_create_mailbox (idata, mailbox) < 0)
+ return -1;
-fail:
- FREE (&mx.mbox);
- return -1;
+ return (0);
}
/* imap_logout: Gracefully log out of server. */
}
}
- if (ctx->closing) {
+ if (expunge && ctx->closing) {
if (imap_exec (idata, "CLOSE", 0))
mutt_error (_("CLOSE failed"));
idata->state = IMAP_AUTHENTICATED;
return;
if (ctx == idata->ctx) {
- if (idata->state == IMAP_SELECTED) {
+ if (idata->state != IMAP_FATAL && idata->state == IMAP_SELECTED) {
/* mx_close_mailbox won't sync if there are no deleted messages
* and the mailbox is unchanged, so we may have to close here */
- if (idata->status != IMAP_FATAL && !ctx->deleted &&
- imap_exec (idata, "CLOSE", 0))
- mutt_error (_("CLOSE failed"));
+ if (!ctx->deleted && imap_exec (idata, "CLOSE", 0))
+ mutt_error (_("CLOSE failed"));
idata->state = IMAP_AUTHENTICATED;
}
return -1;
}
+/* trim dest to the length of the longest prefix it shares with src,
+ * returning the length of the trimmed string */
+static int longest_common_prefix (char *dest, const char* src,
+ int start, size_t dlen) {
+ int pos = start;
+
+ while (pos < dlen && dest[pos] && dest[pos] == src[pos])
+ pos++;
+ dest[pos] = '\0';
+
+ return pos;
+}
+
+/* look for IMAP URLs to complete from defined mailboxes. Could be extended
+ * to complete over open connections and account/folder hooks too. */
+static int imap_complete_hosts (char *dest, size_t len) {
+ BUFFY* mailbox;
+ CONNECTION* conn;
+ int rc = -1;
+ int matchlen;
+ int i = 0;
+
+ matchlen = mutt_strlen (dest);
+ if (list_empty (Incoming))
+ return (-1);
+ for (i = 0; i < Incoming->length; i++) {
+ mailbox = (BUFFY*) Incoming->data[i];
+ if (!safe_strncmp (dest, mailbox->path, matchlen)) {
+ if (rc) {
+ strfcpy (dest, mailbox->path, len);
+ rc = 0;
+ } else
+ longest_common_prefix (dest, mailbox->path, matchlen, len);
+ }
+ }
+
+ for (conn = mutt_socket_head (); conn->next; conn = conn->next) {
+ ciss_url_t url;
+ char urlstr[LONG_STRING];
+
+ if (conn->account.type != M_ACCT_TYPE_IMAP)
+ continue;
+
+ mutt_account_tourl (&conn->account, &url);
+ /* FIXME: how to handle multiple users on the same host? */
+ url.user = NULL;
+ url.path = NULL;
+ url_ciss_tostring (&url, urlstr, sizeof (urlstr), 0);
+ if (!safe_strncmp (dest, urlstr, matchlen)) {
+ if (rc) {
+ strfcpy (dest, urlstr, len);
+ rc = 0;
+ } else
+ longest_common_prefix (dest, urlstr, matchlen, len);
+ }
+ }
+
+ return rc;
+}
+
/* imap_complete: given a partial IMAP folder path, return a string which
* adds as much to the path as is unique */
-int imap_complete (char *dest, size_t dlen, char *path)
-{
+int imap_complete (char *dest, size_t dlen, char *path) {
CONNECTION *conn;
IMAP_DATA *idata;
char list[LONG_STRING];
char completion[LONG_STRING];
int clen, matchlen = 0;
int completions = 0;
- int pos = 0;
IMAP_MBOX mx;
- /* verify passed in path is an IMAP path */
- if (imap_parse_path (path, &mx)) {
- debug_print (2, ("bad path %s\n", path));
- return -1;
+ if (imap_parse_path (path, &mx) || !mx.mbox) {
+ strfcpy (dest, path, dlen);
+ return imap_complete_hosts (dest, dlen);
}
- /* don't open a new socket just for completion */
- if (!(idata = imap_conn_find (&(mx.account), M_IMAP_CONN_NONEW)))
- goto fail;
+ /* don't open a new socket just for completion. Instead complete over
+ * known mailboxes/hooks/etc */
+ if (!(idata = imap_conn_find (&(mx.account), M_IMAP_CONN_NONEW))) {
+ FREE (&mx.mbox);
+ strfcpy (dest, path, dlen);
+ return imap_complete_hosts (dest, dlen);
+ }
conn = idata->conn;
/* reformat path for IMAP list, and append wildcard */
continue;
}
- pos = 0;
- while (pos < matchlen && list_word[pos] &&
- completion[pos] == list_word[pos])
- pos++;
- completion[pos] = '\0';
- matchlen = pos;
-
+ matchlen = longest_common_prefix (completion, list_word, 0, matchlen);
completions++;
}
}
return 0;
}
-fail:
- FREE (&mx.mbox);
return -1;
}
projects / apps / madmutt.git / blobdiff