X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fimap%2Fserv_imap.c;h=3d5d2ac7bb8c685ae36235295c0dccf4b4fb15dc;hb=8c47559cb5ae97ec0fa35660ee16fd61a9451c72;hp=d3f5e9eb4f53c75b8dad9a8aa4f164356d526d6e;hpb=5c436ec77a16faeed6ac1fc13aa9b04707574a35;p=citadel.git diff --git a/citadel/modules/imap/serv_imap.c b/citadel/modules/imap/serv_imap.c index d3f5e9eb4..3d5d2ac7b 100644 --- a/citadel/modules/imap/serv_imap.c +++ b/citadel/modules/imap/serv_imap.c @@ -2,12 +2,26 @@ * $Id$ * * IMAP server for the Citadel system - * Copyright (C) 2000-2007 by Art Cancro and others. + * Copyright (C) 2000-2009 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 * is perfect. Indeed, with so much gratuitous complexity, *all* IMAP * implementations have bugs. + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "sysdep.h" @@ -447,11 +461,20 @@ void imap_output_capability_string(void) { /* 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. + * It is not a full RFC5464 implementation, but it should refuse non-Bynari + * metadata in a compatible and graceful way. */ cprintf(" METADATA"); - /* cprintf(" LIST-EXTENDED"); */ + + /* + * LIST-EXTENDED was originally going to be required by the METADATA extension. + * It was mercifully removed prior to the finalization of RFC5464. We started + * implementing this but stopped when we learned that it would not be needed. + * If you uncomment this declaration you are responsible for writing a lot of new + * code. + * + * cprintf(" LIST-EXTENDED") + */ } /* @@ -498,6 +521,12 @@ void imap_greeting(void) IMAP->cached_rfc822_msgnum = (-1); IMAP->cached_rfc822_withbody = 0; + if (CC->nologin) + { + cprintf("* BYE; Server busy, try later\r\n"); + CC->kill_me = 1; + return; + } cprintf("* OK ["); imap_output_capability_string(); cprintf("] %s IMAP4rev1 %s ready\r\n", config.c_fqdn, CITADEL); @@ -587,6 +616,7 @@ void imap_auth_plain(char *cmd) char pass[256]; int result; + memset(pass, 0, sizeof(pass)); CtdlDecodeBase64(decoded_authstring, cmd, strlen(cmd)); safestrncpy(ident, decoded_authstring, sizeof ident); safestrncpy(user, &decoded_authstring[strlen(ident) + 1], sizeof user); @@ -626,6 +656,7 @@ void imap_auth_login_pass(char *cmd) { char buf[SIZ]; + memset(buf, 0, sizeof(buf)); CtdlDecodeBase64(buf, cmd, SIZ); if (CtdlTryPassword(buf) == pass_ok) { cprintf("%s OK authentication succeeded\r\n", IMAP->authseq); @@ -747,7 +778,7 @@ void imap_select(int num_parms, char *parms[]) * * Unfortunately, omitting \Deleted as a PERMANENTFLAGS flag causes * some clients (particularly Thunderbird) to misbehave -- they simply - * electing not to transmit the flag at all. So we have to advertise + * elect not to transmit the flag at all. So we have to advertise * \Deleted as a PERMANENTFLAGS flag, even though it technically isn't. */ cprintf("* FLAGS (\\Deleted \\Seen \\Answered)\r\n"); @@ -881,10 +912,15 @@ void imap_create(int num_parms, char *parms[]) int flags; int newroomtype = 0; int newroomview = 0; + char *notification_message = NULL; + + if (num_parms < 3) { + cprintf("%s NO A foder name must be specified\r\n", parms[0]); + return; + } if (strchr(parms[2], '\\') != NULL) { - cprintf("%s NO Invalid character in folder name\r\n", - parms[0]); + cprintf("%s NO Invalid character in folder name\r\n", parms[0]); CtdlLogPrintf(CTDL_DEBUG, "invalid character in folder name\n"); return; } @@ -924,6 +960,18 @@ void imap_create(int num_parms, char *parms[]) cprintf("%s NO Mailbox already exists, or create failed\r\n", parms[0]); } else { cprintf("%s OK CREATE completed\r\n", parms[0]); + /* post a message in Aide> describing the new room */ + notification_message = malloc(1024); + snprintf(notification_message, 1024, + "A new room called \"%s\" has been created by %s%s%s%s\n", + roomname, + CC->user.fullname, + ((ret & QR_MAILBOX) ? " [personal]" : ""), + ((ret & QR_PRIVATE) ? " [private]" : ""), + ((ret & QR_GUESSNAME) ? " [hidden]" : "") + ); + aide_message(notification_message, "Room Creation Message"); + free(notification_message); } CtdlLogPrintf(CTDL_DEBUG, "imap_create() completed\n"); } @@ -997,7 +1045,7 @@ void imap_status(int num_parms, char *parms[]) 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 location, or access denied\r\n", @@ -1099,7 +1147,7 @@ void imap_unsubscribe(int num_parms, char *parms[]) 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 location, or access denied\r\n", @@ -1405,13 +1453,14 @@ void imap_command_loop(void) } if (untagged_ok) { - imap_print_instant_messages(); - + + /* we can put any additional untagged stuff right here in the future */ + /* * Before processing the command that was just entered... if we happen * to have a folder selected, we'd like to rescan that folder for new * messages, and for deletions/changes of existing messages. This - * could probably be optimized somehow, but IMAP sucks... + * could probably be optimized better with some deep thought... */ if (IMAP->selected) { imap_rescan_msgids(); @@ -1439,7 +1488,7 @@ void imap_command_loop(void) else if (!strcasecmp(parms[1], "LOGOUT")) { if (IMAP->selected) { - imap_do_expunge(); /* yes, we auto-expunge */ + imap_do_expunge(); /* yes, we auto-expunge at logout */ } cprintf("* BYE %s logging out\r\n", config.c_fqdn); cprintf("%s OK Citadel IMAP session ended.\r\n", @@ -1612,6 +1661,7 @@ void imap_command_loop(void) gettimeofday(&tv2, NULL); total_time = (tv2.tv_usec + (tv2.tv_sec * 1000000)) - (tv1.tv_usec + (tv1.tv_sec * 1000000)); + CtdlLogPrintf(CTDL_INFO, "IMAP: %s\n", cmdbuf); // FIXME FIXME FIXME REMOVE THIS NOW CtdlLogPrintf(CTDL_DEBUG, "IMAP command completed in %ld.%ld seconds\n", (total_time / 1000000), (total_time % 1000000)