* $Id$
*
* IMAP server for the Citadel/UX system
- * Copyright (C) 2000-2001 by Art Cancro and others.
+ * Copyright (C) 2000-2002 by Art Cancro and others.
* This code is released under the terms of the GNU General Public License.
*
- * WARNING: this is an incomplete implementation, still in progress. Parts of
- * it work, but it's not really usable yet from a user perspective.
+ * WARNING: this is a workable implementation, but it could use some
+ * additional tweaking. Some commands may be implemented incompletely. The
+ * 'SEARCH' command is not implemented at all.
*
* WARNING: Mark Crispin is an idiot. IMAP is the most brain-damaged protocol
* you will ever have the profound lack of pleasure to encounter.
- *
*/
#include "sysdep.h"
#include <pwd.h>
#include <errno.h>
#include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#include <sys/wait.h>
#include <ctype.h>
#include <string.h>
#include <limits.h>
+
+#ifdef HAVE_OPENSSL
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/rand.h>
+#endif
+
#include "citadel.h"
#include "server.h"
-#include <time.h>
#include "sysdep_decls.h"
#include "citserver.h"
#include "support.h"
#include "config.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "room_ops.h"
#include "user_ops.h"
#include "policy.h"
#include "imap_store.h"
#include "imap_misc.h"
+#ifdef HAVE_OPENSSL
+#include "serv_crypto.h"
+#endif
+
+/* imap_rename() uses this struct containing list of rooms to rename */
+struct irl {
+ struct irl *next;
+ char irl_oldroom[ROOMNAMELEN];
+ char irl_newroom[ROOMNAMELEN];
+ int irl_newfloor;
+};
+
+/* Data which is passed between imap_rename() and imap_rename_backend() */
+struct irlparms {
+ char *oldname;
+ char *newname;
+ struct irl **irl;
+};
long SYM_IMAP;
}
+/*
+ * If there is a transmitted message in memory, free it
+ */
+void imap_free_transmitted_message(void) {
+ if (IMAP->transmitted_message != NULL) {
+ phree(IMAP->transmitted_message);
+ IMAP->transmitted_message = NULL;
+ IMAP->transmitted_length = 0;
+ }
+}
+
+
+/*
+ * Set the \\Seen flag for messages which aren't new
+ */
+void imap_set_seen_flags(void) {
+ struct visit vbuf;
+ int i;
+
+ CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
+ if (IMAP->num_msgs > 0) {
+ for (i=0; i<IMAP->num_msgs; ++i) {
+ if (is_msg_in_mset(vbuf.v_seen, IMAP->msgids[i])) {
+ IMAP->flags[i] |= IMAP_SEEN;
+ }
+ }
+ }
+}
+
+
+
+
/*
* Back end for imap_load_msgids()
*
- * FIXME: this should be optimized by figuring out a way to allocate memory
- * once rather than doing a reallok() for each message.
+ * Optimization: instead of calling realloc() to add each message, we
+ * allocate space in the list for REALLOC_INCREMENT messages at a time. This
+ * allows the mapping to proceed much faster.
*/
void imap_add_single_msgid(long msgnum, void *userdata) {
IMAP->num_msgs = IMAP->num_msgs + 1;
if (IMAP->msgids == NULL) {
- IMAP->msgids = mallok(IMAP->num_msgs * sizeof(long));
+ IMAP->msgids = mallok(IMAP->num_msgs * sizeof(long)
+ * REALLOC_INCREMENT);
}
- else {
+ else if (IMAP->num_msgs % REALLOC_INCREMENT == 0) {
IMAP->msgids = reallok(IMAP->msgids,
- IMAP->num_msgs * sizeof(long));
+ (IMAP->num_msgs + REALLOC_INCREMENT) * sizeof(long));
}
if (IMAP->flags == NULL) {
- IMAP->flags = mallok(IMAP->num_msgs * sizeof(long));
+ IMAP->flags = mallok(IMAP->num_msgs * sizeof(long)
+ * REALLOC_INCREMENT);
}
- else {
+ else if (IMAP->num_msgs % REALLOC_INCREMENT == 0) {
IMAP->flags = reallok(IMAP->flags,
- IMAP->num_msgs * sizeof(long));
+ (IMAP->num_msgs + REALLOC_INCREMENT) * sizeof(long));
}
IMAP->msgids[IMAP->num_msgs - 1] = msgnum;
IMAP->flags[IMAP->num_msgs - 1] = 0;
imap_free_msgids(); /* If there was already a map, free it */
- CtdlForEachMessage(MSGS_ALL, 0L, (-63), NULL, NULL,
+ CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL,
imap_add_single_msgid, NULL);
+ imap_set_seen_flags();
lprintf(9, "imap_load_msgids() mapped %d messages\n", IMAP->num_msgs);
}
int original_num_msgs = 0;
long original_highest = 0L;
- int i;
- int count;
+ int i, j;
+ int message_still_exists;
+ struct cdbdata *cdbfr;
+ long *msglist = NULL;
+ int num_msgs = 0;
+
if (IMAP->selected == 0) {
lprintf(5, "imap_load_msgids() can't run; no room selected\n");
return;
}
+ /* Load the *current* message list from disk, so we can compare it
+ * to what we have in memory.
+ */
+ cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
+ if (cdbfr != NULL) {
+ msglist = mallok(cdbfr->len);
+ memcpy(msglist, cdbfr->ptr, cdbfr->len);
+ num_msgs = cdbfr->len / sizeof(long);
+ cdb_free(cdbfr);
+ }
+ else {
+ num_msgs = 0;
+ }
/*
* Check to see if any of the messages we know about have been expunged
if (IMAP->num_msgs > 0)
for (i=0; i<IMAP->num_msgs; ++i) {
- count = CtdlForEachMessage(MSGS_EQ, IMAP->msgids[i],
- (-63), NULL, NULL, NULL, NULL);
+ message_still_exists = 0;
+ if (num_msgs > 0) for (j = 0; j < num_msgs; ++j) {
+ if (msglist[j] == IMAP->msgids[i]) {
+ message_still_exists = 1;
+ }
+ }
- if (count == 0) {
+ if (message_still_exists == 0) {
cprintf("* %d EXPUNGE\r\n", i+1);
/* Here's some nice stupid nonsense. When a message
/*
* Now peruse the room for *new* messages only.
*/
- CtdlForEachMessage(MSGS_GT, original_highest, (-63), NULL, NULL,
- imap_add_single_msgid, NULL);
+ if (num_msgs > 0) for (j=0; j<num_msgs; ++j) {
+ if (msglist[j] > original_highest) {
+ imap_add_single_msgid(msglist[j], NULL);
+ }
+ }
+ imap_set_seen_flags();
/*
* If new messages have arrived, tell the client about them.
cprintf("* %d EXISTS\r\n", IMAP->num_msgs);
}
+ if (num_msgs != 0) phree(msglist);
}
lprintf(9, "Performing IMAP cleanup hook\n");
imap_free_msgids();
+ imap_free_transmitted_message();
lprintf(9, "Finished IMAP cleanup hook\n");
}
}
if (!strcasecmp(parms[2], "LOGIN")) {
- encode_base64(buf, "Username:");
+ CtdlEncodeBase64(buf, "Username:", 9);
cprintf("+ %s\r\n", buf);
IMAP->authstate = imap_as_expecting_username;
strcpy(IMAP->authseq, parms[0]);
void imap_auth_login_user(char *cmd) {
char buf[SIZ];
- decode_base64(buf, cmd);
+ CtdlDecodeBase64(buf, cmd, SIZ);
CtdlLoginExistingUser(buf);
- encode_base64(buf, "Password:");
+ CtdlEncodeBase64(buf, "Password:", 9);
cprintf("+ %s\r\n", buf);
IMAP->authstate = imap_as_expecting_password;
return;
void imap_auth_login_pass(char *cmd) {
char buf[SIZ];
- decode_base64(buf, cmd);
+ CtdlDecodeBase64(buf, cmd, SIZ);
if (CtdlTryPassword(buf) == pass_ok) {
cprintf("%s OK authentication succeeded\r\n", IMAP->authseq);
}
* implements the CAPABILITY command
*/
void imap_capability(int num_parms, char *parms[]) {
- cprintf("* CAPABILITY IMAP4 IMAP4REV1 AUTH=LOGIN\r\n");
+ cprintf("* CAPABILITY IMAP4 IMAP4REV1 AUTH=LOGIN");
+#ifdef HAVE_OPENSSL
+ cprintf(" STARTTLS");
+#endif
+ cprintf("\r\n");
cprintf("%s OK CAPABILITY completed\r\n", parms[0]);
}
+/*
+ * implements the STARTTLS command
+ */
+#ifdef HAVE_OPENSSL
+void imap_starttls(int num_parms, char *parms[]) {
+ int retval, bits, alg_bits;
+
+ if (!ssl_ctx) {
+ cprintf("%s NO No SSL_CTX available\r\n", parms[0]);
+ return;
+ }
+ if (!(CC->ssl = SSL_new(ssl_ctx))) {
+ lprintf(2, "SSL_new failed: %s\n",
+ ERR_reason_error_string(ERR_peek_error()));
+ cprintf("%s NO SSL_new: %s\r\n", parms[0],
+ ERR_reason_error_string(ERR_get_error()));
+ return;
+ }
+ if (!(SSL_set_fd(CC->ssl, CC->client_socket))) {
+ lprintf(2, "SSL_set_fd failed: %s\n",
+ ERR_reason_error_string(ERR_peek_error()));
+ SSL_free(CC->ssl);
+ CC->ssl = NULL;
+ cprintf("%s NO SSL_set_fd: %s\r\n", parms[0],
+ ERR_reason_error_string(ERR_get_error()));
+ return;
+ }
+ cprintf("%s OK begin TLS negotiation now\r\n", parms[0]);
+ retval = SSL_accept(CC->ssl);
+ if (retval < 1) {
+ /*
+ * Can't notify the client of an error here; they will
+ * discover the problem at the SSL layer and should
+ * revert to unencrypted communications.
+ */
+ long errval;
+
+ errval = SSL_get_error(CC->ssl, retval);
+ lprintf(2, "SSL_accept failed: %s\n",
+ ERR_reason_error_string(ERR_get_error()));
+ SSL_free(CC->ssl);
+ CC->ssl = NULL;
+ return;
+ }
+ BIO_set_close(CC->ssl->rbio, BIO_NOCLOSE);
+ bits = SSL_CIPHER_get_bits(SSL_get_current_cipher(CC->ssl), &alg_bits);
+ lprintf(3, "SSL/TLS using %s on %s (%d of %d bits)\n",
+ SSL_CIPHER_get_name(SSL_get_current_cipher(CC->ssl)),
+ SSL_CIPHER_get_version(SSL_get_current_cipher(CC->ssl)),
+ bits, alg_bits);
+ CC->redirect_ssl = 1;
+}
+#endif
int c = 0;
int ok = 0;
int ra = 0;
- struct quickroom QRscratch;
+ struct ctdlroom QRscratch;
int msgs, new;
int floornum;
int roomflags;
/* Then try a mailbox name match */
if (c != 0) {
- MailboxName(augmented_roomname, &CC->usersupp, towhere);
+ MailboxName(augmented_roomname, sizeof augmented_roomname,
+ &CC->user, towhere);
c = getroom(&QRscratch, augmented_roomname);
if (c == 0)
strcpy(towhere, augmented_roomname);
/* If the room exists, check security/access */
if (c == 0) {
/* See if there is an existing user/room relationship */
- ra = CtdlRoomAccess(&QRscratch, &CC->usersupp);
+ ra = CtdlRoomAccess(&QRscratch, &CC->user);
/* normal clients have to pass through security */
if (ra & UA_KNOWN) {
* usergoto() formally takes us to the desired room, happily returning
* the number of messages and number of new messages.
*/
- usergoto(QRscratch.QRname, 0, &msgs, &new);
+ memcpy(&CC->room, &QRscratch, sizeof(struct ctdlroom));
+ usergoto(NULL, 0, 0, &msgs, &new);
IMAP->selected = 1;
if (!strcasecmp(parms[1], "EXAMINE")) {
/* FIXME ... much more info needs to be supplied here */
cprintf("* %d EXISTS\r\n", msgs);
cprintf("* %d RECENT\r\n", new);
- cprintf("* FLAGS (\\Deleted)\r\n");
- cprintf("* OK [PERMANENTFLAGS (\\Deleted)] permanent flags\r\n");
+ cprintf("* FLAGS (\\Deleted \\Seen)\r\n");
+ cprintf("* OK [PERMANENTFLAGS (\\Deleted \\Seen)] permanent flags\r\n");
cprintf("* OK [UIDVALIDITY 0] UIDs valid\r\n");
cprintf("%s OK [%s] %s completed\r\n",
parms[0],
if (IMAP->num_msgs > 0) for (i=0; i<IMAP->num_msgs; ++i) {
if (IMAP->flags[i] & IMAP_DELETED) {
- CtdlDeleteMessages(CC->quickroom.QRname,
+ CtdlDeleteMessages(CC->room.QRname,
IMAP->msgids[i], "");
++num_expunged;
+ lprintf(9, "%ld ... deleted\n", IMAP->msgids[i]);
+ }
+ else {
+ lprintf(9, "%ld ... not deleted\n", IMAP->msgids[i]);
}
}
*/
void imap_expunge(int num_parms, char *parms[]) {
int num_expunged = 0;
- imap_do_expunge();
+
+ num_expunged = imap_do_expunge();
cprintf("%s OK expunged %d messages.\r\n", parms[0], num_expunged);
}
/*
* Used by LIST and LSUB to show the floors in the listing
*/
-void imap_list_floors(char *cmd) {
+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) {
- cprintf("* %s (\\NoSelect) \"|\" ", cmd);
- imap_strout(fl->f_name);
- cprintf("\r\n");
+ if (imap_mailbox_matches_pattern(pattern, fl->f_name)) {
+ cprintf("* %s (\\NoSelect) \"|\" ", cmd);
+ imap_strout(fl->f_name);
+ cprintf("\r\n");
+ }
}
}
}
* 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 quickroom *qrbuf, void *data) {
+void imap_lsub_listroom(struct ctdlroom *qrbuf, void *data) {
char buf[SIZ];
int ra;
char *pattern;
pattern = (char *)data;
- lprintf(9, "lsub pattern: <%s>\n", pattern);
/* Only list rooms to which the user has access!! */
- ra = CtdlRoomAccess(qrbuf, &CC->usersupp);
+ ra = CtdlRoomAccess(qrbuf, &CC->user);
if (ra & UA_KNOWN) {
imap_mailboxname(buf, sizeof buf, qrbuf);
if (imap_mailbox_matches_pattern(pattern, buf)) {
/*
* Implements the LSUB command
- *
- * FIXME: Handle wildcards, please.
*/
void imap_lsub(int num_parms, char *parms[]) {
char pattern[SIZ];
cprintf("%s BAD arguments invalid\r\n", parms[0]);
return;
}
- sprintf(pattern, "%s%s", parms[2], parms[3]);
+ 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");
+ imap_list_floors("LSUB", pattern);
ForEachRoom(imap_lsub_listroom, pattern);
}
/*
* Back end for imap_list()
*/
-void imap_list_listroom(struct quickroom *qrbuf, void *data) {
+void imap_list_listroom(struct ctdlroom *qrbuf, void *data) {
char buf[SIZ];
int ra;
char *pattern;
pattern = (char *)data;
- lprintf(9, "list pattern: <%s>\n", pattern);
/* Only list rooms to which the user has access!! */
- ra = CtdlRoomAccess(qrbuf, &CC->usersupp);
+ ra = CtdlRoomAccess(qrbuf, &CC->user);
if ( (ra & UA_KNOWN)
|| ((ra & UA_GOTOALLOWED) && (ra & UA_ZAPPED))) {
imap_mailboxname(buf, sizeof buf, qrbuf);
/*
* Implements the LIST command
- *
- * FIXME: Handle wildcards, please.
*/
void imap_list(int num_parms, char *parms[]) {
char pattern[SIZ];
cprintf("%s BAD arguments invalid\r\n", parms[0]);
return;
}
- sprintf(pattern, "%s%s", parms[2], parms[3]);
+ 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");
+ imap_list_floors("LIST", pattern);
ForEachRoom(imap_list_listroom, pattern);
}
int flags;
int newroomtype;
+ if (strchr(parms[2], '\\') != NULL) {
+ cprintf("%s NO Invalid character in folder name\r\n", parms[0]);
+ return;
+ }
+
ret = imap_roomname(roomname, sizeof roomname, parms[2]);
if (ret < 0) {
cprintf("%s NO Invalid mailbox name or location\r\n",
lprintf(7, "Create new room <%s> on floor <%d> with type <%d>\n",
roomname, floornum, newroomtype);
- ret = create_room(roomname, newroomtype, "", floornum, 1);
+ ret = create_room(roomname, newroomtype, "", floornum, 1, 0);
if (ret == 0) {
cprintf("%s NO Mailbox already exists, or create failed\r\n",
parms[0]);
char augmented_roomname[ROOMNAMELEN];
char roomname[ROOMNAMELEN];
int c;
- struct quickroom QRscratch;
+ struct ctdlroom QRscratch;
int ra;
int ok = 0;
/* Then try a mailbox name match */
if (c != 0) {
- MailboxName(augmented_roomname, &CC->usersupp, roomname);
+ MailboxName(augmented_roomname, sizeof augmented_roomname,
+ &CC->user, roomname);
c = getroom(&QRscratch, augmented_roomname);
if (c == 0)
strcpy(roomname, augmented_roomname);
/* If the room exists, check security/access */
if (c == 0) {
/* See if there is an existing user/room relationship */
- ra = CtdlRoomAccess(&QRscratch, &CC->usersupp);
+ ra = CtdlRoomAccess(&QRscratch, &CC->user);
/* normal clients have to pass through security */
if (ra & UA_KNOWN) {
* folder is selected, save its name so we can return there!!!!!)
*/
if (IMAP->selected) {
- strcpy(savedroom, CC->quickroom.QRname);
+ strcpy(savedroom, CC->room.QRname);
}
- usergoto(roomname, 0, &msgs, &new);
+ usergoto(roomname, 0, 0, &msgs, &new);
/*
* Tell the client what it wants to know. In fact, tell it *more* than
* it wants to know. We happily IGnore the supplied status data item
* names and simply spew all possible data items. It's far easier to
* code and probably saves us some processing time too.
- *
- * FIXME we need to implement RECENT and UNSEEN eventually...
*/
-
- imap_mailboxname(buf, sizeof buf, &CC->quickroom);
+ imap_mailboxname(buf, sizeof buf, &CC->room);
cprintf("* STATUS ");
imap_strout(buf);
- cprintf(" (MESSAGES %d RECENT 0 UIDNEXT %ld "
- "UIDVALIDITY 0 UNSEEN 0)\r\n",
- msgs,
- CitControl.MMhighest + 1
- );
+ cprintf(" (MESSAGES %d ", msgs);
+ cprintf("RECENT 0 "); /* FIXME we need to implement this */
+ cprintf("UIDNEXT %ld ", CitControl.MMhighest + 1);
+ cprintf("UNSEEN %d)\r\n", new);
/*
* If another folder is selected, go back to that room so we can resume
* our happy day without violent explosions.
*/
if (IMAP->selected) {
- usergoto(savedroom, 0, &msgs, &new);
+ usergoto(savedroom, 0, 0, &msgs, &new);
}
/*
* we're looking for.
*/
if (IMAP->selected) {
- strcpy(savedroom, CC->quickroom.QRname);
+ strcpy(savedroom, CC->room.QRname);
}
- usergoto(roomname, 0, &msgs, &new);
+ usergoto(roomname, 0, 0, &msgs, &new);
/*
* If another folder is selected, go back to that room so we can resume
* our happy day without violent explosions.
*/
if (IMAP->selected) {
- usergoto(savedroom, 0, &msgs, &new);
+ usergoto(savedroom, 0, 0, &msgs, &new);
}
cprintf("%s OK SUBSCRIBE completed\r\n", parms[0]);
* usergoto() formally takes us to the desired room.
*/
if (IMAP->selected) {
- strcpy(savedroom, CC->quickroom.QRname);
+ strcpy(savedroom, CC->room.QRname);
}
- usergoto(roomname, 0, &msgs, &new);
+ usergoto(roomname, 0, 0, &msgs, &new);
/*
* Now make the API call to zap the room
* our happy day without violent explosions.
*/
if (IMAP->selected) {
- usergoto(savedroom, 0, &msgs, &new);
+ usergoto(savedroom, 0, 0, &msgs, &new);
}
}
* folder is selected, save its name so we can return there!!!!!)
*/
if (IMAP->selected) {
- strcpy(savedroom, CC->quickroom.QRname);
+ strcpy(savedroom, CC->room.QRname);
}
- usergoto(roomname, 0, &msgs, &new);
+ usergoto(roomname, 0, 0, &msgs, &new);
/*
* Now delete the room.
*/
- if (CtdlDoIHavePermissionToDeleteThisRoom(&CC->quickroom)) {
+ if (CtdlDoIHavePermissionToDeleteThisRoom(&CC->room)) {
cprintf("%s OK DELETE completed\r\n", parms[0]);
- delete_room(&CC->quickroom);
+ delete_room(&CC->room);
}
else {
cprintf("%s NO Can't delete this folder.\r\n", parms[0]);
* our happy day without violent explosions.
*/
if (IMAP->selected) {
- usergoto(savedroom, 0, &msgs, &new);
+ usergoto(savedroom, 0, 0, &msgs, &new);
}
}
+/*
+ * Back end function for imap_rename()
+ */
+void imap_rename_backend(struct ctdlroom *qrbuf, void *data) {
+ char foldername[SIZ];
+ char newfoldername[SIZ];
+ char newroomname[ROOMNAMELEN];
+ int newfloor = 0;
+ struct irl *irlp = NULL; /* scratch pointer */
+ struct irlparms *irlparms;
+
+ irlparms = (struct irlparms *)data;
+ imap_mailboxname(foldername, sizeof foldername, qrbuf);
+
+ /* Rename subfolders */
+ if ( (!strncasecmp(foldername, irlparms->oldname,
+ strlen(irlparms->oldname))
+ && (foldername[strlen(irlparms->oldname)] == '|')) ) {
+
+ sprintf(newfoldername, "%s|%s",
+ irlparms->newname,
+ &foldername[strlen(irlparms->oldname)+1]
+ );
+
+ newfloor = imap_roomname(newroomname,
+ sizeof newroomname, newfoldername) & 0xFF;
+
+ irlp = (struct irl *) mallok(sizeof(struct irl));
+ strcpy(irlp->irl_newroom, newroomname);
+ strcpy(irlp->irl_oldroom, qrbuf->QRname);
+ irlp->irl_newfloor = newfloor;
+ irlp->next = *(irlparms->irl);
+ *(irlparms->irl) = irlp;
+ }
+}
+
/*
* Implements the RENAME command
*
*/
void imap_rename(int num_parms, char *parms[]) {
- cprintf("%s NO The RENAME command is not yet implemented (FIXME)\r\n",
- parms[0]);
+ char old_room[ROOMNAMELEN];
+ char new_room[ROOMNAMELEN];
+ int oldr, newr;
+ int new_floor;
+ int r;
+ struct irl *irl = NULL; /* the list */
+ struct irl *irlp = NULL; /* scratch pointer */
+ struct irlparms irlparms;
+
+ if (strchr(parms[3], '\\') != NULL) {
+ cprintf("%s NO Invalid character in folder name\r\n", parms[0]);
+ return;
+ }
+
+ oldr = imap_roomname(old_room, sizeof old_room, parms[2]);
+ newr = imap_roomname(new_room, sizeof new_room, parms[3]);
+ new_floor = (newr & 0xFF);
+
+ r = CtdlRenameRoom(old_room, new_room, new_floor);
+
+ if (r == crr_room_not_found) {
+ cprintf("%s NO Could not locate this folder\r\n", parms[0]);
+ return;
+ }
+ if (r == crr_already_exists) {
+ cprintf("%s '%s' already exists.\r\n", parms[0], parms[2]);
+ return;
+ }
+ if (r == crr_noneditable) {
+ cprintf("%s This folder is not editable.\r\n", parms[0]);
+ return;
+ }
+ if (r == crr_invalid_floor) {
+ cprintf("%s Folder root does not exist.\r\n", parms[0]);
+ return;
+ }
+ if (r == crr_access_denied) {
+ cprintf("%s You do not have permission to edit "
+ "this folder.\r\n", parms[0]);
+ return;
+ }
+ if (r != crr_ok) {
+ cprintf("%s NO Rename failed - undefined error %d\r\n",
+ parms[0], r);
+ return;
+ }
+
+
+ /* If this is the INBOX, then RFC2060 says we have to just move the
+ * contents. In a Citadel environment it's easier to rename the room
+ * (already did that) and create a new inbox.
+ */
+ if (!strcasecmp(parms[2], "INBOX")) {
+ create_room(MAILROOM, 4, "", 0, 1, 0);
+ }
+
+ /* Otherwise, do the subfolders. Build a list of rooms to rename... */
+ else {
+ irlparms.oldname = parms[2];
+ irlparms.newname = parms[3];
+ irlparms.irl = &irl;
+ ForEachRoom(imap_rename_backend, (void *)&irlparms);
+
+ /* ... and now rename them. */
+ while (irl != NULL) {
+ r = CtdlRenameRoom(irl->irl_oldroom,
+ irl->irl_newroom, irl->irl_newfloor);
+ if (r != crr_ok) {
+ /* FIXME handle error returns better */
+ lprintf(5, "CtdlRenameRoom() error %d\n", r);
+ }
+ irlp = irl;
+ irl = irl->next;
+ phree(irlp);
+ }
+ }
+
+ cprintf("%s OK RENAME completed\r\n", parms[0]);
}
+
/*
* Main command loop for IMAP sessions.
*/
return;
}
- lprintf(5, "citserver[%3d]: %s\r\n", CC->cs_pid, cmdbuf);
+ lprintf(5, "IMAP: %s\r\n", cmdbuf);
while (strlen(cmdbuf) < 5) strcat(cmdbuf, " ");
imap_capability(num_parms, parms);
}
+#ifdef HAVE_OPENSSL
+ else if (!strcasecmp(parms[1], "STARTTLS")) {
+ imap_starttls(num_parms, parms);
+ }
+#endif
+
else if (!CC->logged_in) {
cprintf("%s BAD Not logged in.\r\n", parms[0]);
}
imap_unsubscribe(num_parms, parms);
}
+ else if (!strcasecmp(parms[1], "APPEND")) {
+ imap_append(num_parms, parms);
+ }
+
else if (IMAP->selected == 0) {
cprintf("%s BAD no folder selected\r\n", parms[0]);
}
cprintf("%s BAD command unrecognized\r\n", parms[0]);
}
+ /* If the client transmitted a message we can free it now */
+ imap_free_transmitted_message();
}
/*
- * This function is called by dynloader.c to register the IMAP module
- * with the Citadel server.
+ * This function is called to register the IMAP extension with Citadel.
*/
-char *Dynamic_Module_Init(void)
+char *serv_imap_init(void)
{
SYM_IMAP = CtdlGetDynamicSymbol();
CtdlRegisterServiceHook(config.c_imap_port,
projects / citadel.git / blobdiff