X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fpop3%2Fserv_pop3.c;h=de4d7a0653efb9b7e6b77ce189cbcf239ab16a10;hb=bcbaf2800c778043c12f9fd2d719ca9271ac6cb4;hp=dcdbb8ec6d8b2c581ed164e883719ce0bfa35759;hpb=2ed96d7a59a16ca0ebb5707f32044dc411bde25a;p=citadel.git

diff --git a/citadel/modules/pop3/serv_pop3.c b/citadel/modules/pop3/serv_pop3.c
index dcdbb8ec6..de4d7a065 100644
--- a/citadel/modules/pop3/serv_pop3.c
+++ b/citadel/modules/pop3/serv_pop3.c
@@ -1,9 +1,21 @@
 /*
- * $Id$ 
- *
  * 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.
+ *
+ * Copyright (c) 1998-2012 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 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:
  *
@@ -47,9 +59,7 @@
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "room_ops.h"
 #include "user_ops.h"
-#include "policy.h"
 #include "database.h"
 #include "msgbase.h"
 #include "internet_addressing.h"
@@ -71,7 +81,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(CTDL_DEBUG, "Performing POP3 cleanup hook\n");
+	syslog(LOG_DEBUG, "Performing POP3 cleanup hook");
 	if (POP3->msgs != NULL) free(POP3->msgs);
 
 	free(POP3);
@@ -88,8 +98,7 @@ void pop3_greeting(void) {
 	CC->session_specific_data = malloc(sizeof(struct citpop3));
 	memset(POP3, 0, sizeof(struct citpop3));
 
-	cprintf("+OK Citadel POP3 server %s\r\n",
-		CC->cs_nonce);
+	cprintf("+OK Citadel POP3 server ready.\r\n");
 }
 
 
@@ -101,9 +110,9 @@ void pop3s_greeting(void) {
 
 /* kill session if no crypto */
 #ifdef HAVE_OPENSSL
-	if (!CC->redirect_ssl) CC->kill_me = 1;
+	if (!CC->redirect_ssl) CC->kill_me = KILLME_NO_CRYPTO;
 #else
-	CC->kill_me = 1;
+	CC->kill_me = KILLME_NO_CRYPTO;
 #endif
 
 	pop3_greeting();
@@ -125,7 +134,7 @@ void pop3_user(char *argbuf) {
 	strcpy(username, argbuf);
 	striplt(username);
 
-	/* lprintf(CTDL_DEBUG, "Trying <%s>\n", username); */
+	/* syslog(LOG_DEBUG, "Trying <%s>", username); */
 	if (CtdlLoginExistingUser(NULL, username) == login_ok) {
 		cprintf("+OK Password required for %s\r\n", username);
 	}
@@ -156,15 +165,10 @@ void pop3_add_message(long msgnum, void *userdata) {
 	 */
 	GetMetaData(&smi, msgnum);
 	if (smi.meta_rfc822_length <= 0L) {
-		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;
+		CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
+		CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL, SUPPRESS_ENV_TO);
+		smi.meta_rfc822_length = StrLength(CC->redirect_buffer);
+		FreeStrBuf(&CC->redirect_buffer); /* TODO: WHEW, all this for just knowing the length???? */
 		PutMetaData(&smi);
 	}
 	POP3->msgs[POP3->num_msgs-1].rfc822_length = smi.meta_rfc822_length;
@@ -178,10 +182,10 @@ void pop3_add_message(long msgnum, void *userdata) {
  * of messages in the inbox, or -1 for error)
  */
 int pop3_grab_mailbox(void) {
-        struct visit vbuf;
+        visit vbuf;
 	int i;
 
-	if (getroom(&CC->room, MAILROOM) != 0) return(-1);
+	if (CtdlGetRoom(&CC->room, MAILROOM) != 0) return(-1);
 
 	/* Load up the messages */
 	CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL,
@@ -208,7 +212,7 @@ void pop3_login(void)
 	if (msgs >= 0) {
 		cprintf("+OK %s is logged in (%d messages)\r\n",
 			CC->user.fullname, msgs);
-		lprintf(CTDL_NOTICE, "POP3 authenticated %s\n", CC->user.fullname);
+		syslog(LOG_NOTICE, "POP3 authenticated %s", CC->user.fullname);
 	}
 	else {
 		cprintf("-ERR Can't open your mailbox\r\n");
@@ -216,60 +220,6 @@ void pop3_login(void)
 	
 }
 
-void pop3_apop(char *argbuf)
-{
-   char username[SIZ];
-   char userdigest[MD5_HEXSTRING_SIZE];
-   char realdigest[MD5_HEXSTRING_SIZE];
-   char *sptr;
-   
-   if (CC->logged_in)
-   {
-   	cprintf("-ERR You are already logged in; not in the AUTHORIZATION phase.\r\n");
-   	return;
-   }
-   
-   if ((sptr = strchr(argbuf, ' ')) == NULL)
-   {
-   	cprintf("-ERR Invalid APOP line.\r\n");
-   	return;
-   }
-   
-   *sptr++ = '\0';
-   
-   while ((*sptr) && isspace(*sptr))
-      sptr++;
-   
-   strncpy(username, argbuf, sizeof(username)-1);
-   username[sizeof(username)-1] = '\0';
-   
-   memset(userdigest, MD5_HEXSTRING_SIZE, 0);
-   strncpy(userdigest, sptr, MD5_HEXSTRING_SIZE-1);
-   
-   if (CtdlLoginExistingUser(NULL, username) != login_ok)
-   {
-   	cprintf("-ERR No such user.\r\n");
-   	return;
-   }
-   
-   if (getuser(&CC->user, CC->curr_user))
-   {
-   	cprintf("-ERR No such user.\r\n");
-   	return;
-   }
-   
-   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
-   {
-	cprintf("-ERR That is NOT the password.\r\n");
-   }
-}
-
 
 /*
  * Authorize with password (implements POP3 "PASS" command)
@@ -277,11 +227,11 @@ void pop3_apop(char *argbuf)
 void pop3_pass(char *argbuf) {
 	char password[SIZ];
 
-	strcpy(password, argbuf);
+	safestrncpy(password, argbuf, sizeof password);
 	striplt(password);
 
-	/* lprintf(CTDL_DEBUG, "Trying <%s>\n", password); */
-	if (CtdlTryPassword(password) == pass_ok) {
+	/* syslog(LOG_DEBUG, "Trying <%s>", password); */
+	if (CtdlTryPassword(password, strlen(password)) == pass_ok) {
 		pop3_login();
 	}
 	else {
@@ -373,7 +323,10 @@ void pop3_retr(char *argbuf) {
 	}
 
 	cprintf("+OK Message %d:\r\n", which_one);
-	CtdlOutputMsg(POP3->msgs[which_one - 1].msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL);
+	CtdlOutputMsg(POP3->msgs[which_one - 1].msgnum,
+		MT_RFC822, HEADERS_ALL, 0, 1, NULL,
+		(ESC_DOT|SUPPRESS_ENV_TO)
+	);
 	cprintf(".\r\n");
 }
 
@@ -386,8 +339,8 @@ void pop3_top(char *argbuf) {
 	int lines_requested = 0;
 	int lines_dumped = 0;
 	char buf[1024];
-	char *msgtext;
-	char *ptr;
+	StrBuf *msgtext;
+	const char *ptr;
 	int in_body = 0;
 	int done = 0;
 
@@ -402,21 +355,15 @@ void pop3_top(char *argbuf) {
 		return;
 	}
 
-	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);
+	CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
+	CtdlOutputMsg(POP3->msgs[which_one - 1].msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL, SUPPRESS_ENV_TO);
 	msgtext = CC->redirect_buffer;
 	CC->redirect_buffer = NULL;
-	CC->redirect_len = 0;
-	CC->redirect_alloc = 0;
 
 	cprintf("+OK Message %d:\r\n", which_one);
-
-	ptr = msgtext;
-
-	while (ptr = memreadline(ptr, buf, (sizeof buf - 2)),
+	
+	ptr = ChrPtr(msgtext);
+	while (ptr = cmemreadline(ptr, buf, (sizeof buf - 2)),
 	      ( (*ptr != 0) && (done == 0))) {
 		strcat(buf, "\r\n");
 		if (in_body == 1) {
@@ -434,7 +381,7 @@ void pop3_top(char *argbuf) {
 	}
 
 	if (buf[strlen(buf)-1] != 10) cprintf("\n");
-	free(msgtext);
+	FreeStrBuf(&msgtext);
 
 	cprintf(".\r\n");
 }
@@ -468,7 +415,7 @@ void pop3_dele(char *argbuf) {
  */
 void pop3_update(void) {
 	int i;
-        struct visit vbuf;
+        visit vbuf;
 
 	long *deletemsgs = NULL;
 	int num_deletemsgs = 0;
@@ -489,14 +436,14 @@ void pop3_update(void) {
 
 	/* Set last read pointer */
 	if (POP3->num_msgs > 0) {
-		lgetuser(&CC->user, CC->curr_user);
+		CtdlGetUserLock(&CC->user, CC->curr_user);
 
 		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->user);
+		CtdlPutUserLock(&CC->user);
 	}
 
 }
@@ -622,15 +569,15 @@ void pop3_command_loop(void) {
 	time(&CC->lastcmd);
 	memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
 	if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
-		lprintf(CTDL_ERR, "Client disconnected: ending session.\r\n");
-		CC->kill_me = 1;
+		syslog(LOG_ERR, "POP3 client disconnected: ending session.");
+		CC->kill_me = KILLME_CLIENT_DISCONNECTED;
 		return;
 	}
 	if (!strncasecmp(cmdbuf, "PASS", 4)) {
-		lprintf(CTDL_INFO, "POP3: PASS...\r\n");
+		syslog(LOG_INFO, "POP3: PASS...");
 	}
 	else {
-		lprintf(CTDL_INFO, "POP3: %s\r\n", cmdbuf);
+		syslog(LOG_INFO, "POP3: %s", cmdbuf);
 	}
 	while (strlen(cmdbuf) < 5) strcat(cmdbuf, " ");
 
@@ -645,7 +592,7 @@ void pop3_command_loop(void) {
 	else if (!strncasecmp(cmdbuf, "QUIT", 4)) {
 		cprintf("+OK Goodbye...\r\n");
 		pop3_update();
-		CC->kill_me = 1;
+		CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
 		return;
 	}
 
@@ -657,11 +604,6 @@ void pop3_command_loop(void) {
 		pop3_pass(&cmdbuf[5]);
 	}
 
-	else if (!strncasecmp(cmdbuf, "APOP", 4))
-	{
-		pop3_apop(&cmdbuf[5]);
-	}
-
 #ifdef HAVE_OPENSSL
 	else if (!strncasecmp(cmdbuf, "STLS", 4)) {
 		pop3_stls();
@@ -671,6 +613,11 @@ void pop3_command_loop(void) {
 	else if (!CC->logged_in) {
 		cprintf("-ERR Not logged in.\r\n");
 	}
+	
+	else if (CC->nologin) {
+		cprintf("-ERR System busy, try later.\r\n");
+		CC->kill_me = KILLME_NOLOGIN;
+	}
 
 	else if (!strncasecmp(cmdbuf, "LIST", 4)) {
 		pop3_list(&cmdbuf[5]);
@@ -716,22 +663,25 @@ const char *CitadelServicePop3S="POP3S";
 
 CTDL_MODULE_INIT(pop3)
 {
-	CtdlRegisterServiceHook(config.c_pop3_port,
-				NULL,
-				pop3_greeting,
-				pop3_command_loop,
-				NULL,
-				CitadelServicePop3);
+	if(!threading)
+	{
+		CtdlRegisterServiceHook(config.c_pop3_port,
+					NULL,
+					pop3_greeting,
+					pop3_command_loop,
+					NULL,
+					CitadelServicePop3);
 #ifdef HAVE_OPENSSL
-	CtdlRegisterServiceHook(config.c_pop3s_port,
-				NULL,
-				pop3s_greeting,
-				pop3_command_loop,
-				NULL,
-				CitadelServicePop3S);
+		CtdlRegisterServiceHook(config.c_pop3s_port,
+					NULL,
+					pop3s_greeting,
+					pop3_command_loop,
+					NULL,
+					CitadelServicePop3S);
 #endif
-	CtdlRegisterSessionHook(pop3_cleanup_function, EVT_STOP);
-
-	/* return our Subversion id for the Log */
-	return "$Id$";
+		CtdlRegisterSessionHook(pop3_cleanup_function, EVT_STOP, PRIO_STOP + 30);
+	}
+	
+	/* return our module name for the log */
+	return "pop3";
 }