/*
* POP3 service for the Citadel system
*
- * Copyright (c) 1998-2012 by the citadel.org team
+ * Copyright (c) 1998-2018 by the citadel.org team
*
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3.
- *
- *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
*
- * 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.
- *
- *
- *
- *
+ * 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.
*
* Current status of standards conformance:
*
* 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.
- *
*/
#include "sysdep.h"
#include "internet_addressing.h"
#include "serv_pop3.h"
#include "md5.h"
-
-
-
#include "ctdl_module.h"
-int POP3DebugEnabled = 0;
-
-#define POP3DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (POP3DebugEnabled != 0))
-#define CCCID CCC->cs_pid
-#define POP3_syslog(LEVEL, FORMAT, ...) \
- POP3DBGLOG(LEVEL) syslog(LEVEL, \
- "POP3CC[%d] " FORMAT, \
- CCCID, __VA_ARGS__)
-
-#define POP3M_syslog(LEVEL, FORMAT) \
- POP3DBGLOG(LEVEL) syslog(LEVEL, \
- "POP3CC[%d] " FORMAT, \
- CCCID)
/*
* This cleanup function blows away the temporary memory and files used by
/* Don't do this stuff if this is not a POP3 session! */
if (CCC->h_command_function != pop3_command_loop) return;
- POP3M_syslog(LOG_DEBUG, "Performing POP3 cleanup hook");
- if (POP3->msgs != NULL) free(POP3->msgs);
+ struct citpop3 *pop3 = ((struct citpop3 *)CCC->session_specific_data);
+ syslog(LOG_DEBUG, "pop3: performing cleanup hook");
+ if (pop3->msgs != NULL) {
+ free(pop3->msgs);
+ }
- free(POP3);
+ free(pop3);
}
-
/*
* Here's where our POP3 session begins its happy day.
*/
}
-
/*
* Specify user name (implements POP3 "USER" command)
*/
strcpy(username, argbuf);
striplt(username);
- /* POP3_syslog(LOG_DEBUG, "Trying <%s>", username); */
- if (CtdlLoginExistingUser(NULL, username) == login_ok) {
+ if (CtdlLoginExistingUser(username) == login_ok) {
cprintf("+OK Password required for %s\r\n", username);
}
else {
}
-
/*
* Back end for pop3_grab_mailbox()
*/
GetMetaData(&smi, msgnum);
if (smi.meta_rfc822_length <= 0L) {
CCC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
-
- CtdlOutputMsg(msgnum,
- MT_RFC822,
- HEADERS_ALL,
- 0, 1, NULL,
- SUPPRESS_ENV_TO,
- NULL, NULL);
-
+ CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL, SUPPRESS_ENV_TO, NULL, NULL, NULL);
smi.meta_rfc822_length = StrLength(CCC->redirect_buffer);
- FreeStrBuf(&CCC->redirect_buffer); /* TODO: WHEW, all this for just knowing the length???? */
+ FreeStrBuf(&CCC->redirect_buffer);
PutMetaData(&smi);
}
POP3->msgs[POP3->num_msgs-1].rfc822_length = smi.meta_rfc822_length;
}
-
/*
* Open the inbox and read its contents.
* (This should be called only once, by pop3_pass(), and returns the number
if (CtdlGetRoom(&CCC->room, MAILROOM) != 0) return(-1);
/* Load up the messages */
- CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL,
- pop3_add_message, NULL);
+ CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL, pop3_add_message, NULL);
/* Figure out which are old and which are new */
CtdlGetRelationship(&vbuf, &CCC->user, &CCC->room);
POP3->lastseen = (-1);
if (POP3->num_msgs) for (i=0; i<POP3->num_msgs; ++i) {
- if (is_msg_in_sequence_set(vbuf.v_seen,
- (POP3->msgs[POP3->num_msgs-1].msgnum) )) {
+ if (is_msg_in_sequence_set(vbuf.v_seen, (POP3->msgs[POP3->num_msgs-1].msgnum) )) {
POP3->lastseen = i;
}
}
return(POP3->num_msgs);
}
+
void pop3_login(void)
{
struct CitContext *CCC = CC;
if (msgs >= 0) {
cprintf("+OK %s is logged in (%d messages)\r\n",
CCC->user.fullname, msgs);
- POP3_syslog(LOG_DEBUG, "POP3 authenticated %s", CCC->user.fullname);
+ syslog(LOG_DEBUG, "pop3: authenticated %s", CCC->user.fullname);
}
else {
cprintf("-ERR Can't open your mailbox\r\n");
safestrncpy(password, argbuf, sizeof password);
striplt(password);
- /* POP3_syslog(LOG_DEBUG, "Trying <%s>", password); */
if (CtdlTryPassword(password, strlen(password)) == pass_ok) {
pop3_login();
}
}
-
/*
* list available msgs
*/
/* "list one" mode */
if (which_one > 0) {
if (which_one > POP3->num_msgs) {
- cprintf("-ERR no such message, only %d are here\r\n",
- POP3->num_msgs);
+ cprintf("-ERR no such message, only %d are here\r\n", POP3->num_msgs);
return;
}
else if (POP3->msgs[which_one-1].deleted) {
return;
}
else {
- cprintf("+OK %d %ld\r\n",
- which_one,
- (long)POP3->msgs[which_one-1].rfc822_length
- );
+ cprintf("+OK %d %ld\r\n", which_one, (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 %ld\r\n",
- i+1,
- (long)POP3->msgs[i].rfc822_length);
+ cprintf("%d %ld\r\n", i+1, (long)POP3->msgs[i].rfc822_length);
}
}
cprintf(".\r\n");
}
-
/*
* RETR command (fetch a message)
*/
}
cprintf("+OK Message %d:\r\n", which_one);
- CtdlOutputMsg(POP3->msgs[which_one - 1].msgnum,
- MT_RFC822, HEADERS_ALL, 0, 1, NULL,
- (ESC_DOT|SUPPRESS_ENV_TO),
- NULL, NULL);
+ CtdlOutputMsg(POP3->msgs[which_one - 1].msgnum, MT_RFC822,
+ HEADERS_ALL, 0, 1, NULL,
+ (ESC_DOT|SUPPRESS_ENV_TO), NULL, NULL, NULL
+ );
cprintf(".\r\n");
}
HEADERS_ALL,
0, 1, NULL,
SUPPRESS_ENV_TO,
- NULL, NULL);
+ NULL, NULL, NULL);
msgtext = CCC->redirect_buffer;
CCC->redirect_buffer = NULL;
/* Set last read pointer */
if (POP3->num_msgs > 0) {
- CtdlGetUserLock(&CCC->user, CCC->curr_user);
-
+ CtdlLockGetCurrentUser();
CtdlGetRelationship(&vbuf, &CCC->user, &CCC->room);
- snprintf(vbuf.v_seen, sizeof vbuf.v_seen, "*:%ld",
- POP3->msgs[POP3->num_msgs-1].msgnum);
+ snprintf(vbuf.v_seen, sizeof vbuf.v_seen, "*:%ld", POP3->msgs[POP3->num_msgs-1].msgnum);
CtdlSetRelationship(&vbuf, &CCC->user, &CCC->room);
-
- CtdlPutUserLock(&CCC->user);
+ CtdlPutCurrentUserLock();
}
}
}
-
/*
* LAST (Determine which message is the last unread message)
*/
/*
- * CAPA is a command which tells the client which POP3 extensions
- * are supported.
+ * CAPA is a command which tells the client which POP3 extensions are supported.
*/
void pop3_capa(void) {
cprintf("+OK Capability list follows\r\n"
}
-
/*
* UIDL (Universal IDentifier Listing) is easy. Our 'unique' message
* identifiers are simply the Citadel message numbers in the database.
/* "list one" mode */
if (which_one > 0) {
if (which_one > POP3->num_msgs) {
- cprintf("-ERR no such message, only %d are here\r\n",
- POP3->num_msgs);
+ cprintf("-ERR no such message, only %d are here\r\n", POP3->num_msgs);
return;
}
else if (POP3->msgs[which_one-1].deleted) {
return;
}
else {
- cprintf("+OK %d %ld\r\n",
- which_one,
- POP3->msgs[which_one-1].msgnum
- );
+ cprintf("+OK %d %ld\r\n", which_one, POP3->msgs[which_one-1].msgnum);
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 %ld\r\n",
- i+1,
- POP3->msgs[i].msgnum);
+ cprintf("%d %ld\r\n", i+1, POP3->msgs[i].msgnum);
}
}
cprintf(".\r\n");
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");
+ 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");
CtdlModuleStartCryptoMsgs(ok_response, nosup_response, error_response);
}
-
-
-
-
-
/*
* Main command loop for POP3 sessions.
*/
time(&CCC->lastcmd);
memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
- POP3M_syslog(LOG_INFO, "POP3 client disconnected: ending session.");
+ syslog(LOG_INFO, "pop3: client disconnected; ending session.");
CCC->kill_me = KILLME_CLIENT_DISCONNECTED;
return;
}
if (!strncasecmp(cmdbuf, "PASS", 4)) {
- POP3M_syslog(LOG_DEBUG, "POP3: PASS...");
+ syslog(LOG_DEBUG, "pop3: PASS...");
}
else {
- POP3_syslog(LOG_DEBUG, "POP3: %s", cmdbuf);
+ syslog(LOG_DEBUG, "pop3: %s", cmdbuf);
}
while (strlen(cmdbuf) < 5) strcat(cmdbuf, " ");
const char *CitadelServicePop3="POP3";
const char *CitadelServicePop3S="POP3S";
-void SetPOP3DebugEnabled(const int n)
-{
- POP3DebugEnabled = n;
-}
-
CTDL_MODULE_INIT(pop3)
{
if(!threading)
{
- CtdlRegisterDebugFlagHook(HKEY("pop3srv"), SetPOP3DebugEnabled, &POP3DebugEnabled);
-
- CtdlRegisterServiceHook(config.c_pop3_port,
+ CtdlRegisterServiceHook(CtdlGetConfigInt("c_pop3_port"),
NULL,
pop3_greeting,
pop3_command_loop,
NULL,
CitadelServicePop3);
#ifdef HAVE_OPENSSL
- CtdlRegisterServiceHook(config.c_pop3s_port,
+ CtdlRegisterServiceHook(CtdlGetConfigInt("c_pop3s_port"),
NULL,
pop3s_greeting,
pop3_command_loop,
projects / citadel.git / blobdiff