X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fimap%2Fimap_misc.c;h=6e68b6cbe7915fc3c4daf2d857677bc58d22269c;hp=eacb44e6fc82be44cca6cf203b087e74120a0f0f;hb=5ac2920028e92a453c686c799327d7a66b3e7b49;hpb=939ba3f9a9da345cc3bf48e646ef5787074ac05d diff --git a/citadel/modules/imap/imap_misc.c b/citadel/modules/imap/imap_misc.c index eacb44e6f..6e68b6cbe 100644 --- a/citadel/modules/imap/imap_misc.c +++ b/citadel/modules/imap/imap_misc.c @@ -1,7 +1,15 @@ /* - * $Id$ + * Copyright (c) 1987-2020 by the citadel.org team * + * This program is open source 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. */ @@ -37,18 +45,17 @@ #include "citserver.h" #include "support.h" #include "config.h" -#include "room_ops.h" #include "user_ops.h" -#include "policy.h" #include "database.h" #include "msgbase.h" +#include "room_ops.h" #include "internet_addressing.h" #include "serv_imap.h" #include "imap_tools.h" #include "imap_fetch.h" #include "imap_misc.h" #include "genstamp.h" - +#include "ctdl_module.h" @@ -58,34 +65,35 @@ * imap_copy() calls imap_do_copy() to do its actual work, once it's * validated and boiled down the request a bit. (returns 0 on success) */ -int imap_do_copy(char *destination_folder) { +int imap_do_copy(const char *destination_folder) { + citimap *Imap = IMAP; int i; char roomname[ROOMNAMELEN]; struct ctdlroom qrbuf; long *selected_msgs = NULL; int num_selected = 0; - if (IMAP->num_msgs < 1) { + if (Imap->num_msgs < 1) { return(0); } - i = imap_grabroom(roomname, destination_folder, 0); + i = imap_grabroom(roomname, destination_folder, 1); if (i != 0) return(i); /* * Copy all the message pointers in one shot. */ - selected_msgs = malloc(sizeof(long) * IMAP->num_msgs); + selected_msgs = malloc(sizeof(long) * Imap->num_msgs); if (selected_msgs == NULL) return(-1); - for (i = 0; i < IMAP->num_msgs; ++i) { - if (IMAP->flags[i] & IMAP_SELECTED) { - selected_msgs[num_selected++] = IMAP->msgids[i]; + for (i = 0; i < Imap->num_msgs; ++i) { + if (Imap->flags[i] & IMAP_SELECTED) { + selected_msgs[num_selected++] = Imap->msgids[i]; } } if (num_selected > 0) { - CtdlCopyMsgsToRoom(selected_msgs, num_selected, roomname); + CtdlSaveMsgPointersInRoom(roomname, selected_msgs, num_selected, 1, NULL, 0); } free(selected_msgs); @@ -109,25 +117,25 @@ int imap_do_copy(char *destination_folder) { answ_yes = malloc(num_selected * sizeof(long)); answ_no = malloc(num_selected * sizeof(long)); - for (i = 0; i < IMAP->num_msgs; ++i) { - if (IMAP->flags[i] & IMAP_SELECTED) { - if (IMAP->flags[i] & IMAP_SEEN) { - seen_yes[num_seen_yes++] = IMAP->msgids[i]; + for (i = 0; i < Imap->num_msgs; ++i) { + if (Imap->flags[i] & IMAP_SELECTED) { + if (Imap->flags[i] & IMAP_SEEN) { + seen_yes[num_seen_yes++] = Imap->msgids[i]; } - if ((IMAP->flags[i] & IMAP_SEEN) == 0) { - seen_no[num_seen_no++] = IMAP->msgids[i]; + if ((Imap->flags[i] & IMAP_SEEN) == 0) { + seen_no[num_seen_no++] = Imap->msgids[i]; } - if (IMAP->flags[i] & IMAP_ANSWERED) { - answ_yes[num_answ_yes++] = IMAP->msgids[i]; + if (Imap->flags[i] & IMAP_ANSWERED) { + answ_yes[num_answ_yes++] = Imap->msgids[i]; } - if ((IMAP->flags[i] & IMAP_ANSWERED) == 0) { - answ_no[num_answ_no++] = IMAP->msgids[i]; + if ((Imap->flags[i] & IMAP_ANSWERED) == 0) { + answ_no[num_answ_no++] = Imap->msgids[i]; } } } /* Set the flags... */ - i = getroom(&qrbuf, roomname); + i = CtdlGetRoom(&qrbuf, roomname); if (i == 0) { CtdlSetSeen(seen_yes, num_seen_yes, 1, ctdlsetseen_seen, NULL, &qrbuf); CtdlSetSeen(seen_no, num_seen_no, 0, ctdlsetseen_seen, NULL, &qrbuf); @@ -152,158 +160,86 @@ int imap_do_copy(char *destination_folder) { * are both globally unique and persistent across a room-to-room copy, we * can get this done quite easily. */ -void imap_output_copyuid_response(void) { +void imap_output_copyuid_response(citimap *Imap) { int i; - int num_output = 0; - - for (i = 0; i < IMAP->num_msgs; ++i) { - if (IMAP->flags[i] & IMAP_SELECTED) { - ++num_output; - if (num_output == 1) { - cprintf("[COPYUID "); - } - else if (num_output > 1) { - cprintf(","); + StrBuf *MsgsCopied = NewStrBuf(); + + for (i = 0; i < Imap->num_msgs; ++i) { + if (Imap->flags[i] & IMAP_SELECTED) { + if (StrLength(MsgsCopied) > 0) { + StrBufAppendBufPlain(MsgsCopied, HKEY(","), 0); } - cprintf("%ld", IMAP->msgids[i]); + StrBufAppendPrintf(MsgsCopied, "%ld", Imap->msgids[i]); } } - if (num_output > 0) { - cprintf("] "); + + if (StrLength(MsgsCopied) > 0) { + IAPrintf("[COPYUID %ld %s %s] ", GLOBAL_UIDVALIDITY_VALUE, ChrPtr(MsgsCopied), ChrPtr(MsgsCopied)); } + + FreeStrBuf(&MsgsCopied); } /* * This function is called by the main command loop. */ -void imap_copy(int num_parms, char *parms[]) { +void imap_copy(int num_parms, ConstStr *Params) { int ret; if (num_parms != 4) { - cprintf("%s BAD invalid parameters\r\n", parms[0]); + IReply("BAD invalid parameters"); return; } - if (imap_is_message_set(parms[2])) { - imap_pick_range(parms[2], 0); + if (imap_is_message_set(Params[2].Key)) { + imap_pick_range(Params[2].Key, 0); } else { - cprintf("%s BAD invalid parameters\r\n", parms[0]); + IReply("BAD invalid parameters"); return; } - ret = imap_do_copy(parms[3]); + ret = imap_do_copy(Params[3].Key); if (!ret) { - cprintf("%s OK ", parms[0]); - imap_output_copyuid_response(); - cprintf("COPY completed\r\n"); + IAPrintf("%s OK ", Params[0].Key); + imap_output_copyuid_response(IMAP); + IAPuts("COPY completed\r\n"); } else { - cprintf("%s NO COPY failed (error %d)\r\n", parms[0], ret); + IReplyPrintf("NO COPY failed (error %d)", ret); } } /* * This function is called by the main command loop. */ -void imap_uidcopy(int num_parms, char *parms[]) { +void imap_uidcopy(int num_parms, ConstStr *Params) { if (num_parms != 5) { - cprintf("%s BAD invalid parameters\r\n", parms[0]); + IReply("BAD invalid parameters"); return; } - if (imap_is_message_set(parms[3])) { - imap_pick_range(parms[3], 1); + if (imap_is_message_set(Params[3].Key)) { + imap_pick_range(Params[3].Key, 1); } else { - cprintf("%s BAD invalid parameters\r\n", parms[0]); + IReply("BAD invalid parameters"); return; } - if (imap_do_copy(parms[4]) == 0) { - cprintf("%s OK ", parms[0]); - imap_output_copyuid_response(); - cprintf("UID COPY completed\r\n"); + if (imap_do_copy(Params[4].Key) == 0) { + IAPrintf("%s OK ", Params[0].Key); + imap_output_copyuid_response(IMAP); + IAPuts("UID COPY completed\r\n"); } else { - cprintf("%s NO UID COPY failed\r\n", parms[0]); + IReply("NO UID COPY failed"); } } -/* - * Poll for instant messages (yeah, we can do this in IMAP ... I think) - */ -void imap_print_instant_messages(void) { - struct ExpressMessage *ptr, *holdptr; - char *dumpomatic = NULL; - char tmp[SIZ]; - int i; - size_t size, size2; - struct tm stamp; - - if (CC->FirstExpressMessage == NULL) { - return; - } - begin_critical_section(S_SESSION_TABLE); - ptr = CC->FirstExpressMessage; - CC->FirstExpressMessage = NULL; - end_critical_section(S_SESSION_TABLE); - - while (ptr != NULL) { - localtime_r(&(ptr->timestamp), &stamp); - size = strlen(ptr->text) + SIZ; - dumpomatic = malloc(size); - strcpy(dumpomatic, ""); - if (ptr->flags && EM_BROADCAST) - strcat(dumpomatic, "Broadcast message "); - else if (ptr->flags && EM_CHAT) - strcat(dumpomatic, "Chat request "); - else if (ptr->flags && EM_GO_AWAY) - strcat(dumpomatic, "Please logoff now, as requested "); - else - strcat(dumpomatic, "Message "); - - /* Timestamp. Can this be improved? */ - if (stamp.tm_hour == 0 || stamp.tm_hour == 12) - sprintf(tmp, "at 12:%02d%cm", - stamp.tm_min, - stamp.tm_hour ? 'p' : 'a'); - else if (stamp.tm_hour > 12) /* pm */ - sprintf(tmp, "at %d:%02dpm", - stamp.tm_hour - 12, - stamp.tm_min); - else /* am */ - sprintf(tmp, "at %d:%02dam", - stamp.tm_hour, stamp.tm_min); - strcat(dumpomatic, tmp); - - size2 = strlen(dumpomatic); - snprintf(&dumpomatic[size2], size - size2, - " from %s:\n", ptr->sender); - if (ptr->text != NULL) - strcat(dumpomatic, ptr->text); - - holdptr = ptr->next; - if (ptr->text != NULL) free(ptr->text); - free(ptr); - ptr = holdptr; - - for (i=0; dumpomatic[i]; ++i) { - if (!isprint(dumpomatic[i])) dumpomatic[i] = ' '; - if (dumpomatic[i]=='\\') dumpomatic[i]='/'; - if (dumpomatic[i]=='\"') dumpomatic[i]='\''; - } - - cprintf("* OK [ALERT] %s\r\n", dumpomatic); - free(dumpomatic); - } - cprintf("000\n"); -} - - /* * imap_do_append_flags() is called by imap_append() to set any flags that * the client specified at append time. @@ -338,36 +274,35 @@ void imap_do_append_flags(long new_msgnum, char *new_message_flags) { /* * This function is called by the main command loop. */ -void imap_append(int num_parms, char *parms[]) { +void imap_append(int num_parms, ConstStr *Params) { long literal_length; - long bytes_transferred; - long stripped_length = 0; struct CtdlMessage *msg = NULL; long new_msgnum = (-1L); int ret = 0; char roomname[ROOMNAMELEN]; - char buf[SIZ]; + char errbuf[SIZ]; + char dummy[SIZ]; char savedroom[ROOMNAMELEN]; int msgs, new; int i; char new_message_flags[SIZ]; - struct citimap *Imap; + citimap *Imap; if (num_parms < 4) { - cprintf("%s BAD usage error\r\n", parms[0]); + IReply("BAD usage error"); return; } - if ( (parms[num_parms-1][0] != '{') - || (parms[num_parms-1][strlen(parms[num_parms-1])-1] != '}') ) { - cprintf("%s BAD no message literal supplied\r\n", parms[0]); + if ( (Params[num_parms-1].Key[0] != '{') + || (Params[num_parms-1].Key[Params[num_parms-1].len-1] != '}') ) { + IReply("BAD no message literal supplied"); return; } - strcpy(new_message_flags, ""); + *new_message_flags = '\0'; if (num_parms >= 5) { for (i=3; itransmitted_message = malloc(literal_length + 1); - if (Imap->transmitted_message == NULL) { - cprintf("%s NO Cannot allocate memory.\r\n", parms[0]); - return; - } - Imap->transmitted_length = literal_length; - cprintf("+ Transmit message now.\r\n"); + Imap->TransmittedMessage = NewStrBufPlain(NULL, literal_length); - bytes_transferred = 0; + if (Imap->TransmittedMessage == NULL) { + IReply("NO Cannot allocate memory."); + return; + } + + IAPrintf("+ Transmit message now.\r\n"); + + IUnbuffer (); - ret = client_read(Imap->transmitted_message, literal_length); - Imap->transmitted_message[literal_length] = 0; + client_read_blob(Imap->TransmittedMessage, literal_length, CtdlGetConfigInt("c_sleeping")); - if (ret != 1) { - cprintf("%s NO Read failed.\r\n", parms[0]); + if ((ret < 0) || (StrLength(Imap->TransmittedMessage) < literal_length)) { + IReply("NO Read failed."); return; } @@ -411,81 +345,62 @@ void imap_append(int num_parms, char *parms[]) { * text) is received. This call to client_getln() absorbs it. */ flush_output(); - client_getln(buf, sizeof buf); + client_getln(dummy, sizeof dummy); /* Convert RFC822 newlines (CRLF) to Unix newlines (LF) */ - lprintf(CTDL_DEBUG, "Converting CRLF to LF\n"); - stripped_length = 0; - for (i=0; itransmitted_message[i], "\r\n", 2)) { - Imap->transmitted_message[stripped_length++] = - Imap->transmitted_message[i]; - } - } - literal_length = stripped_length; - Imap->transmitted_message[literal_length] = 0; /* reterminate it */ + syslog(LOG_DEBUG, "Converting CRLF to LF"); + StrBufToUnixLF(Imap->TransmittedMessage); - lprintf(CTDL_DEBUG, "Converting message format\n"); - msg = convert_internet_message(Imap->transmitted_message); - Imap->transmitted_message = NULL; - Imap->transmitted_length = 0; + syslog(LOG_DEBUG, "Converting message format"); + msg = convert_internet_message_buf(&Imap->TransmittedMessage); - ret = imap_grabroom(roomname, parms[2], 0); + ret = imap_grabroom(roomname, Params[2].Key, 1); if (ret != 0) { - cprintf("%s NO Invalid mailbox name or access denied\r\n", - parms[0]); + IReply("NO Invalid mailbox name or access denied"); return; } /* - * usergoto() formally takes us to the desired room. (If another + * CtdlUserGoto() formally takes us to the desired room. (If another * folder is selected, save its name so we can return there!!!!!) */ if (Imap->selected) { strcpy(savedroom, CC->room.QRname); } - usergoto(roomname, 0, 0, &msgs, &new); + CtdlUserGoto(roomname, 0, 0, &msgs, &new, NULL, NULL); /* If the user is locally authenticated, FORCE the From: header to - * show up as the real sender. FIXME do we really want to do this? - * Probably should make it site-definable or even room-definable. - * - * For now, we allow "forgeries" if the room is one of the user's - * private mailboxes. + * show up as the real sender. (Configurable setting) */ if (CC->logged_in) { - if ( ((CC->room.QRflags & QR_MAILBOX) == 0) && (config.c_imap_keep_from == 0)) { - if (msg->cm_fields['A'] != NULL) free(msg->cm_fields['A']); - if (msg->cm_fields['N'] != NULL) free(msg->cm_fields['N']); - if (msg->cm_fields['H'] != NULL) free(msg->cm_fields['H']); - msg->cm_fields['A'] = strdup(CC->user.fullname); - msg->cm_fields['N'] = strdup(config.c_nodename); - msg->cm_fields['H'] = strdup(config.c_humannode); - } + if ( ((CC->room.QRflags & QR_MAILBOX) == 0) && (CtdlGetConfigInt("c_imap_keep_from") == 0)) + { + CM_SetField(msg, eAuthor, CC->user.fullname, strlen(CC->user.fullname)); + } } /* * Can we post here? */ - ret = CtdlDoIHavePermissionToPostInThisRoom(buf, sizeof buf, NULL, POST_LOGGED_IN); + ret = CtdlDoIHavePermissionToPostInThisRoom(errbuf, sizeof errbuf, NULL, POST_LOGGED_IN, 0); if (ret) { /* Nope ... print an error message */ - cprintf("%s NO %s\r\n", parms[0], buf); + IReplyPrintf("NO %s", errbuf); } else { /* Yes ... go ahead and post! */ if (msg != NULL) { - new_msgnum = CtdlSubmitMsg(msg, NULL, ""); + new_msgnum = CtdlSubmitMsg(msg, NULL, "", 0); } if (new_msgnum >= 0L) { - cprintf("%s OK [APPENDUID %ld %ld] APPEND completed\r\n", - parms[0], GLOBAL_UIDVALIDITY_VALUE, new_msgnum); + IReplyPrintf("OK [APPENDUID %ld %ld] APPEND completed", + GLOBAL_UIDVALIDITY_VALUE, new_msgnum); } else { - cprintf("%s BAD Error %ld saving message to disk.\r\n", - parms[0], new_msgnum); + IReplyPrintf("BAD Error %ld saving message to disk.", + new_msgnum); } } @@ -496,13 +411,13 @@ void imap_append(int num_parms, char *parms[]) { * our happy day without violent explosions. */ if (Imap->selected) { - usergoto(savedroom, 0, 0, &msgs, &new); + CtdlUserGoto(savedroom, 0, 0, &msgs, &new, NULL, NULL); } /* We don't need this buffer anymore */ - CtdlFreeMessage(msg); + CM_Free(msg); - if (new_message_flags != NULL) { + if (IsEmptyStr(new_message_flags)) { imap_do_append_flags(new_msgnum, new_message_flags); } }