* Any "delete message" operation which is synchronous to a client is now

[citadel.git] / citadel / serv_pop3.c

diff --git a/citadel/serv_pop3.c b/citadel/serv_pop3.c
index cc01a6b1ac5a305a2d0dc014c2117d200cec3cea..b79b3771fe2e9bf3ec70a627795c712c1661b73c 100644 (file)
--- a/citadel/serv_pop3.c
+++ b/citadel/serv_pop3.c
@@ -76,6 +76,8 @@ void pop3_cleanup_function(void) {
 
        lprintf(CTDL_DEBUG, "Performing POP3 cleanup hook\n");
        if (POP3->msgs != NULL) free(POP3->msgs);
+
+       free(POP3);
 }
 
 
@@ -86,15 +88,26 @@ void pop3_cleanup_function(void) {
 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);
 }
 
 
+/*
+ * POP3S is just like POP3, except it goes crypto right away.
+ */
+#ifdef HAVE_OPENSSL
+void pop3s_greeting(void) {
+       CtdlStartTLS(NULL, NULL, NULL);
+       pop3_greeting();
+}
+#endif
+
+
+
 /*
  * Specify user name (implements POP3 "USER" command)
  */
@@ -109,7 +122,7 @@ void pop3_user(char *argbuf) {
        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);
        }
@@ -124,8 +137,6 @@ void pop3_user(char *argbuf) {
  * Back end for pop3_grab_mailbox()
  */
 void pop3_add_message(long msgnum, void *userdata) {
-       FILE *fp;
-       lprintf(CTDL_DEBUG, "in pop3_add_message()\n");
        struct MetaData smi;
 
        ++POP3->num_msgs;
@@ -140,14 +151,17 @@ void pop3_add_message(long msgnum, void *userdata) {
         * 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);
+               CC->redirect_buffer = malloc(SIZ);
+               CC->redirect_len = 0;
+               CC->redirect_alloc = SIZ;
                CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
-               CtdlRedirectOutput(NULL, -1);
-               smi.meta_rfc822_length = ftell(fp);
-               fclose(fp);
+               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;
@@ -174,7 +188,7 @@ int pop3_grab_mailbox(void) {
         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;
                }
@@ -263,7 +277,7 @@ void pop3_pass(char *argbuf) {
        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();
        }
@@ -369,10 +383,10 @@ void pop3_top(char *argbuf) {
        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) ) {
@@ -385,28 +399,40 @@ void pop3_top(char *argbuf) {
                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);
+       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");
 }
 
@@ -445,7 +471,7 @@ void pop3_update(void) {
        if (POP3->num_msgs > 0) for (i=0; i<POP3->num_msgs; ++i) {
                if (POP3->msgs[i].deleted) {
                        CtdlDeleteMessages(MAILROOM,
-                               POP3->msgs[i].msgnum, "");
+                               POP3->msgs[i].msgnum, "", 1);
                }
        }
 
@@ -568,12 +594,17 @@ void pop3_command_loop(void) {
 
        time(&CC->lastcmd);
        memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
-       if (client_gets(cmdbuf) < 1) {
+       if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
                lprintf(CTDL_ERR, "POP3 socket is broken.  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)) {
@@ -657,6 +688,13 @@ char *serv_pop3_init(void)
                                pop3_greeting,
                                pop3_command_loop,
                                NULL);
+#ifdef HAVE_OPENSSL
+       CtdlRegisterServiceHook(config.c_pop3s_port,
+                               NULL,
+                               pop3s_greeting,
+                               pop3_command_loop,
+                               NULL);
+#endif
        CtdlRegisterSessionHook(pop3_cleanup_function, EVT_STOP);
        return "$Id$";
 }