* Current status of standards conformance:
*
* -> All required POP3 commands described in RFC1939 are implemented.
- *
* -> All optional POP3 commands described in RFC1939 are also implemented.
- *
* -> The deprecated "LAST" command is included in this implementation, because
* there exist mail clients which insist on using it (such as Bynari
* TradeMail, and certain versions of Eudora).
+ * -> Capability detection via the method described in RFC2449 is implemented.
*
*/
lprintf(CTDL_DEBUG, "Performing POP3 cleanup hook\n");
if (POP3->msgs != NULL) free(POP3->msgs);
+
+ free(POP3);
}
void pop3_greeting(void) {
strcpy(CC->cs_clientname, "POP3 session");
CC->internal_pgm = 1;
- CtdlAllocUserData(SYM_POP3, sizeof(struct citpop3));
- POP3->msgs = NULL;
- POP3->num_msgs = 0;
+ POP3 = malloc(sizeof(struct citpop3));
+ memset(POP3, 0, sizeof(struct citpop3));
cprintf("+OK Citadel POP3 server %s\r\n",
CC->cs_nonce);
strcpy(username, argbuf);
striplt(username);
- lprintf(CTDL_DEBUG, "Trying <%s>\n", username);
+ /* lprintf(CTDL_DEBUG, "Trying <%s>\n", username); */
if (CtdlLoginExistingUser(username) == login_ok) {
cprintf("+OK Password required for %s\r\n", username);
}
* Back end for pop3_grab_mailbox()
*/
void pop3_add_message(long msgnum, void *userdata) {
- FILE *fp;
struct MetaData smi;
++POP3->num_msgs;
* metadata record. If so, great; if not, measure it and then cache
* it for next time.
*/
- GetMetaData(&smi, POP3->num_msgs-1);
+ GetMetaData(&smi, msgnum);
if (smi.meta_rfc822_length <= 0L) {
- fp = tmpfile();
- CtdlRedirectOutput(fp, -1);
- CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
- CtdlRedirectOutput(NULL, -1);
- smi.meta_rfc822_length = ftell(fp);
- fclose(fp);
+ 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;
PutMetaData(&smi);
}
POP3->msgs[POP3->num_msgs-1].rfc822_length = smi.meta_rfc822_length;
if (getroom(&CC->room, MAILROOM) != 0) return(-1);
/* Load up the messages */
- CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL,
+ CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL,
pop3_add_message, NULL);
/* Figure out which are old and which are new */
CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
POP3->lastseen = (-1);
if (POP3->num_msgs) for (i=0; i<POP3->num_msgs; ++i) {
- if (is_msg_in_mset(vbuf.v_seen,
+ if (is_msg_in_sequence_set(vbuf.v_seen,
(POP3->msgs[POP3->num_msgs-1].msgnum) )) {
POP3->lastseen = i;
}
strcpy(password, argbuf);
striplt(password);
- lprintf(CTDL_DEBUG, "Trying <%s>\n", password);
+ /* lprintf(CTDL_DEBUG, "Trying <%s>\n", password); */
if (CtdlTryPassword(password) == pass_ok) {
pop3_login();
}
}
cprintf("+OK Message %d:\r\n", which_one);
- CtdlOutputMsg(POP3->msgs[which_one - 1].msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
+ CtdlOutputMsg(POP3->msgs[which_one - 1].msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL);
cprintf(".\r\n");
}
int lines_requested = 0;
int lines_dumped = 0;
char buf[1024];
+ char *msgtext;
char *ptr;
int in_body = 0;
int done = 0;
- FILE *fp;
sscanf(argbuf, "%d %d", &which_one, &lines_requested);
if ( (which_one < 1) || (which_one > POP3->num_msgs) ) {
return;
}
- fp = tmpfile();
- if (fp == NULL) {
- cprintf("-ERR Internal error: could not create temp file\r\n");
- return;
- }
- CtdlRedirectOutput(fp, -1);
- CtdlOutputMsg(POP3->msgs[which_one - 1].msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
- CtdlRedirectOutput(NULL, -1);
+ 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;
cprintf("+OK Message %d:\r\n", which_one);
- rewind(fp);
- while (ptr = fgets(buf, sizeof buf, fp),
- ( (ptr!=NULL) && (done == 0))) {
- if (in_body == 1)
- if (lines_dumped >= lines_requested) done = 1;
- if ((in_body == 0) || (done == 0))
+
+ ptr = msgtext;
+
+ while (ptr = memreadline(ptr, buf, (sizeof buf - 2)),
+ ( (*ptr != 0) && (done == 0))) {
+ strcat(buf, "\r\n");
+ if (in_body == 1) {
+ if (lines_dumped >= lines_requested) {
+ done = 1;
+ }
+ }
+ if ((in_body == 0) || (done == 0)) {
client_write(buf, strlen(buf));
- if (in_body) ++lines_dumped;
+ }
+ if (in_body) {
+ ++lines_dumped;
+ }
if ((buf[0]==13)||(buf[0]==10)) in_body = 1;
}
+
if (buf[strlen(buf)-1] != 10) cprintf("\n");
- fclose(fp);
+ free(msgtext);
+
cprintf(".\r\n");
}
int i;
struct visit vbuf;
+ long *deletemsgs = NULL;
+ int num_deletemsgs = 0;
+
/* Remove messages marked for deletion */
- if (POP3->num_msgs > 0) for (i=0; i<POP3->num_msgs; ++i) {
- if (POP3->msgs[i].deleted) {
- CtdlDeleteMessages(MAILROOM,
- POP3->msgs[i].msgnum, "");
+ if (POP3->num_msgs > 0) {
+ deletemsgs = malloc(POP3->num_msgs * sizeof(long));
+ for (i=0; i<POP3->num_msgs; ++i) {
+ if (POP3->msgs[i].deleted) {
+ deletemsgs[num_deletemsgs++] = POP3->msgs[i].msgnum;
+ }
+ }
+ if (num_deletemsgs > 0) {
+ CtdlDeleteMessages(MAILROOM, deletemsgs, num_deletemsgs, "", 1);
}
+ free(deletemsgs);
}
/* Set last read pointer */
}
+/*
+ * CAPA is a command which tells the client which POP3 extensions
+ * are supported.
+ */
+void pop3_capa(void) {
+ cprintf("+OK Capability list follows\r\n"
+ "TOP\r\n"
+ "USER\r\n"
+ "UIDL\r\n"
+ "IMPLEMENTATION %s\r\n"
+ ".\r\n"
+ ,
+ CITADEL
+ );
+}
+
+
/*
* UIDL (Universal IDentifier Listing) is easy. Our 'unique' message
time(&CC->lastcmd);
memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
- lprintf(CTDL_ERR, "POP3 socket is broken. Ending session.\r\n");
+ lprintf(CTDL_ERR, "Client disconnected: ending session.\r\n");
CC->kill_me = 1;
return;
}
- lprintf(CTDL_INFO, "POP3: %s\r\n", cmdbuf);
+ if (!strncasecmp(cmdbuf, "PASS", 4)) {
+ lprintf(CTDL_INFO, "POP3: PASS...\r\n");
+ }
+ else {
+ lprintf(CTDL_INFO, "POP3: %s\r\n", cmdbuf);
+ }
while (strlen(cmdbuf) < 5) strcat(cmdbuf, " ");
if (!strncasecmp(cmdbuf, "NOOP", 4)) {
cprintf("+OK No operation.\r\n");
}
+ else if (!strncasecmp(cmdbuf, "CAPA", 4)) {
+ pop3_capa();
+ }
+
else if (!strncasecmp(cmdbuf, "QUIT", 4)) {
cprintf("+OK Goodbye...\r\n");
pop3_update();
projects / citadel.git / blobdiff