more places to fix the new linebreak behaviour of the base64 encoder.

[citadel.git] / citadel / modules / dspam / serv_dspam.c

diff --git a/citadel/modules/dspam/serv_dspam.c b/citadel/modules/dspam/serv_dspam.c
index 0c3cefee5400ead4153f5b7084b5c04b67fc9716..7454634f780cd040d428ae9e9543fa9da0d41aa7 100644 (file)
--- a/citadel/modules/dspam/serv_dspam.c
+++ b/citadel/modules/dspam/serv_dspam.c
@@ -1,10 +1,22 @@
 /*
- * $Id: serv_dspam.c 5876 2007-12-10 23:22:03Z dothebart $
- *
  * This module glues libDSpam to the Citadel server in order to implement
  * DSPAM Spamchecking 
  *
- * This code is released under the terms of the GNU General Public License. 
+ * Copyright (c) 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.
+ *
+ *  
+ *  
+ *  
  */
 
 #include "sysdep.h"
@@ -37,8 +49,6 @@
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "room_ops.h"
-#include "policy.h"
 #include "database.h"
 #include "msgbase.h"
 #include "internet_addressing.h"
@@ -48,10 +58,13 @@
 
 
 #ifdef HAVE_LIBDSPAM
+#define CONFIG_DEFAULT file_dpsam_conf
+#define LOGDIR file_dspam_log
 
-#undef HAVE_CONFIG_H
+
+//#define HAVE_CONFIG_H
 #include <dspam/libdspam.h>
-#define HAVE_CONFIG_H
+//#define HAVE_CONFIG_H
 
 typedef struct stringlist stringlist;
 
@@ -133,7 +146,7 @@ void dspam_do_msg(long msgnum, void *userdata)
        CC->redirect_buffer = malloc(SIZ);
        CC->redirect_len = 0;
        CC->redirect_alloc = SIZ;
-       CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1);
+       CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1, 0);
        msgtext = CC->redirect_buffer;
 // don't need? msglen = CC->redirect_len;
        CC->redirect_buffer = NULL;
@@ -144,26 +157,29 @@ void dspam_do_msg(long msgnum, void *userdata)
        if (dspam_process (CTX, msgtext) != 0)
        {
                free(msgtext);
-               CtdlLogPrintf(CTDL_CRIT, "ERROR: dspam_process failed");
+               syslog(LOG_CRIT, "ERROR: dspam_process failed");
                return;
        }
        if (CTX->signature == NULL)
        {
-               CtdlLogPrintf(CTDL_CRIT,"No signature provided\n");
+               syslog(LOG_CRIT,"No signature provided\n");
        }
        else
        {
 /* Copy to a safe place */
+               // TODO: len -> cm_fields?
+               msg->cm_fields[eErrorMsg] = malloc (CTX->signature->length * 2);
+               size_t len = CtdlEncodeBase64(msg->cm_fields[eErrorMsg], CTX->signature->data, CTX->signature->length, 0);
 
-               SIG.data = malloc (CTX->signature->length);
-               if (SIG.data != NULL)
-                       memcpy (SIG.data, CTX->signature->data, CTX->signature->length);
+               if (msg->cm_fields[eErrorMsg][len - 1] == '\n') {
+                       msg->cm_fields[eErrorMsg][len - 1] = '\0';
+               }
        }
        free(msgtext);
 
        SIG.length = CTX->signature->length;
        /* Print processing results */
-       CtdlLogPrintf (CTDL_DEBUG, "Probability: %2.4f Confidence: %2.4f, Result: %s\n",
+       syslog(LOG_DEBUG, "Probability: %2.4f Confidence: %2.4f, Result: %s\n",
                CTX->probability,
                CTX->confidence,
                (CTX->result == DSR_ISSPAM) ? "Spam" : "Innocent");
@@ -184,22 +200,25 @@ int serv_dspam_room(struct ctdlroom *room)
 // dspam_init (cc->username, NULL, ctdl_dspam_home, DSM_PROCESS,
        //                  DSF_SIGNATURE | DSF_NOISE);
        /// todo: if roomname = spam / ham -> learn!
-       if (room->QRflags & QR_PRIVATE) /* Are we sending to a private mailbox? */
+       if ((room->QRflags & QR_PRIVATE) &&/* Are we sending to a private mailbox? */
+           (strstr(room->QRname, ".Mail")!=NULL))
+
        {
                char User[64];
                // maybe we should better get our realname here?
                snprintf(User, 64, "%ld", room->QRroomaide);
-
+               extract_token(User, room->QRname, 0, '.', sizeof(User));
                CTX = dspam_init(User, 
                                 NULL,
                                 ctdl_dspam_dir, 
                                 DSM_PROCESS, 
                                 DSF_SIGNATURE | DSF_NOISE);
        }
+       else return 0;//// 
        /// else -> todo: global user for public rooms etc.
        if (CTX == NULL)
        {
-               CtdlLogPrintf(CTDL_CRIT, "ERROR: dspam_init failed!\n");
+               syslog(LOG_CRIT, "ERROR: dspam_init failed!\n");
                return ERROR + INTERNAL_ERROR;
        }
        /* Use graham and robinson algorithms, graham's p-values */
@@ -223,7 +242,7 @@ void serv_dspam_shutdown (void)
 
 CTDL_MODULE_INIT(dspam)
 {
-       return "$Id: serv_dspam.c 5876 2007-12-10 23:22:03Z dothebart $" "disabled.";
+       return "disabled.";
        if (!threading)
        {
 #ifdef HAVE_LIBDSPAM
@@ -238,12 +257,12 @@ CTDL_MODULE_INIT(dspam)
 
 #else  /* HAVE_LIBDSPAM */
 
-               CtdlLogPrintf(CTDL_INFO, "This server is missing libdspam Spam filtering will be disabled.\n");
+               syslog(LOG_INFO, "This server is missing libdspam Spam filtering will be disabled.\n");
 
 #endif /* HAVE_LIBDSPAM */
        }
        
-        /* return our Subversion id for the Log */
-       return "$Id: serv_dspam.c 5876 2007-12-10 23:22:03Z dothebart $";
+        /* return our module name for the log */
+       return "dspam";
 }