* $Id$
*
* IMAP server for the Citadel system
- * Copyright (C) 2000-2005 by Art Cancro and others.
+ * Copyright (C) 2000-2007 by Art Cancro and others.
* This code is released under the terms of the GNU General Public License.
*
* WARNING: the IMAP protocol is badly designed. No implementation of it
#include "internet_addressing.h"
#include "serv_imap.h"
#include "imap_tools.h"
+#include "imap_list.h"
#include "imap_fetch.h"
#include "imap_search.h"
#include "imap_store.h"
+#include "imap_acl.h"
+#include "imap_metadata.h"
#include "imap_misc.h"
#ifdef HAVE_OPENSSL
* output this stuff in other places as well)
*/
void imap_output_capability_string(void) {
- cprintf("CAPABILITY IMAP4REV1 NAMESPACE AUTH=LOGIN");
+ cprintf("CAPABILITY IMAP4REV1 NAMESPACE ID ACL AUTH=LOGIN");
+
#ifdef HAVE_OPENSSL
if (!CC->redirect_ssl) cprintf(" STARTTLS");
#endif
+
+ /* We are building a partial implementation of METADATA for the sole purpose
+ * of interoperating with the ical/vcard version of the Bynari Insight Connector.
+ * If you were expecting something else, comment out one or both of these
+ * extension advertisements.
+ */
+ cprintf(" METADATA");
+ /* cprintf(" LIST-EXTENDED"); */
}
/*
+/*
+ * Implements the ID command (specified by RFC2971)
+ *
+ * We ignore the client-supplied information, and output a NIL response.
+ * Although this is technically a valid implementation of the extension, it
+ * is quite useless. It exists only so that we may see which clients are
+ * making use of this extension.
+ *
+ */
+void imap_id(int num_parms, char *parms[])
+{
+ cprintf("* ID NIL\r\n");
+ cprintf("%s OK ID completed\r\n", parms[0]);
+}
+
+
+
/*
* Here's where our IMAP session begins its happy day.
*/
* automatically expunges mailboxes when they are de-selected.
*/
cprintf("* FLAGS (\\Deleted \\Seen \\Answered)\r\n");
- cprintf("* OK [PERMANENTFLAGS (\\Seen \\Answered)] "
+ cprintf("* OK [PERMANENTFLAGS (\\Deleted \\Seen \\Answered)] "
"permanent flags\r\n");
cprintf("%s OK [%s] %s completed\r\n",
/*
- * does the real work for expunge
+ * Does the real work for expunge.
*/
int imap_do_expunge(void)
{
int i;
int num_expunged = 0;
+ long *delmsgs = NULL;
+ int num_delmsgs = 0;
lprintf(CTDL_DEBUG, "imap_do_expunge() called\n");
if (IMAP->selected == 0) {
return (0);
}
- if (IMAP->num_msgs > 0)
+ if (IMAP->num_msgs > 0) {
+ delmsgs = malloc(IMAP->num_msgs * sizeof(long));
for (i = 0; i < IMAP->num_msgs; ++i) {
if (IMAP->flags[i] & IMAP_DELETED) {
- CtdlDeleteMessages(CC->room.QRname,
- IMAP->msgids[i], "");
- ++num_expunged;
+ delmsgs[num_delmsgs++] = IMAP->msgids[i];
}
}
+ if (num_delmsgs > 0) {
+ CtdlDeleteMessages(CC->room.QRname, delmsgs, num_delmsgs, "");
+ }
+ num_expunged += num_delmsgs;
+ free(delmsgs);
+ }
if (num_expunged > 0) {
imap_rescan_msgids();
}
- lprintf(CTDL_DEBUG, "Expunged %d messages.\n", num_expunged);
+ lprintf(CTDL_DEBUG, "Expunged %d messages from <%s>\n",
+ num_expunged, CC->room.QRname);
return (num_expunged);
}
-/*
- * Used by LIST and LSUB to show the floors in the listing
- */
-void imap_list_floors(char *cmd, char *pattern)
-{
- int i;
- struct floor *fl;
-
- for (i = 0; i < MAXFLOORS; ++i) {
- fl = cgetfloor(i);
- if (fl->f_flags & F_INUSE) {
- if (imap_mailbox_matches_pattern
- (pattern, fl->f_name)) {
- cprintf("* %s (\\NoSelect) \"/\" ", cmd);
- imap_strout(fl->f_name);
- cprintf("\r\n");
- }
- }
- }
-}
-
-
-
-/*
- * Back end for imap_lsub()
- *
- * IMAP "subscribed folder" is equivocated to Citadel "known rooms." This
- * may or may not be the desired behavior in the future.
- */
-void imap_lsub_listroom(struct ctdlroom *qrbuf, void *data)
-{
- char buf[SIZ];
- int ra;
- char *pattern;
-
- pattern = (char *) data;
-
- /* Only list rooms to which the user has access!! */
- CtdlRoomAccess(qrbuf, &CC->user, &ra, NULL);
- if (ra & UA_KNOWN) {
- imap_mailboxname(buf, sizeof buf, qrbuf);
- if (imap_mailbox_matches_pattern(pattern, buf)) {
- cprintf("* LSUB () \"/\" ");
- imap_strout(buf);
- cprintf("\r\n");
- }
- }
-}
-
-
-/*
- * Implements the LSUB command
- */
-void imap_lsub(int num_parms, char *parms[])
-{
- char pattern[SIZ];
- if (num_parms < 4) {
- cprintf("%s BAD arguments invalid\r\n", parms[0]);
- return;
- }
- snprintf(pattern, sizeof pattern, "%s%s", parms[2], parms[3]);
-
- if (strlen(parms[3]) == 0) {
- cprintf("* LIST (\\Noselect) \"/\" \"\"\r\n");
- }
-
- else {
- imap_list_floors("LSUB", pattern);
- ForEachRoom(imap_lsub_listroom, pattern);
- }
-
- cprintf("%s OK LSUB completed\r\n", parms[0]);
-}
-
-
-
-/*
- * Back end for imap_list()
- */
-void imap_list_listroom(struct ctdlroom *qrbuf, void *data)
-{
- char buf[SIZ];
- int ra;
- char *pattern;
-
- pattern = (char *) data;
-
- /* Only list rooms to which the user has access!! */
- CtdlRoomAccess(qrbuf, &CC->user, &ra, NULL);
- if ((ra & UA_KNOWN)
- || ((ra & UA_GOTOALLOWED) && (ra & UA_ZAPPED))) {
- imap_mailboxname(buf, sizeof buf, qrbuf);
- if (imap_mailbox_matches_pattern(pattern, buf)) {
- cprintf("* LIST () \"/\" ");
- imap_strout(buf);
- cprintf("\r\n");
- }
- }
-}
-
-
-/*
- * Implements the LIST command
- */
-void imap_list(int num_parms, char *parms[])
-{
- char pattern[SIZ];
- if (num_parms < 4) {
- cprintf("%s BAD arguments invalid\r\n", parms[0]);
- return;
- }
- snprintf(pattern, sizeof pattern, "%s%s", parms[2], parms[3]);
-
- if (strlen(parms[3]) == 0) {
- cprintf("* LIST (\\Noselect) \"/\" \"\"\r\n");
- }
-
- else {
- imap_list_floors("LIST", pattern);
- ForEachRoom(imap_list_listroom, pattern);
- }
-
- cprintf("%s OK LIST completed\r\n", parms[0]);
-}
-
-
-
/*
* Implements the CREATE command
*
ret = create_room(roomname, newroomtype, "", floornum, 1, 0, newroomview);
if (ret == 0) {
- cprintf
- ("%s NO Mailbox already exists, or create failed\r\n",
- parms[0]);
+ /*** DO NOT CHANGE THIS ERROR MESSAGE IN ANY WAY! BYNARI CONNECTOR DEPENDS ON IT! ***/
+ cprintf("%s NO Mailbox already exists, or create failed\r\n", parms[0]);
} else {
cprintf("%s OK CREATE completed\r\n", parms[0]);
}
char savedroom[ROOMNAMELEN];
int msgs, new;
- ret = imap_grabroom(roomname, parms[2], 0);
+ ret = imap_grabroom(roomname, parms[2], 1);
if (ret != 0) {
cprintf("%s NO Invalid mailbox name, or access denied\r\n",
parms[0]);
irl->irl_newfloor);
if (r != crr_ok) {
/* FIXME handle error returns better */
- lprintf(CTDL_ERR, "CtdlRenameRoom() error %d\n",
- r);
+ lprintf(CTDL_ERR, "CtdlRenameRoom() error %d\n", r);
}
irlp = irl;
irl = irl->next;
char cmdbuf[SIZ];
char *parms[SIZ];
int num_parms;
+ struct timeval tv1, tv2;
+ suseconds_t total_time = 0;
+ gettimeofday(&tv1, NULL);
CC->lastcmd = time(NULL);
memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
flush_output();
if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
- lprintf(CTDL_ERR, "IMAP socket is broken. Ending session.\r\n");
+ lprintf(CTDL_ERR, "Client disconnected: ending session.\r\n");
CC->kill_me = 1;
return;
}
- lprintf(CTDL_INFO, "IMAP: %s\n", cmdbuf);
+ if (IMAP->authstate == imap_as_expecting_password) {
+ lprintf(CTDL_INFO, "IMAP: <password>\n");
+ }
+ else if (bmstrcasestr(cmdbuf, " LOGIN ")) {
+ lprintf(CTDL_INFO, "IMAP: LOGIN...\n");
+ }
+ else {
+ lprintf(CTDL_INFO, "IMAP: %s\n", cmdbuf);
+ }
+
while (strlen(cmdbuf) < 5)
strcat(cmdbuf, " ");
else if ((!strcasecmp(parms[1], "NOOP"))
|| (!strcasecmp(parms[1], "CHECK"))) {
- cprintf("%s OK This command successfully did nothing.\r\n",
+ cprintf("%s OK No operation\r\n",
parms[0]);
}
+ else if (!strcasecmp(parms[1], "ID")) {
+ imap_id(num_parms, parms);
+ }
+
+
else if (!strcasecmp(parms[1], "LOGOUT")) {
if (IMAP->selected) {
imap_do_expunge(); /* yes, we auto-expunge */
}
cprintf("* BYE %s logging out\r\n", config.c_fqdn);
- cprintf("%s OK thank you for using Citadel IMAP\r\n",
+ cprintf("%s OK Citadel IMAP session ended.\r\n",
parms[0]);
CC->kill_me = 1;
return;
}
else if (!strcasecmp(parms[1], "LSUB")) {
- imap_lsub(num_parms, parms);
+ imap_list(num_parms, parms);
}
else if (!strcasecmp(parms[1], "LIST")) {
imap_namespace(num_parms, parms);
}
+ else if (!strcasecmp(parms[1], "SETACL")) {
+ imap_setacl(num_parms, parms);
+ }
+
+ else if (!strcasecmp(parms[1], "DELETEACL")) {
+ imap_deleteacl(num_parms, parms);
+ }
+
+ else if (!strcasecmp(parms[1], "GETACL")) {
+ imap_getacl(num_parms, parms);
+ }
+
+ else if (!strcasecmp(parms[1], "LISTRIGHTS")) {
+ imap_listrights(num_parms, parms);
+ }
+
+ else if (!strcasecmp(parms[1], "MYRIGHTS")) {
+ imap_myrights(num_parms, parms);
+ }
+
+ else if (!strcasecmp(parms[1], "GETMETADATA")) {
+ imap_getmetadata(num_parms, parms);
+ }
+
+ else if (!strcasecmp(parms[1], "SETMETADATA")) {
+ imap_setmetadata(num_parms, parms);
+ }
+
else if (IMAP->selected == 0) {
cprintf("%s BAD no folder selected\r\n", parms[0]);
}
/* If the client transmitted a message we can free it now */
imap_free_transmitted_message();
-}
+ gettimeofday(&tv2, NULL);
+ total_time = (tv2.tv_usec + (tv2.tv_sec * 1000000)) - (tv1.tv_usec + (tv1.tv_sec * 1000000));
+ lprintf(CTDL_DEBUG, "IMAP command completed in %ld.%ld seconds\n",
+ (total_time / 1000000),
+ (total_time % 1000000)
+ );
+}
/*
projects / citadel.git / blobdiff