From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 12 Nov 2015 14:24:51 +0000 (+0000)
Subject: Add 'allow_raw_input' option
X-Git-Tag: 1.1.0~577
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9accfd257320343df82d15a4ece578d71ec9a89f;p=thirdparty%2Frspamd.git

Add 'allow_raw_input' option
---

diff --git a/conf/options.inc b/conf/options.inc
index fb314d0cf2..798e658d6f 100644
--- a/conf/options.inc
+++ b/conf/options.inc
@@ -25,3 +25,5 @@ classify_headers = [
 control_socket = "$DBDIR/rspamd.sock mode=0600";
 history_rows = 200;
 explicit_modules = ["settings"];
+# Scan messages even if they are not MIME
+allow_raw_input = true;
diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h
index 9e11641752..7036fd5526 100644
--- a/src/libserver/cfg_file.h
+++ b/src/libserver/cfg_file.h
@@ -222,6 +222,7 @@ struct rspamd_config {
 	gboolean convert_config;                        /**< convert config to XML format						*/
 	gboolean strict_protocol_headers;               /**< strictly check protocol headers					*/
 	gboolean check_all_filters;                     /**< check all filters									*/
+	gboolean allow_raw_input;                       /**< scan messages with invalid mime					*/
 
 	gsize max_diff;                                 /**< maximum diff size for text parts					*/
 
diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 42830d7003..eec9c0fc69 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -1314,6 +1314,11 @@ rspamd_rcl_config_init (void)
 		rspamd_rcl_parse_struct_string_list,
 		G_STRUCT_OFFSET (struct rspamd_config, explicit_modules),
 		RSPAMD_CL_FLAG_STRING_LIST_HASH);
+	rspamd_rcl_add_default_handler (sub,
+		"allow_raw_input",
+		rspamd_rcl_parse_struct_boolean,
+		G_STRUCT_OFFSET (struct rspamd_config, allow_raw_input),
+		0);
 
 	/* New DNS configuration */
 	ssub = rspamd_rcl_add_section (&sub->subsections, "dns", NULL, NULL,
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 65317b9cdf..568efe934c 100644
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -183,6 +183,8 @@ rspamd_config_defaults (struct rspamd_config *cfg)
 			"$if_user{ user: $,}$if_smtp_from{ from: <$>,} (default: $is_spam "
 			"($action): [$scores] [$symbols]), len: $len, time: $time_real real,"
 			" $time_virtual virtual, dns req: $dns_req";
+	/* Allow non-mime input by default */
+	cfg->allow_raw_input = TRUE;
 }
 
 void