* $Id$
*
* POP3 service for the Citadel system
- * Copyright (C) 1998-2001 by Art Cancro and others.
- * This code is released under the terms of the GNU General Public License.
+ *
+ * Copyright (c) 1998-2009 by the citadel.org team
+ *
+ * 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
*
* Current status of standards conformance:
*
#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 "internet_addressing.h"
*/
GetMetaData(&smi, msgnum);
if (smi.meta_rfc822_length <= 0L) {
- CC->redirect_buffer = malloc(SIZ);
- CC->redirect_len = 0;
- CC->redirect_alloc = SIZ;
- CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL);
- smi.meta_rfc822_length = CC->redirect_len;
- free(CC->redirect_buffer);
- CC->redirect_buffer = NULL;
- CC->redirect_len = 0;
- CC->redirect_alloc = 0;
+ CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
+ CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL, SUPPRESS_ENV_TO);
+ smi.meta_rfc822_length = StrLength(CC->redirect_buffer);
+ FreeStrBuf(&CC->redirect_buffer); /* TODO: WHEW, all this for just knowing the length???? */
PutMetaData(&smi);
}
POP3->msgs[POP3->num_msgs-1].rfc822_length = smi.meta_rfc822_length;
* of messages in the inbox, or -1 for error)
*/
int pop3_grab_mailbox(void) {
- struct visit vbuf;
+ visit vbuf;
int i;
- if (getroom(&CC->room, MAILROOM) != 0) return(-1);
+ if (CtdlGetRoom(&CC->room, MAILROOM) != 0) return(-1);
/* Load up the messages */
CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL,
return;
}
- if (getuser(&CC->user, CC->curr_user))
+ if (CtdlGetUser(&CC->user, CC->curr_user))
{
cprintf("-ERR No such user.\r\n");
return;
void pop3_pass(char *argbuf) {
char password[SIZ];
- strcpy(password, argbuf);
+ safestrncpy(password, argbuf, sizeof password);
striplt(password);
/* CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", password); */
- if (CtdlTryPassword(password) == pass_ok) {
+ if (CtdlTryPassword(password, strlen(password)) == pass_ok) {
pop3_login();
}
else {
*/
void pop3_retr(char *argbuf) {
int which_one;
- char *msgtext;
- char *nextline;
- char *chunk_to_send;
- char prev_char;
which_one = atoi(argbuf);
if ( (which_one < 1) || (which_one > POP3->num_msgs) ) {
}
cprintf("+OK Message %d:\r\n", which_one);
- CC->redirect_buffer = malloc(SIZ);
- CC->redirect_len = 0;
- CC->redirect_alloc = SIZ;
CtdlOutputMsg(POP3->msgs[which_one - 1].msgnum,
- MT_RFC822, HEADERS_ALL, 0, 1, NULL);
- msgtext = CC->redirect_buffer;
- CC->redirect_buffer = NULL;
- CC->redirect_len = 0;
- CC->redirect_alloc = 0;
-
- /* If we reach this point, the client is expecting data.
- * Need to parse each line of the message here since someone may have sent
- * a message containing a single dot on a line of its own. In that case we
- * need to escape it in accordance with RFC821.
- * We could do this with the tokenizer functions but num_tokens returns an
- * int and the message may contain more lines than that, also copying each
- * line would be slow.
- */
- nextline = msgtext;
- while (*nextline)
- {
- chunk_to_send = nextline;
- while (*nextline != '\n')
- nextline++;
- nextline++;
- prev_char = *nextline;
- *nextline = '\0';
- if (!strcmp(chunk_to_send, ".\r\n")) {
- client_write("..\r\n", 4);
- }
- else {
- client_write(chunk_to_send, (size_t)(nextline-chunk_to_send));
- }
- *nextline = prev_char;
- }
+ MT_RFC822, HEADERS_ALL, 0, 1, NULL,
+ (ESC_DOT|SUPPRESS_ENV_TO)
+ );
cprintf(".\r\n");
}
int lines_requested = 0;
int lines_dumped = 0;
char buf[1024];
- char *msgtext;
- char *ptr;
+ StrBuf *msgtext;
+ const char *ptr;
int in_body = 0;
int done = 0;
return;
}
- CC->redirect_buffer = malloc(SIZ);
- CC->redirect_len = 0;
- CC->redirect_alloc = SIZ;
- CtdlOutputMsg(POP3->msgs[which_one - 1].msgnum,
- MT_RFC822, HEADERS_ALL, 0, 1, NULL);
+ CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
+ CtdlOutputMsg(POP3->msgs[which_one - 1].msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL, SUPPRESS_ENV_TO);
msgtext = CC->redirect_buffer;
CC->redirect_buffer = NULL;
- CC->redirect_len = 0;
- CC->redirect_alloc = 0;
cprintf("+OK Message %d:\r\n", which_one);
-
- ptr = msgtext;
-
- while (ptr = memreadline(ptr, buf, (sizeof buf - 2)),
+
+ ptr = ChrPtr(msgtext);
+ while (ptr = cmemreadline(ptr, buf, (sizeof buf - 2)),
( (*ptr != 0) && (done == 0))) {
strcat(buf, "\r\n");
if (in_body == 1) {
}
if (buf[strlen(buf)-1] != 10) cprintf("\n");
- free(msgtext);
+ FreeStrBuf(&msgtext);
cprintf(".\r\n");
}
*/
void pop3_update(void) {
int i;
- struct visit vbuf;
+ visit vbuf;
long *deletemsgs = NULL;
int num_deletemsgs = 0;
/* Set last read pointer */
if (POP3->num_msgs > 0) {
- lgetuser(&CC->user, CC->curr_user);
+ CtdlGetUserLock(&CC->user, CC->curr_user);
CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
snprintf(vbuf.v_seen, sizeof vbuf.v_seen, "*:%ld",
POP3->msgs[POP3->num_msgs-1].msgnum);
CtdlSetRelationship(&vbuf, &CC->user, &CC->room);
- lputuser(&CC->user);
+ CtdlPutUserLock(&CC->user);
}
}
else if (!CC->logged_in) {
cprintf("-ERR Not logged in.\r\n");
}
+
+ else if (CC->nologin) {
+ cprintf("-ERR System busy, try later.\r\n");
+ CC->kill_me = 1;
+ }
else if (!strncasecmp(cmdbuf, "LIST", 4)) {
pop3_list(&cmdbuf[5]);