X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsieve%2Fserv_sieve.c;h=30e03100759b8272827a7792facf871325be1b96;hb=dc48bee02071eb3eb2f535e203c36c528e1547a8;hp=ed69de8587f600d5cb00a265cc63d3085a7f9b32;hpb=60f03c2407f834ba677dfac9fe545db255ac8263;p=citadel.git

diff --git a/citadel/modules/sieve/serv_sieve.c b/citadel/modules/sieve/serv_sieve.c
index ed69de858..30e031007 100644
--- a/citadel/modules/sieve/serv_sieve.c
+++ b/citadel/modules/sieve/serv_sieve.c
@@ -2,7 +2,7 @@
  * This module glues libSieve to the Citadel server in order to implement
  * the Sieve mailbox filtering language (RFC 3028).
  *
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-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.
@@ -51,17 +51,6 @@
 
 struct RoomProcList *sieve_list = NULL;
 char *msiv_extensions = NULL;
-int SieveDebugEnable = 0;
-
-#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (SieveDebugEnable != 0))
-
-#define SV_syslog(LEVEL, FORMAT, ...)				\
-	DBGLOG(LEVEL) syslog(LEVEL,				\
-			     "Sieve: " FORMAT, __VA_ARGS__)
-
-#define SVM_syslog(LEVEL, FORMAT)		\
-	DBGLOG(LEVEL) syslog(LEVEL,		\
-			     "Sieve: " FORMAT);
 
 
 /*
@@ -69,7 +58,7 @@ int SieveDebugEnable = 0;
  */
 int ctdl_debug(sieve2_context_t *s, void *my)
 {
-	SV_syslog(LOG_DEBUG, "%s", sieve2_getvalue_string(s, "message"));
+	syslog(LOG_DEBUG, "%s", sieve2_getvalue_string(s, "message"));
 	return SIEVE2_OK;
 }
 
@@ -79,7 +68,7 @@ int ctdl_debug(sieve2_context_t *s, void *my)
  */
 int ctdl_errparse(sieve2_context_t *s, void *my)
 {
-	SV_syslog(LOG_WARNING, "Error in script, line %d: %s",
+	syslog(LOG_WARNING, "Error in script, line %d: %s",
 		  sieve2_getvalue_int(s, "lineno"),
 		  sieve2_getvalue_string(s, "message")
 	);
@@ -92,7 +81,7 @@ int ctdl_errparse(sieve2_context_t *s, void *my)
  */
 int ctdl_errexec(sieve2_context_t *s, void *my)
 {
-	SV_syslog(LOG_WARNING, "Error executing script: %s",
+	syslog(LOG_WARNING, "Error executing script: %s",
 		  sieve2_getvalue_string(s, "message")
 		);
 	return SIEVE2_OK;
@@ -111,22 +100,22 @@ int ctdl_redirect(sieve2_context_t *s, void *my)
 
 	safestrncpy(recp, sieve2_getvalue_string(s, "address"), sizeof recp);
 
-	SV_syslog(LOG_DEBUG, "Action is REDIRECT, recipient <%s>", recp);
+	syslog(LOG_DEBUG, "Action is REDIRECT, recipient <%s>", recp);
 
 	valid = validate_recipients(recp, NULL, 0);
 	if (valid == NULL) {
-		SV_syslog(LOG_WARNING, "REDIRECT failed: bad recipient <%s>", recp);
+		syslog(LOG_WARNING, "REDIRECT failed: bad recipient <%s>", recp);
 		return SIEVE2_ERROR_BADARGS;
 	}
 	if (valid->num_error > 0) {
-		SV_syslog(LOG_WARNING, "REDIRECT failed: bad recipient <%s>", recp);
+		syslog(LOG_WARNING, "REDIRECT failed: bad recipient <%s>", recp);
 		free_recipients(valid);
 		return SIEVE2_ERROR_BADARGS;
 	}
 
-	msg = CtdlFetchMessage(cs->msgnum, 1);
+	msg = CtdlFetchMessage(cs->msgnum, 1, 1);
 	if (msg == NULL) {
-		SV_syslog(LOG_WARNING, "REDIRECT failed: unable to fetch msg %ld", cs->msgnum);
+		syslog(LOG_WARNING, "REDIRECT failed: unable to fetch msg %ld", cs->msgnum);
 		free_recipients(valid);
 		return SIEVE2_ERROR_BADARGS;
 	}
@@ -146,7 +135,7 @@ int ctdl_keep(sieve2_context_t *s, void *my)
 {
 	struct ctdl_sieve *cs = (struct ctdl_sieve *)my;
 	
-	SVM_syslog(LOG_DEBUG, "Action is KEEP");
+	syslog(LOG_DEBUG, "Action is KEEP");
 
 	cs->keep = 1;
 	cs->cancel_implicit_keep = 1;
@@ -165,7 +154,7 @@ int ctdl_fileinto(sieve2_context_t *s, void *my)
 	char foldername[256];
 	char original_room_name[ROOMNAMELEN];
 
-	SV_syslog(LOG_DEBUG, "Action is FILEINTO, destination is <%s>", dest_folder);
+	syslog(LOG_DEBUG, "Action is FILEINTO, destination is <%s>", dest_folder);
 
 	/* FILEINTO 'INBOX' is the same thing as KEEP */
 	if ( (!strcasecmp(dest_folder, "INBOX")) || (!strcasecmp(dest_folder, MAILROOM)) ) {
@@ -188,7 +177,7 @@ int ctdl_fileinto(sieve2_context_t *s, void *my)
 	}
 
 	if (c != 0) {
-		SV_syslog(LOG_WARNING, "FILEINTO failed: target <%s> does not exist", dest_folder);
+		syslog(LOG_WARNING, "FILEINTO failed: target <%s> does not exist", dest_folder);
 		return SIEVE2_ERROR_BADARGS;
 	}
 
@@ -219,7 +208,7 @@ int ctdl_discard(sieve2_context_t *s, void *my)
 {
 	struct ctdl_sieve *cs = (struct ctdl_sieve *)my;
 
-	SVM_syslog(LOG_DEBUG, "Action is DISCARD");
+	syslog(LOG_DEBUG, "Action is DISCARD");
 
 	/* Cancel the implicit keep.  That's all there is to it. */
 	cs->cancel_implicit_keep = 1;
@@ -227,7 +216,6 @@ int ctdl_discard(sieve2_context_t *s, void *my)
 }
 
 
-
 /*
  * Callback function to indicate that a message should be rejected
  */
@@ -236,11 +224,11 @@ int ctdl_reject(sieve2_context_t *s, void *my)
 	struct ctdl_sieve *cs = (struct ctdl_sieve *)my;
 	char *reject_text = NULL;
 
-	SVM_syslog(LOG_DEBUG, "Action is REJECT");
+	syslog(LOG_DEBUG, "Action is REJECT");
 
 	/* If we don't know who sent the message, do a DISCARD instead. */
 	if (IsEmptyStr(cs->sender)) {
-		SVM_syslog(LOG_INFO, "Unknown sender.  Doing DISCARD instead of REJECT.");
+		syslog(LOG_INFO, "Unknown sender.  Doing DISCARD instead of REJECT.");
 		return ctdl_discard(s, my);
 	}
 
@@ -278,7 +266,6 @@ int ctdl_reject(sieve2_context_t *s, void *my)
 }
 
 
-
 /*
  * Callback function to indicate that a vacation message should be generated
  */
@@ -291,7 +278,7 @@ int ctdl_vacation(sieve2_context_t *s, void *my)
 	char *vacamsg_text = NULL;
 	char vacamsg_subject[1024];
 
-	SVM_syslog(LOG_DEBUG, "Action is VACATION");
+	syslog(LOG_DEBUG, "Action is VACATION");
 
 	message = sieve2_getvalue_string(s, "message");
 	if (message == NULL) return SIEVE2_ERROR_BADARGS;
@@ -311,7 +298,7 @@ int ctdl_vacation(sieve2_context_t *s, void *my)
 	for (vptr = cs->u->first_vacation; vptr != NULL; vptr = vptr->next) {
 		if (!strcasecmp(vptr->fromaddr, cs->sender)) {
 			if ( (time(NULL) - vptr->timestamp) < (days * 86400) ) {
-				SV_syslog(LOG_DEBUG, "Already alerted <%s> recently.", cs->sender);
+				syslog(LOG_DEBUG, "Already alerted <%s> recently.", cs->sender);
 				return SIEVE2_OK;
 			}
 		}
@@ -367,11 +354,11 @@ int ctdl_vacation(sieve2_context_t *s, void *my)
 }
 
 
+#if 0
 /*
  * Callback function to parse addresses per local system convention
  * It is disabled because we don't support subaddresses.
  */
-#if 0
 int ctdl_getsubaddress(sieve2_context_t *s, void *my)
 {
 	struct ctdl_sieve *cs = (struct ctdl_sieve *)my;
@@ -396,9 +383,9 @@ int ctdl_getenvelope(sieve2_context_t *s, void *my)
 {
 	struct ctdl_sieve *cs = (struct ctdl_sieve *)my;
 
-	SVM_syslog(LOG_DEBUG, "Action is GETENVELOPE");
-	SV_syslog(LOG_DEBUG, "EnvFrom: %s", cs->envelope_from);
-	SV_syslog(LOG_DEBUG, "EnvTo: %s", cs->envelope_to);
+	syslog(LOG_DEBUG, "Action is GETENVELOPE");
+	syslog(LOG_DEBUG, "EnvFrom: %s", cs->envelope_from);
+	syslog(LOG_DEBUG, "EnvTo: %s", cs->envelope_to);
 
 	if (cs->envelope_from != NULL) {
 		if ((cs->envelope_from[0] != '@')&&(cs->envelope_from[strlen(cs->envelope_from)-1] != '@')) {
@@ -429,16 +416,17 @@ int ctdl_getenvelope(sieve2_context_t *s, void *my)
 }
 
 
+#if 0
 /*
  * Callback function to fetch message body
  * (Uncomment the code if we implement this extension)
  *
+ */
 int ctdl_getbody(sieve2_context_t *s, void *my)
 {
 	return SIEVE2_ERROR_UNSUPPORTED;
 }
- *
- */
+#endif
 
 
 /*
@@ -469,12 +457,12 @@ char *get_active_script(struct sdm_userdata *u) {
 
 	for (sptr=u->first_script; sptr!=NULL; sptr=sptr->next) {
 		if (sptr->script_active > 0) {
-			SV_syslog(LOG_DEBUG, "get_active_script() is using script '%s'", sptr->script_name);
+			syslog(LOG_DEBUG, "get_active_script() is using script '%s'", sptr->script_name);
 			return(sptr->script_content);
 		}
 	}
 
-	SVM_syslog(LOG_DEBUG, "get_active_script() found no active script");
+	syslog(LOG_DEBUG, "get_active_script() found no active script");
 	return(NULL);
 }
 
@@ -494,6 +482,7 @@ int ctdl_getscript(sieve2_context_t *s, void *my) {
 	return SIEVE2_ERROR_GETSCRIPT;
 }
 
+
 /*
  * Callback function to retrieve message headers
  */
@@ -501,13 +490,12 @@ int ctdl_getheaders(sieve2_context_t *s, void *my) {
 
 	struct ctdl_sieve *cs = (struct ctdl_sieve *)my;
 
-	SVM_syslog(LOG_DEBUG, "ctdl_getheaders() was called");
+	syslog(LOG_DEBUG, "ctdl_getheaders() was called");
 	sieve2_setvalue_string(s, "allheaders", cs->rfc822headers);
 	return SIEVE2_OK;
 }
 
 
-
 /*
  * Add a room to the list of those rooms which potentially require sieve processing
  */
@@ -522,11 +510,10 @@ void sieve_queue_room(struct ctdlroom *which_room) {
 	ptr->next = sieve_list;
 	sieve_list = ptr;
 	end_critical_section(S_SIEVELIST);
-	SV_syslog(LOG_DEBUG, "<%s> queued for Sieve processing", which_room->QRname);
+	syslog(LOG_DEBUG, "<%s> queued for Sieve processing", which_room->QRname);
 }
 
 
-
 /*
  * Perform sieve processing for one message (called by sieve_do_room() for each message)
  */
@@ -540,20 +527,19 @@ void sieve_do_msg(long msgnum, void *userdata) {
 	size_t headers_len = 0;
 	int len = 0;
 
-	if (u == NULL)
-	{
-		SV_syslog(LOG_EMERG, "Can't process message <%ld> without userdata!", msgnum);
+	if (u == NULL) {
+		syslog(LOG_ERR, "Can't process message <%ld> without userdata!", msgnum);
 		return;
 	}
 
 	sieve2_context = u->sieve2_context;
 
-	SV_syslog(LOG_DEBUG, "Performing sieve processing on msg <%ld>", msgnum);
+	syslog(LOG_DEBUG, "Performing sieve processing on msg <%ld>", msgnum);
 
 	/*
 	 * Make sure you include message body so you can get those second-level headers ;)
 	 */
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 	if (msg == NULL) return;
 
 	/*
@@ -589,9 +575,6 @@ void sieve_do_msg(long msgnum, void *userdata) {
 	if (!CM_IsEmpty(msg, erFc822Addr)) {
 		safestrncpy(my.sender, msg->cm_fields[erFc822Addr], sizeof my.sender);
 	}
-	else if ( (!CM_IsEmpty(msg, eAuthor)) && (!CM_IsEmpty(msg, eNodeName)) ) {
-		snprintf(my.sender, sizeof my.sender, "%s@%s", msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]);
-	}
 	else if (!CM_IsEmpty(msg, eAuthor)) {
 		safestrncpy(my.sender, msg->cm_fields[eAuthor], sizeof my.sender);
 	}
@@ -626,7 +609,7 @@ void sieve_do_msg(long msgnum, void *userdata) {
 	}
 	if (haschar(my.envelope_from, '@') == 0) {
 		strcat(my.envelope_from, "@");
-		strcat(my.envelope_from, config.c_fqdn);
+		strcat(my.envelope_from, CtdlGetConfigStr("c_fqdn"));
 	}
 
 	/* Keep track of the envelope-to address (use body-to if not found) */
@@ -652,15 +635,15 @@ void sieve_do_msg(long msgnum, void *userdata) {
 	}
 	if (haschar(my.envelope_to, '@') == 0) {
 		strcat(my.envelope_to, "@");
-		strcat(my.envelope_to, config.c_fqdn);
+		strcat(my.envelope_to, CtdlGetConfigStr("c_fqdn"));
 	}
 
 	CM_Free(msg);
 	
-	SVM_syslog(LOG_DEBUG, "Calling sieve2_execute()");
+	syslog(LOG_DEBUG, "Calling sieve2_execute()");
 	res = sieve2_execute(sieve2_context, &my);
 	if (res != SIEVE2_OK) {
-		SV_syslog(LOG_CRIT, "sieve2_execute() returned %d: %s", res, sieve2_errstr(res));
+		syslog(LOG_ERR, "sieve2_execute() returned %d: %s", res, sieve2_errstr(res));
 	}
 
 	free(my.rfc822headers);
@@ -671,11 +654,11 @@ void sieve_do_msg(long msgnum, void *userdata) {
 	 * if no other action was successfully taken.
 	 */
 	if ( (!my.keep) && (my.cancel_implicit_keep) ) {
-		SVM_syslog(LOG_DEBUG, "keep is 0 -- deleting message from inbox");
+		syslog(LOG_DEBUG, "keep is 0 -- deleting message from inbox");
 		CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, "");
 	}
 
-	SV_syslog(LOG_DEBUG, "Completed sieve processing on msg <%ld>", msgnum);
+	syslog(LOG_DEBUG, "Completed sieve processing on msg <%ld>", msgnum);
 	u->lastproc = msgnum;
 
 	return;
@@ -749,7 +732,7 @@ void get_sieve_config_backend(long msgnum, void *userdata) {
 	long conflen;
 
 	u->config_msgnum = msgnum;
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 	if (msg == NULL) {
 		u->config_msgnum = (-1) ;
 		return;
@@ -885,7 +868,7 @@ void sieve_do_room(char *roomname) {
 	 */
 	snprintf(u.config_roomname, sizeof u.config_roomname, "%010ld.%s", atol(roomname), USERCONFIGROOM);
 	if (CtdlGetRoom(&CC->room, u.config_roomname) != 0) {
-		SV_syslog(LOG_DEBUG, "<%s> does not exist.  No processing is required.", u.config_roomname);
+		syslog(LOG_DEBUG, "<%s> does not exist.  No processing is required.", u.config_roomname);
 		return;
 	}
 
@@ -897,7 +880,7 @@ void sieve_do_room(char *roomname) {
 		get_sieve_config_backend, (void *)&u );
 
 	if (u.config_msgnum < 0) {
-		SVM_syslog(LOG_DEBUG, "No Sieve rules exist.  No processing is required.");
+		syslog(LOG_DEBUG, "No Sieve rules exist.  No processing is required.");
 		return;
 	}
 
@@ -909,14 +892,14 @@ void sieve_do_room(char *roomname) {
 		(get_active_script(&u) == NULL)
 		|| (strchr(get_active_script(&u), ';') == NULL)
 	) {
-		SVM_syslog(LOG_DEBUG, "Sieve script is empty.  No processing is required.");
+		syslog(LOG_DEBUG, "Sieve script is empty.  No processing is required.");
 		return;
 	}
 
-	SV_syslog(LOG_DEBUG, "Rules found.  Performing Sieve processing for <%s>", roomname);
+	syslog(LOG_DEBUG, "Rules found.  Performing Sieve processing for <%s>", roomname);
 
 	if (CtdlGetRoom(&CC->room, roomname) != 0) {
-		SV_syslog(LOG_CRIT, "ERROR: cannot load <%s>", roomname);
+		syslog(LOG_ERR, "ERROR: cannot load <%s>", roomname);
 		return;
 	}
 
@@ -924,13 +907,13 @@ void sieve_do_room(char *roomname) {
 	
 	res = sieve2_alloc(&sieve2_context);
 	if (res != SIEVE2_OK) {
-		SV_syslog(LOG_CRIT, "sieve2_alloc() returned %d: %s", res, sieve2_errstr(res));
+		syslog(LOG_ERR, "sieve2_alloc() returned %d: %s", res, sieve2_errstr(res));
 		return;
 	}
 
 	res = sieve2_callbacks(sieve2_context, ctdl_sieve_callbacks);
 	if (res != SIEVE2_OK) {
-		SV_syslog(LOG_CRIT, "sieve2_callbacks() returned %d: %s", res, sieve2_errstr(res));
+		syslog(LOG_ERR, "sieve2_callbacks() returned %d: %s", res, sieve2_errstr(res));
 		goto BAIL;
 	}
 
@@ -941,7 +924,7 @@ void sieve_do_room(char *roomname) {
 	my.u = &u;
 	res = sieve2_validate(sieve2_context, &my);
 	if (res != SIEVE2_OK) {
-		SV_syslog(LOG_CRIT, "sieve2_validate() returned %d: %s", res, sieve2_errstr(res));
+		syslog(LOG_ERR, "sieve2_validate() returned %d: %s", res, sieve2_errstr(res));
 		goto BAIL;
 	}
 
@@ -956,7 +939,7 @@ void sieve_do_room(char *roomname) {
 BAIL:
 	res = sieve2_free(&sieve2_context);
 	if (res != SIEVE2_OK) {
-		SV_syslog(LOG_CRIT, "sieve2_free() returned %d: %s", res, sieve2_errstr(res));
+		syslog(LOG_ERR, "sieve2_free() returned %d: %s", res, sieve2_errstr(res));
 	}
 
 	/* Rewrite the config if we have to */
@@ -971,7 +954,7 @@ void perform_sieve_processing(void) {
 	struct RoomProcList *ptr = NULL;
 
 	if (sieve_list != NULL) {
-		SVM_syslog(LOG_DEBUG, "Begin Sieve processing");
+		syslog(LOG_DEBUG, "Begin Sieve processing");
 		while (sieve_list != NULL) {
 			char spoolroomname[ROOMNAMELEN];
 			safestrncpy(spoolroomname, sieve_list->name, sizeof spoolroomname);
@@ -1185,7 +1168,7 @@ void cmd_msiv(char *argbuf) {
 		extract_token(script_name, argbuf, 1, '|', sizeof script_name);
 		if (!IsEmptyStr(script_name)) {
 			cprintf("%d Transmit script now\n", SEND_LISTING);
-			script_content = CtdlReadMessageBody(HKEY("000"), config.c_maxmsglen, NULL, 0, 0);
+			script_content = CtdlReadMessageBody(HKEY("000"), CtdlGetConfigLong("c_maxmsglen"), NULL, 0);
 			msiv_putscript(&u, script_name, script_content);
 			changes_made = 1;
 		}
@@ -1288,7 +1271,7 @@ void ctdl_sieve_init(void) {
 		strcpy(&cred[55], "...");
 	}
 
-	SV_syslog(LOG_INFO, "%s",cred);
+	syslog(LOG_INFO, "%s",cred);
 	free(cred);
 
 	/* Briefly initialize a Sieve parser instance just so we can list the
@@ -1296,26 +1279,27 @@ void ctdl_sieve_init(void) {
 	 */
 	res = sieve2_alloc(&sieve2_context);
 	if (res != SIEVE2_OK) {
-		SV_syslog(LOG_CRIT, "sieve2_alloc() returned %d: %s", res, sieve2_errstr(res));
+		syslog(LOG_ERR, "sieve2_alloc() returned %d: %s", res, sieve2_errstr(res));
 		return;
 	}
 
 	res = sieve2_callbacks(sieve2_context, ctdl_sieve_callbacks);
 	if (res != SIEVE2_OK) {
-		SV_syslog(LOG_CRIT, "sieve2_callbacks() returned %d: %s", res, sieve2_errstr(res));
+		syslog(LOG_ERR, "sieve2_callbacks() returned %d: %s", res, sieve2_errstr(res));
 		goto BAIL;
 	}
 
 	msiv_extensions = strdup(sieve2_listextensions(sieve2_context));
-	SV_syslog(LOG_INFO, "Extensions: %s", msiv_extensions);
+	syslog(LOG_INFO, "Extensions: %s", msiv_extensions);
 
 BAIL:	res = sieve2_free(&sieve2_context);
 	if (res != SIEVE2_OK) {
-		SV_syslog(LOG_CRIT, "sieve2_free() returned %d: %s", res, sieve2_errstr(res));
+		syslog(LOG_ERR, "sieve2_free() returned %d: %s", res, sieve2_errstr(res));
 	}
 
 }
 
+
 void cleanup_sieve(void)
 {
         struct RoomProcList *ptr, *ptr2;
@@ -1335,6 +1319,7 @@ void cleanup_sieve(void)
         end_critical_section(S_SIEVELIST);
 }
 
+
 int serv_sieve_room(struct ctdlroom *room)
 {
 	if (!strcasecmp(&room->QRname[11], MAILROOM)) {
@@ -1343,15 +1328,11 @@ int serv_sieve_room(struct ctdlroom *room)
 	return 0;
 }
 
-void LogSieveDebugEnable(const int n)
-{
-	SieveDebugEnable = n;
-}
+
 CTDL_MODULE_INIT(sieve)
 {
 	if (!threading)
 	{
-		CtdlRegisterDebugFlagHook(HKEY("sieve"), LogSieveDebugEnable, &SieveDebugEnable);
 		ctdl_sieve_init();
 		CtdlRegisterProtoHook(cmd_msiv, "MSIV", "Manage Sieve scripts");
 	        CtdlRegisterRoomHook(serv_sieve_room);
@@ -1362,4 +1343,3 @@ CTDL_MODULE_INIT(sieve)
         /* return our module name for the log */
 	return "sieve";
 }
-