0.9.6claws27

[claws.git] / src / plugins / clamav / clamav_plugin.c

diff --git a/src/plugins/clamav/clamav_plugin.c b/src/plugins/clamav/clamav_plugin.c
index dab82228123f956a21c98c29fa8fbbb2d4b217aa..c67a2d6723d2f18a8d75783260ff75adc3d34d61 100644 (file)
--- a/src/plugins/clamav/clamav_plugin.c
+++ b/src/plugins/clamav/clamav_plugin.c
@@ -26,6 +26,8 @@
 #include <glib.h>
 #include <clamav.h>
 
+#include "common/sylpheed.h"
+#include "common/version.h"
 #include "intl.h"
 #include "plugin.h"
 #include "utils.h"
@@ -57,97 +59,82 @@ static PrefParam param[] = {
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
+struct scan_parameters {
+       gboolean is_infected;
+
+       struct cl_node *root;
+       struct cl_limits limits;
+       gboolean scan_archive;
+};
+
+static gboolean scan_func(GNode *node, gpointer data)
+{
+       struct scan_parameters *params = (struct scan_parameters *) data;
+       MimeInfo *mimeinfo = (MimeInfo *) node->data;
+       gchar *outfile;
+       int ret;
+       unsigned long int size;
+       char *virname;
+
+       outfile = procmime_get_tmp_file_name(mimeinfo);
+       if (procmime_get_part(outfile, mimeinfo) < 0)
+               g_warning("Can't get the part of multipart message.");
+       else {
+               debug_print("Scanning %s\n", outfile);
+               if ((ret = cl_scanfile(outfile, &virname, &size, params->root, 
+                                     &params->limits, params->scan_archive)) == CL_VIRUS) {
+                       params->is_infected = TRUE;
+                       debug_print("Detected %s virus.\n", virname); 
+               } else {
+                       debug_print("No virus detected.\n");
+                       if (ret != CL_CLEAN)
+                               debug_print("Error: %s\n", cl_perror(ret));
+               }
+
+               unlink(outfile);
+       }
+
+       return params->is_infected;
+}
+
 static gboolean mail_filtering_hook(gpointer source, gpointer data)
 {
        MailFilteringData *mail_filtering_data = (MailFilteringData *) source;
        MsgInfo *msginfo = mail_filtering_data->msginfo;
-       gboolean is_infected = FALSE;
-       FILE  *fp;
        MimeInfo *mimeinfo;
-       MimeInfo *child;
-       gchar *infile;
-       gchar *outfile;
-       gint scan_archive = 0;
 
        int ret, no;
-       unsigned long int size;
-       char *virname;
-       struct cl_node *root = NULL;
-       struct cl_limits limits;
+       struct scan_parameters params;
 
        if (!config.clamav_enable)
                return FALSE;
 
-       fp = procmsg_open_message(msginfo);
-       if (fp == NULL) {
-               debug_print("failed to open message file");
-       } 
-       
        mimeinfo = procmime_scan_message(msginfo);
        if (!mimeinfo) return FALSE;
 
-       child = mimeinfo->children;
-       if (!child) {
-               procmime_mimeinfo_free_all(mimeinfo);
-               return FALSE;
-       }
-
        debug_print("Scanning message %d for viruses\n", msginfo->msgnum);
 
-       infile = procmsg_get_message_file_path(msginfo);
+       params.is_infected = FALSE;
+       params.root = NULL;
 
+       params.limits.maxfiles = 1000; /* max files */
+       params.limits.maxfilesize = config.clamav_max_size * 1048576; /* maximum archived file size */
+       params.limits.maxreclevel = 8; /* maximum recursion level */
 
-       if((ret = cl_loaddbdir(cl_retdbdir(), &root, &no))) {
+       if (config.clamav_enable_arc)
+               params.scan_archive = TRUE;
+
+       if((ret = cl_loaddbdir(cl_retdbdir(), &params.root, &no))) {
                debug_print("cl_loaddbdir: %s\n", cl_perror(ret));
                exit(2);
        }
+       debug_print("Database loaded (containing in total %d signatures)\n", no);
 
-       debug_print("Loaded %d viruses.\n", no);
-
-       cl_buildtrie(root);
+       cl_buildtrie(params.root);
 
-       limits.maxfiles = 1000; /* max files */
-       limits.maxfilesize = config.clamav_max_size * 1048576; /* maximum archived file size */
-       limits.maxreclevel = 8; /* maximum recursion level */
-
-       if (config.clamav_enable_arc)
-               scan_archive = TRUE;
-
-       while (child != NULL) {
-               if (child->children || child->mime_type == MIME_MULTIPART) {
-                       child = procmime_mimeinfo_next(child);
-                       continue;
-               }
-               if(child->parent && child->parent->parent
-               && !strcasecmp(child->parent->parent->content_type, "multipart/signed")
-               && child->mime_type == MIME_TEXT) {
-                       /* this is the main text part of a signed message */
-                       child = procmime_mimeinfo_next(child);
-                       continue;
-               }
-               outfile = procmime_get_tmp_file_name(child);
-               if (procmime_get_part(outfile, infile, child) < 0)
-                       g_warning("Can't get the part of multipart message.");
-               else {
-                       debug_print("Scanning %s\n", outfile);
-                       if ((ret = cl_scanfile(outfile, &virname, &size, root, 
-                                             &limits, scan_archive)) == CL_VIRUS) {
-                               is_infected = TRUE;
-                               debug_print("Detected %s virus.\n", virname); 
-                       } else {
-                               debug_print("No virus detected.\n");
-                               if (ret != CL_CLEAN)
-                                       debug_print("Error: %s\n", cl_perror(ret));
-                       }
-
-                       unlink(outfile);
-
-                       if (is_infected) break;
-                       child = child->next;
-               }
-       }
+       g_node_traverse(mimeinfo->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1, scan_func, &params);
 
-       if (is_infected) {
+       if (params.is_infected) {
                if (config.clamav_recv_infected) {
                        FolderItem *clamav_save_folder;
 
@@ -163,11 +150,10 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
                }
        }
        
-       cl_freetrie(root);
-       g_free(infile);
+       cl_freetrie(params.root);
        procmime_mimeinfo_free_all(mimeinfo);
        
-       return is_infected;
+       return params.is_infected;
 }
 
 ClamAvConfig *clamav_get_config(void)
@@ -200,6 +186,16 @@ void clamav_save_config(void)
 
 gint plugin_init(gchar **error)
 {
+       if ((sylpheed_get_version() > VERSION_NUMERIC)) {
+               *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with");
+               return -1;
+       }
+
+       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+               *error = g_strdup("Your sylpheed version is too old");
+               return -1;
+       }
+
        hook_id = hooks_register_hook(MAIL_FILTERING_HOOKLIST, mail_filtering_hook, NULL);
        if (hook_id == -1) {
                *error = g_strdup("Failed to register mail filtering hook");