* Replaced all "Citadel/UX" references with "Citadel"

[citadel.git] / citadel / serv_pop3.c

diff --git a/citadel/serv_pop3.c b/citadel/serv_pop3.c
index 8cd9d62a3a3a4483911ae38b809d9105928b4fbf..8401acc489d45038c59186a7d6d655ed96e8875b 100644 (file)
--- a/citadel/serv_pop3.c
+++ b/citadel/serv_pop3.c
@@ -1,7 +1,7 @@
 /*
  * $Id$ 
  *
- * POP3 service for the Citadel/UX system
+ * 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.
  *
@@ -48,7 +48,7 @@
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
 #include "room_ops.h"
 #include "user_ops.h"
 #include "policy.h"
@@ -59,7 +59,10 @@
 #include "serv_pop3.h"
 #include "md5.h"
 
-long SYM_POP3;
+#ifdef HAVE_OPENSSL
+#include "serv_crypto.h"
+#endif
+
 
 
 /*
@@ -72,7 +75,7 @@ void pop3_cleanup_function(void) {
        /* Don't do this stuff if this is not a POP3 session! */
        if (CC->h_command_function != pop3_command_loop) return;
 
-       lprintf(9, "Performing POP3 cleanup hook\n");
+       lprintf(CTDL_DEBUG, "Performing POP3 cleanup hook\n");
 
        if (POP3->num_msgs > 0) for (i=0; i<POP3->num_msgs; ++i) {
                if (POP3->msgs[i].temp != NULL) {
@@ -80,9 +83,9 @@ void pop3_cleanup_function(void) {
                        POP3->msgs[i].temp = NULL;
                }
        }
-       if (POP3->msgs != NULL) phree(POP3->msgs);
+       if (POP3->msgs != NULL) free(POP3->msgs);
 
-       lprintf(9, "Finished POP3 cleanup hook\n");
+       lprintf(CTDL_DEBUG, "Finished POP3 cleanup hook\n");
 }
 
 
@@ -97,7 +100,7 @@ void pop3_greeting(void) {
        POP3->msgs = NULL;
        POP3->num_msgs = 0;
 
-       cprintf("+OK Citadel/UX POP3 server %s\r\n",
+       cprintf("+OK Citadel POP3 server %s\r\n",
                CC->cs_nonce);
 }
 
@@ -116,7 +119,7 @@ void pop3_user(char *argbuf) {
        strcpy(username, argbuf);
        striplt(username);
 
-       lprintf(9, "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);
        }
@@ -132,11 +135,11 @@ void pop3_user(char *argbuf) {
  */
 void pop3_add_message(long msgnum, void *userdata) {
        FILE *fp;
-       lprintf(9, "in pop3_add_message()\n");
+       lprintf(CTDL_DEBUG, "in pop3_add_message()\n");
 
        ++POP3->num_msgs;
-       if (POP3->num_msgs < 2) POP3->msgs = mallok(sizeof(struct pop3msg));
-       else POP3->msgs = reallok(POP3->msgs, 
+       if (POP3->num_msgs < 2) POP3->msgs = malloc(sizeof(struct pop3msg));
+       else POP3->msgs = realloc(POP3->msgs, 
                (POP3->num_msgs * sizeof(struct pop3msg)) ) ;
        POP3->msgs[POP3->num_msgs-1].msgnum = msgnum;
        POP3->msgs[POP3->num_msgs-1].deleted = 0;
@@ -144,7 +147,7 @@ void pop3_add_message(long msgnum, void *userdata) {
        POP3->msgs[POP3->num_msgs-1].temp = fp;
 
        CtdlRedirectOutput(fp, -1);
-       CtdlOutputMsg(msgnum, MT_RFC822, 0, 0, 1);
+       CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
        CtdlRedirectOutput(NULL, -1);
 
        POP3->msgs[POP3->num_msgs-1].rfc822_length = ftell(fp);
@@ -161,14 +164,14 @@ int pop3_grab_mailbox(void) {
         struct visit vbuf;
        int i;
 
-       if (getroom(&CC->quickroom, MAILROOM) != 0) return(-1);
+       if (getroom(&CC->room, MAILROOM) != 0) return(-1);
 
        /* Load up the messages */
-       CtdlForEachMessage(MSGS_ALL, 0L, (-63), NULL, NULL,
+       CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL,
                pop3_add_message, NULL);
 
        /* Figure out which are old and which are new */
-        CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+        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,
@@ -187,8 +190,8 @@ void pop3_login(void)
        msgs = pop3_grab_mailbox();
        if (msgs >= 0) {
                cprintf("+OK %s is logged in (%d messages)\r\n",
-                       CC->usersupp.fullname, msgs);
-               lprintf(9, "POP3 password login successful\n");
+                       CC->user.fullname, msgs);
+               lprintf(CTDL_NOTICE, "POP3 authenticated %s\n", CC->user.fullname);
        }
        else {
                cprintf("-ERR Can't open your mailbox\r\n");
@@ -232,13 +235,13 @@ void pop3_apop(char *argbuf)
        return;
    }
    
-   if (getuser(&CC->usersupp, CC->curr_user))
+   if (getuser(&CC->user, CC->curr_user))
    {
        cprintf("-ERR No such user.\r\n");
        return;
    }
    
-   make_apop_string(CC->usersupp.password, CC->cs_nonce, realdigest);
+   make_apop_string(CC->user.password, CC->cs_nonce, realdigest, sizeof realdigest);
    if (!strncasecmp(realdigest, userdigest, MD5_HEXSTRING_SIZE-1))
    {
        do_login();
@@ -260,7 +263,7 @@ void pop3_pass(char *argbuf) {
        strcpy(password, argbuf);
        striplt(password);
 
-       lprintf(9, "Trying <%s>\n", password);
+       lprintf(CTDL_DEBUG, "Trying <%s>\n", password);
        if (CtdlTryPassword(password) == pass_ok) {
                pop3_login();
        }
@@ -362,7 +365,7 @@ void pop3_retr(char *argbuf) {
                cprintf("%c", ch);
        }
        if (ch != 10) {
-               lprintf(5, "Problem: message ends with 0x%2x, not 0x0a\n", ch);
+               lprintf(CTDL_WARNING, "Problem: message ends with 0x%2x, not 0x0a\n", ch);
        }
        cprintf(".\r\n");
 }
@@ -447,14 +450,14 @@ void pop3_update(void) {
 
        /* Set last read pointer */
        if (POP3->num_msgs > 0) {
-               lgetuser(&CC->usersupp, CC->curr_user);
+               lgetuser(&CC->user, CC->curr_user);
 
-               CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
-               sprintf(vbuf.v_seen, "*:%ld",
+               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->usersupp, &CC->quickroom);
+               CtdlSetRelationship(&vbuf, &CC->user, &CC->room);
 
-               lputuser(&CC->usersupp);
+               lputuser(&CC->user);
        }
 
 }
@@ -530,6 +533,30 @@ void pop3_uidl(char *argbuf) {
 }
 
 
+/*
+ * implements the STLS command (Citadel API version)
+ */
+#ifdef HAVE_OPENSSL
+void pop3_stls(void)
+{
+       char ok_response[SIZ];
+       char nosup_response[SIZ];
+       char error_response[SIZ];
+
+       sprintf(ok_response,
+               "+OK Begin TLS negotiation now\r\n");
+       sprintf(nosup_response,
+               "-ERR TLS not supported here\r\n");
+       sprintf(error_response,
+               "-ERR Internal error\r\n");
+       CtdlStartTLS(ok_response, nosup_response, error_response);
+}
+#endif
+
+
+
+
+
 
 
 /* 
@@ -541,11 +568,11 @@ void pop3_command_loop(void) {
        time(&CC->lastcmd);
        memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
        if (client_gets(cmdbuf) < 1) {
-               lprintf(3, "POP3 socket is broken.  Ending session.\r\n");
+               lprintf(CTDL_ERR, "POP3 socket is broken.  Ending session.\r\n");
                CC->kill_me = 1;
                return;
        }
-       lprintf(5, "POP3: %s\r\n", cmdbuf);
+       lprintf(CTDL_INFO, "POP3: %s\r\n", cmdbuf);
        while (strlen(cmdbuf) < 5) strcat(cmdbuf, " ");
 
        if (!strncasecmp(cmdbuf, "NOOP", 4)) {
@@ -572,6 +599,12 @@ void pop3_command_loop(void) {
                pop3_apop(&cmdbuf[5]);
        }
 
+#ifdef HAVE_OPENSSL
+       else if (!strncasecmp(cmdbuf, "STLS", 4)) {
+               pop3_stls();
+       }
+#endif
+
        else if (!CC->logged_in) {
                cprintf("-ERR Not logged in.\r\n");
        }
@@ -616,13 +649,13 @@ void pop3_command_loop(void) {
 
 
 
-char *Dynamic_Module_Init(void)
+char *serv_pop3_init(void)
 {
-       SYM_POP3 = CtdlGetDynamicSymbol();
        CtdlRegisterServiceHook(config.c_pop3_port,
                                NULL,
                                pop3_greeting,
-                               pop3_command_loop);
+                               pop3_command_loop,
+                               NULL);
        CtdlRegisterSessionHook(pop3_cleanup_function, EVT_STOP);
        return "$Id$";
 }