/*
* $Id$
*
- * POP3 server for the Citadel/UX system
- * Copyright (C) 1998-2000 by Art Cancro and others.
+ * 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.
*
* Current status of standards conformance:
*
* -> All required POP3 commands described in RFC1939 are implemented.
- *
- * -> Nearly all of the optional commands in RFC1939 are also implemented.
- * The only one missing is APOP, because it implements a "shared secret"
- * method of authentication which would require some major changes to the
- * Citadel server core.
- *
- * This is no longer true- APOP is 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).
#include <pwd.h>
#include <errno.h>
#include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#include <sys/wait.h>
#include <string.h>
#include <limits.h>
#include <ctype.h>
#include "citadel.h"
#include "server.h"
-#include <time.h>
#include "sysdep_decls.h"
#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"
#include "serv_pop3.h"
#include "md5.h"
-long SYM_POP3;
+#ifdef HAVE_OPENSSL
+#include "serv_crypto.h"
+#endif
+
/*
/* 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) {
- fclose(POP3->msgs[i].temp);
+ if (POP3->msgs[i].temp != NULL) {
+ fclose(POP3->msgs[i].temp);
+ 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");
}
POP3->msgs = NULL;
POP3->num_msgs = 0;
- cprintf("+OK Citadel/UX POP3 server %s\r\n",
- CC->cs_nonce, config.c_fqdn);
+ cprintf("+OK Citadel POP3 server %s\r\n",
+ CC->cs_nonce);
}
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);
}
*/
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;
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);
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 ((POP3->msgs[POP3->num_msgs-1].msgnum) <= vbuf.v_lastseen) {
+ if (is_msg_in_mset(vbuf.v_seen,
+ (POP3->msgs[POP3->num_msgs-1].msgnum) )) {
POP3->lastseen = i;
}
}
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");
if ((sptr = strchr(argbuf, ' ')) == NULL)
{
- cprintf("Invalid APOP line.\r\n");
+ cprintf("-ERR Invalid APOP line.\r\n");
return;
}
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();
pop3_login();
}
else
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();
}
return;
}
else {
- cprintf("+OK %d %d\r\n",
+ cprintf("+OK %d %ld\r\n",
which_one,
- POP3->msgs[which_one-1].rfc822_length
+ (long)POP3->msgs[which_one-1].rfc822_length
);
return;
}
cprintf("+OK Here's your mail:\r\n");
if (POP3->num_msgs > 0) for (i=0; i<POP3->num_msgs; ++i) {
if (! POP3->msgs[i].deleted) {
- cprintf("%d %d\r\n",
+ cprintf("%d %ld\r\n",
i+1,
- POP3->msgs[i].rfc822_length);
+ (long)POP3->msgs[i].rfc822_length);
}
}
cprintf(".\r\n");
}
}
- cprintf("+OK %d %d\r\n", total_msgs, total_octets);
+ cprintf("+OK %d %ld\r\n", total_msgs, (long)total_octets);
}
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");
}
/* 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);
- vbuf.v_lastseen = POP3->msgs[POP3->num_msgs-1].msgnum;
- CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+ 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->usersupp);
+ lputuser(&CC->user);
}
}
}
+/*
+ * 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
+
+
+
+
+
/*
* Main command loop for POP3 sessions.
*/
void pop3_command_loop(void) {
- char *icmdbuf;
+ char cmdbuf[SIZ];
time(&CC->lastcmd);
- if (client_gets(&icmdbuf) < 1) {
- lprintf(3, "POP3 socket is broken. Ending session.\r\n");
+ memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
+ if (client_gets(cmdbuf) < 1) {
+ lprintf(CTDL_ERR, "POP3 socket is broken. Ending session.\r\n");
CC->kill_me = 1;
return;
}
- lprintf(5, "citserver[%3d]: %s\r\n", CC->cs_pid, icmdbuf);
- while (strlen(icmdbuf) < 5) strcat(icmdbuf, " ");
+ lprintf(CTDL_INFO, "POP3: %s\r\n", cmdbuf);
+ while (strlen(cmdbuf) < 5) strcat(cmdbuf, " ");
- if (!strncasecmp(icmdbuf, "NOOP", 4)) {
+ if (!strncasecmp(cmdbuf, "NOOP", 4)) {
cprintf("+OK No operation.\r\n");
}
- else if (!strncasecmp(icmdbuf, "QUIT", 4)) {
+ else if (!strncasecmp(cmdbuf, "QUIT", 4)) {
cprintf("+OK Goodbye...\r\n");
pop3_update();
CC->kill_me = 1;
return;
}
- else if (!strncasecmp(icmdbuf, "USER", 4)) {
- pop3_user(&icmdbuf[5]);
+ else if (!strncasecmp(cmdbuf, "USER", 4)) {
+ pop3_user(&cmdbuf[5]);
}
- else if (!strncasecmp(icmdbuf, "PASS", 4)) {
- pop3_pass(&icmdbuf[5]);
+ else if (!strncasecmp(cmdbuf, "PASS", 4)) {
+ pop3_pass(&cmdbuf[5]);
}
- else if (!strncasecmp(icmdbuf, "APOP", 4))
+ else if (!strncasecmp(cmdbuf, "APOP", 4))
{
- pop3_apop(&icmdbuf[5]);
+ 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");
}
- else if (!strncasecmp(icmdbuf, "LIST", 4)) {
- pop3_list(&icmdbuf[5]);
+ else if (!strncasecmp(cmdbuf, "LIST", 4)) {
+ pop3_list(&cmdbuf[5]);
}
- else if (!strncasecmp(icmdbuf, "STAT", 4)) {
- pop3_stat(&icmdbuf[5]);
+ else if (!strncasecmp(cmdbuf, "STAT", 4)) {
+ pop3_stat(&cmdbuf[5]);
}
- else if (!strncasecmp(icmdbuf, "RETR", 4)) {
- pop3_retr(&icmdbuf[5]);
+ else if (!strncasecmp(cmdbuf, "RETR", 4)) {
+ pop3_retr(&cmdbuf[5]);
}
- else if (!strncasecmp(icmdbuf, "DELE", 4)) {
- pop3_dele(&icmdbuf[5]);
+ else if (!strncasecmp(cmdbuf, "DELE", 4)) {
+ pop3_dele(&cmdbuf[5]);
}
- else if (!strncasecmp(icmdbuf, "RSET", 4)) {
- pop3_rset(&icmdbuf[5]);
+ else if (!strncasecmp(cmdbuf, "RSET", 4)) {
+ pop3_rset(&cmdbuf[5]);
}
- else if (!strncasecmp(icmdbuf, "UIDL", 4)) {
- pop3_uidl(&icmdbuf[5]);
+ else if (!strncasecmp(cmdbuf, "UIDL", 4)) {
+ pop3_uidl(&cmdbuf[5]);
}
- else if (!strncasecmp(icmdbuf, "TOP", 3)) {
- pop3_top(&icmdbuf[4]);
+ else if (!strncasecmp(cmdbuf, "TOP", 3)) {
+ pop3_top(&cmdbuf[4]);
}
- else if (!strncasecmp(icmdbuf, "LAST", 4)) {
- pop3_last(&icmdbuf[4]);
+ else if (!strncasecmp(cmdbuf, "LAST", 4)) {
+ pop3_last(&cmdbuf[4]);
}
else {
- cprintf("500 I'm afraid I can't do that.\r\n");
+ cprintf("-ERR I'm afraid I can't do that.\r\n");
}
}
-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$";
}
projects / citadel.git / blobdiff