Add max_word_len and words_decay options

diff --git a/conf/options.inc b/conf/options.inc
index 798e658d6fc1f935ed152416ad000cfc286a6b7b..29e737712cb14ce8f5ca87b119cd49c9f830fb26 100644 (file)
--- a/conf/options.inc
+++ b/conf/options.inc
@@ -25,5 +25,10 @@ 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;
+
+# Start ignore words when reaching the following limit, so the total
+# amount of words processed will not be *LIKELY more than the twice of that limit
+words_decay = 200;

diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h
index 06e8372a019a900cade0a92423d4e87ae031291b..6e87acafe3e74bd13e114f9a6c7212c5cc56e658 100644 (file)
--- a/src/libserver/cfg_file.h
+++ b/src/libserver/cfg_file.h
@@ -307,7 +307,9 @@ struct rspamd_config {
        gdouble upstream_error_time;                                    /**< rate of upstream errors                                                    */
        gdouble upstream_revive_time;                                   /**< revive timeout for upstreams                                               */
 
-       guint32 min_word_len;                                                   /**< minimum length of the word to be considered                */
+       guint min_word_len;                                                             /**< minimum length of the word to be considered                */
+       guint max_word_len;                                                             /**< maximum length of the word to be considered                */
+       guint words_decay;                                                              /**< limit for words for starting adaptive ignoring             */
        guint history_rows;                                                             /**< number of history rows stored                                              */
 
        GList *classify_headers;                                                /**< list of headers using for statistics                               */

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index eec9c0fc6999476fa12cb312f616f161c47e9668..dc74ece310dd6ab711ec8eb7cae5c87af77520af 100644 (file)
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -1210,35 +1210,35 @@ rspamd_rcl_config_init (void)
                        TRUE);
        /* Default handlers */
        rspamd_rcl_add_default_handler (sub,
-               "log_buffer",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_config, log_buf_size),
-               0);
+                       "log_buffer",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_config, log_buf_size),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "log_urls",
-               rspamd_rcl_parse_struct_boolean,
-               G_STRUCT_OFFSET (struct rspamd_config, log_urls),
-               0);
+                       "log_urls",
+                       rspamd_rcl_parse_struct_boolean,
+                       G_STRUCT_OFFSET (struct rspamd_config, log_urls),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "debug_ip",
-               rspamd_rcl_parse_struct_string,
-               G_STRUCT_OFFSET (struct rspamd_config, debug_ip_map),
-               0);
+                       "debug_ip",
+                       rspamd_rcl_parse_struct_string,
+                       G_STRUCT_OFFSET (struct rspamd_config, debug_ip_map),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "debug_symbols",
-               rspamd_rcl_parse_struct_string_list,
-               G_STRUCT_OFFSET (struct rspamd_config, debug_symbols),
-               0);
+                       "debug_symbols",
+                       rspamd_rcl_parse_struct_string_list,
+                       G_STRUCT_OFFSET (struct rspamd_config, debug_symbols),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "log_color",
-               rspamd_rcl_parse_struct_boolean,
-               G_STRUCT_OFFSET (struct rspamd_config, log_color),
-               0);
+                       "log_color",
+                       rspamd_rcl_parse_struct_boolean,
+                       G_STRUCT_OFFSET (struct rspamd_config, log_color),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "color",
-               rspamd_rcl_parse_struct_boolean,
-               G_STRUCT_OFFSET (struct rspamd_config, log_color),
-               0);
+                       "color",
+                       rspamd_rcl_parse_struct_boolean,
+                       G_STRUCT_OFFSET (struct rspamd_config, log_color),
+                       0);
        rspamd_rcl_add_default_handler (sub,
                        "log_systemd",
                        rspamd_rcl_parse_struct_boolean,
@@ -1269,204 +1269,213 @@ rspamd_rcl_config_init (void)
                        FALSE,
                        TRUE);
        rspamd_rcl_add_default_handler (sub,
-               "cache_file",
-               rspamd_rcl_parse_struct_string,
-               G_STRUCT_OFFSET (struct rspamd_config, cache_filename),
-               RSPAMD_CL_FLAG_STRING_PATH);
+                       "cache_file",
+                       rspamd_rcl_parse_struct_string,
+                       G_STRUCT_OFFSET (struct rspamd_config, cache_filename),
+                       RSPAMD_CL_FLAG_STRING_PATH);
        /* Old DNS configuration */
        rspamd_rcl_add_default_handler (sub,
-               "dns_nameserver",
-               rspamd_rcl_parse_struct_string_list,
-               G_STRUCT_OFFSET (struct rspamd_config, nameservers),
-               0);
+                       "dns_nameserver",
+                       rspamd_rcl_parse_struct_string_list,
+                       G_STRUCT_OFFSET (struct rspamd_config, nameservers),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "dns_timeout",
-               rspamd_rcl_parse_struct_time,
-               G_STRUCT_OFFSET (struct rspamd_config, dns_timeout),
-               RSPAMD_CL_FLAG_TIME_FLOAT);
+                       "dns_timeout",
+                       rspamd_rcl_parse_struct_time,
+                       G_STRUCT_OFFSET (struct rspamd_config, dns_timeout),
+                       RSPAMD_CL_FLAG_TIME_FLOAT);
        rspamd_rcl_add_default_handler (sub,
-               "dns_retransmits",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_config, dns_retransmits),
-               RSPAMD_CL_FLAG_INT_32);
+                       "dns_retransmits",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_config, dns_retransmits),
+                       RSPAMD_CL_FLAG_INT_32);
        rspamd_rcl_add_default_handler (sub,
-               "dns_sockets",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_config, dns_io_per_server),
-               RSPAMD_CL_FLAG_INT_32);
+                       "dns_sockets",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_config, dns_io_per_server),
+                       RSPAMD_CL_FLAG_INT_32);
        rspamd_rcl_add_default_handler (sub,
-               "dns_max_requests",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_config, dns_max_requests),
-               RSPAMD_CL_FLAG_INT_32);
+                       "dns_max_requests",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_config, dns_max_requests),
+                       RSPAMD_CL_FLAG_INT_32);
        rspamd_rcl_add_default_handler (sub,
-               "classify_headers",
-               rspamd_rcl_parse_struct_string_list,
-               G_STRUCT_OFFSET (struct rspamd_config, classify_headers),
-               0);
+                       "classify_headers",
+                       rspamd_rcl_parse_struct_string_list,
+                       G_STRUCT_OFFSET (struct rspamd_config, classify_headers),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "control_socket",
-               rspamd_rcl_parse_struct_string,
-               G_STRUCT_OFFSET (struct rspamd_config, control_socket_path),
-               0);
+                       "control_socket",
+                       rspamd_rcl_parse_struct_string,
+                       G_STRUCT_OFFSET (struct rspamd_config, control_socket_path),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "explicit_modules",
-               rspamd_rcl_parse_struct_string_list,
-               G_STRUCT_OFFSET (struct rspamd_config, explicit_modules),
-               RSPAMD_CL_FLAG_STRING_LIST_HASH);
+                       "explicit_modules",
+                       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,
-                       UCL_OBJECT, FALSE, TRUE);
-       rspamd_rcl_add_default_handler (ssub,
-               "nameserver",
-               rspamd_rcl_parse_struct_string_list,
-               G_STRUCT_OFFSET (struct rspamd_config, nameservers),
-               0);
-       rspamd_rcl_add_default_handler (ssub,
-               "server",
-               rspamd_rcl_parse_struct_string_list,
-               G_STRUCT_OFFSET (struct rspamd_config, nameservers),
-               0);
-       rspamd_rcl_add_default_handler (ssub,
-               "timeout",
-               rspamd_rcl_parse_struct_time,
-               G_STRUCT_OFFSET (struct rspamd_config, dns_timeout),
-               RSPAMD_CL_FLAG_TIME_FLOAT);
-       rspamd_rcl_add_default_handler (ssub,
-               "retransmits",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_config, dns_retransmits),
-               RSPAMD_CL_FLAG_INT_32);
-       rspamd_rcl_add_default_handler (ssub,
-               "sockets",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_config, dns_io_per_server),
-               RSPAMD_CL_FLAG_INT_32);
-       rspamd_rcl_add_default_handler (ssub,
-               "connections",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_config, dns_io_per_server),
-               RSPAMD_CL_FLAG_INT_32);
-
-
-       /* New upstreams configuration */
-       ssub = rspamd_rcl_add_section (&sub->subsections, "upstream", NULL, NULL,
-               UCL_OBJECT, FALSE, TRUE);
-       rspamd_rcl_add_default_handler (ssub,
-               "max_errors",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_config, upstream_max_errors),
-               RSPAMD_CL_FLAG_UINT);
-       rspamd_rcl_add_default_handler (ssub,
-               "error_time",
-               rspamd_rcl_parse_struct_time,
-               G_STRUCT_OFFSET (struct rspamd_config, upstream_error_time),
-               RSPAMD_CL_FLAG_TIME_FLOAT);
-       rspamd_rcl_add_default_handler (ssub,
-               "revive_time",
-               rspamd_rcl_parse_struct_time,
-               G_STRUCT_OFFSET (struct rspamd_config, upstream_revive_time),
-               RSPAMD_CL_FLAG_TIME_FLOAT);
-
+                       "allow_raw_input",
+                       rspamd_rcl_parse_struct_boolean,
+                       G_STRUCT_OFFSET (struct rspamd_config, allow_raw_input),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "raw_mode",
-               rspamd_rcl_parse_struct_boolean,
-               G_STRUCT_OFFSET (struct rspamd_config, raw_mode),
-               0);
+                       "raw_mode",
+                       rspamd_rcl_parse_struct_boolean,
+                       G_STRUCT_OFFSET (struct rspamd_config, raw_mode),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "one_shot",
-               rspamd_rcl_parse_struct_boolean,
-               G_STRUCT_OFFSET (struct rspamd_config, one_shot_mode),
-               0);
+                       "one_shot",
+                       rspamd_rcl_parse_struct_boolean,
+                       G_STRUCT_OFFSET (struct rspamd_config, one_shot_mode),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "check_attachements",
-               rspamd_rcl_parse_struct_boolean,
-               G_STRUCT_OFFSET (struct rspamd_config, check_text_attachements),
-               0);
+                       "check_attachements",
+                       rspamd_rcl_parse_struct_boolean,
+                       G_STRUCT_OFFSET (struct rspamd_config, check_text_attachements),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "tempdir",
-               rspamd_rcl_parse_struct_string,
-               G_STRUCT_OFFSET (struct rspamd_config, temp_dir),
-               RSPAMD_CL_FLAG_STRING_PATH);
+                       "tempdir",
+                       rspamd_rcl_parse_struct_string,
+                       G_STRUCT_OFFSET (struct rspamd_config, temp_dir),
+                       RSPAMD_CL_FLAG_STRING_PATH);
        rspamd_rcl_add_default_handler (sub,
-               "pidfile",
-               rspamd_rcl_parse_struct_string,
-               G_STRUCT_OFFSET (struct rspamd_config, pid_file),
-               RSPAMD_CL_FLAG_STRING_PATH);
+                       "pidfile",
+                       rspamd_rcl_parse_struct_string,
+                       G_STRUCT_OFFSET (struct rspamd_config, pid_file),
+                       RSPAMD_CL_FLAG_STRING_PATH);
        rspamd_rcl_add_default_handler (sub,
-               "filters",
-               rspamd_rcl_parse_struct_string_list,
-               G_STRUCT_OFFSET (struct rspamd_config, filters),
-               0);
+                       "filters",
+                       rspamd_rcl_parse_struct_string_list,
+                       G_STRUCT_OFFSET (struct rspamd_config, filters),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "max_diff",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_config, max_diff),
-               RSPAMD_CL_FLAG_INT_SIZE);
+                       "max_diff",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_config, max_diff),
+                       RSPAMD_CL_FLAG_INT_SIZE);
        rspamd_rcl_add_default_handler (sub,
-               "map_watch_interval",
-               rspamd_rcl_parse_struct_time,
-               G_STRUCT_OFFSET (struct rspamd_config, map_timeout),
-               RSPAMD_CL_FLAG_TIME_FLOAT);
+                       "map_watch_interval",
+                       rspamd_rcl_parse_struct_time,
+                       G_STRUCT_OFFSET (struct rspamd_config, map_timeout),
+                       RSPAMD_CL_FLAG_TIME_FLOAT);
        rspamd_rcl_add_default_handler (sub,
-               "dynamic_conf",
-               rspamd_rcl_parse_struct_string,
-               G_STRUCT_OFFSET (struct rspamd_config, dynamic_conf),
-               0);
+                       "dynamic_conf",
+                       rspamd_rcl_parse_struct_string,
+                       G_STRUCT_OFFSET (struct rspamd_config, dynamic_conf),
+                       0);
        rspamd_rcl_add_default_handler (sub, "rrd", rspamd_rcl_parse_struct_string,
-               G_STRUCT_OFFSET (struct rspamd_config,
-               rrd_file), RSPAMD_CL_FLAG_STRING_PATH);
+                       G_STRUCT_OFFSET (struct rspamd_config,
+                                       rrd_file), RSPAMD_CL_FLAG_STRING_PATH);
+       rspamd_rcl_add_default_handler (sub,
+                       "history_file",
+                       rspamd_rcl_parse_struct_string,
+                       G_STRUCT_OFFSET (struct rspamd_config, history_file),
+                       RSPAMD_CL_FLAG_STRING_PATH);
        rspamd_rcl_add_default_handler (sub,
-               "history_file",
-               rspamd_rcl_parse_struct_string,
-               G_STRUCT_OFFSET (struct rspamd_config, history_file),
-               RSPAMD_CL_FLAG_STRING_PATH);
+                       "use_mlock",
+                       rspamd_rcl_parse_struct_boolean,
+                       G_STRUCT_OFFSET (struct rspamd_config, mlock_statfile_pool),
+                       0);
+       rspamd_rcl_add_default_handler (sub,
+                       "strict_protocol_headers",
+                       rspamd_rcl_parse_struct_boolean,
+                       G_STRUCT_OFFSET (struct rspamd_config, strict_protocol_headers),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "use_mlock",
-               rspamd_rcl_parse_struct_boolean,
-               G_STRUCT_OFFSET (struct rspamd_config, mlock_statfile_pool),
-               0);
+                       "check_all_filters",
+                       rspamd_rcl_parse_struct_boolean,
+                       G_STRUCT_OFFSET (struct rspamd_config, check_all_filters),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "strict_protocol_headers",
-               rspamd_rcl_parse_struct_boolean,
-               G_STRUCT_OFFSET (struct rspamd_config, strict_protocol_headers),
-               0);
+                       "all_filters",
+                       rspamd_rcl_parse_struct_boolean,
+                       G_STRUCT_OFFSET (struct rspamd_config, check_all_filters),
+                       0);
        rspamd_rcl_add_default_handler (sub,
-               "check_all_filters",
-               rspamd_rcl_parse_struct_boolean,
-               G_STRUCT_OFFSET (struct rspamd_config, check_all_filters),
-               0);
+                       "min_word_len",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_config, min_word_len),
+                       RSPAMD_CL_FLAG_UINT);
        rspamd_rcl_add_default_handler (sub,
-               "all_filters",
-               rspamd_rcl_parse_struct_boolean,
-               G_STRUCT_OFFSET (struct rspamd_config, check_all_filters),
-               0);
+                       "max_word_len",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_config, max_word_len),
+                       RSPAMD_CL_FLAG_UINT);
        rspamd_rcl_add_default_handler (sub,
-               "min_word_len",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_config, min_word_len),
-               RSPAMD_CL_FLAG_INT_32);
+                       "words_decay",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_config, words_decay),
+                       RSPAMD_CL_FLAG_UINT);
        rspamd_rcl_add_default_handler (sub,
-               "url_tld",
-               rspamd_rcl_parse_struct_string,
-               G_STRUCT_OFFSET (struct rspamd_config, tld_file),
-               RSPAMD_CL_FLAG_STRING_PATH);
+                       "url_tld",
+                       rspamd_rcl_parse_struct_string,
+                       G_STRUCT_OFFSET (struct rspamd_config, tld_file),
+                       RSPAMD_CL_FLAG_STRING_PATH);
        rspamd_rcl_add_default_handler (sub,
-               "tld",
-               rspamd_rcl_parse_struct_string,
-               G_STRUCT_OFFSET (struct rspamd_config, tld_file),
-               RSPAMD_CL_FLAG_STRING_PATH);
+                       "tld",
+                       rspamd_rcl_parse_struct_string,
+                       G_STRUCT_OFFSET (struct rspamd_config, tld_file),
+                       RSPAMD_CL_FLAG_STRING_PATH);
        rspamd_rcl_add_default_handler (sub,
-               "history_rows",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_config, history_rows),
-               RSPAMD_CL_FLAG_UINT);
+                       "history_rows",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_config, history_rows),
+                       RSPAMD_CL_FLAG_UINT);
+
+       /* New DNS configuration */
+       ssub = rspamd_rcl_add_section (&sub->subsections, "dns", NULL, NULL,
+                       UCL_OBJECT, FALSE, TRUE);
+       rspamd_rcl_add_default_handler (ssub,
+                       "nameserver",
+                       rspamd_rcl_parse_struct_string_list,
+                       G_STRUCT_OFFSET (struct rspamd_config, nameservers),
+                       0);
+       rspamd_rcl_add_default_handler (ssub,
+                       "server",
+                       rspamd_rcl_parse_struct_string_list,
+                       G_STRUCT_OFFSET (struct rspamd_config, nameservers),
+                       0);
+       rspamd_rcl_add_default_handler (ssub,
+                       "timeout",
+                       rspamd_rcl_parse_struct_time,
+                       G_STRUCT_OFFSET (struct rspamd_config, dns_timeout),
+                       RSPAMD_CL_FLAG_TIME_FLOAT);
+       rspamd_rcl_add_default_handler (ssub,
+                       "retransmits",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_config, dns_retransmits),
+                       RSPAMD_CL_FLAG_INT_32);
+       rspamd_rcl_add_default_handler (ssub,
+                       "sockets",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_config, dns_io_per_server),
+                       RSPAMD_CL_FLAG_INT_32);
+       rspamd_rcl_add_default_handler (ssub,
+                       "connections",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_config, dns_io_per_server),
+                       RSPAMD_CL_FLAG_INT_32);
+
+
+       /* New upstreams configuration */
+       ssub = rspamd_rcl_add_section (&sub->subsections, "upstream", NULL, NULL,
+                       UCL_OBJECT, FALSE, TRUE);
+       rspamd_rcl_add_default_handler (ssub,
+                       "max_errors",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_config, upstream_max_errors),
+                       RSPAMD_CL_FLAG_UINT);
+       rspamd_rcl_add_default_handler (ssub,
+                       "error_time",
+                       rspamd_rcl_parse_struct_time,
+                       G_STRUCT_OFFSET (struct rspamd_config, upstream_error_time),
+                       RSPAMD_CL_FLAG_TIME_FLOAT);
+       rspamd_rcl_add_default_handler (ssub,
+                       "revive_time",
+                       rspamd_rcl_parse_struct_time,
+                       G_STRUCT_OFFSET (struct rspamd_config, upstream_revive_time),
+                       RSPAMD_CL_FLAG_TIME_FLOAT);
 
        /**
         * Metric section
@@ -1591,20 +1600,20 @@ rspamd_rcl_config_init (void)
                        FALSE,
                        TRUE);
        rspamd_rcl_add_default_handler (sub,
-               "count",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_worker_conf, count),
-               RSPAMD_CL_FLAG_INT_16);
+                       "count",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_worker_conf, count),
+                       RSPAMD_CL_FLAG_INT_16);
        rspamd_rcl_add_default_handler (sub,
-               "max_files",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_worker_conf, rlimit_nofile),
-               RSPAMD_CL_FLAG_INT_32);
+                       "max_files",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_worker_conf, rlimit_nofile),
+                       RSPAMD_CL_FLAG_INT_32);
        rspamd_rcl_add_default_handler (sub,
-               "max_core",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_worker_conf, rlimit_maxcore),
-               RSPAMD_CL_FLAG_INT_32);
+                       "max_core",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_worker_conf, rlimit_maxcore),
+                       RSPAMD_CL_FLAG_INT_32);
 
        /**
         * Modules handler
@@ -1629,40 +1638,40 @@ rspamd_rcl_config_init (void)
        sub->default_key = "bayes";
 
        rspamd_rcl_add_default_handler (sub,
-               "min_tokens",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_classifier_config, min_tokens),
-               RSPAMD_CL_FLAG_INT_32);
+                       "min_tokens",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_classifier_config, min_tokens),
+                       RSPAMD_CL_FLAG_INT_32);
        rspamd_rcl_add_default_handler (sub,
-               "max_tokens",
-               rspamd_rcl_parse_struct_integer,
-               G_STRUCT_OFFSET (struct rspamd_classifier_config, max_tokens),
-               RSPAMD_CL_FLAG_INT_32);
+                       "max_tokens",
+                       rspamd_rcl_parse_struct_integer,
+                       G_STRUCT_OFFSET (struct rspamd_classifier_config, max_tokens),
+                       RSPAMD_CL_FLAG_INT_32);
        rspamd_rcl_add_default_handler (sub,
-               "backend",
-               rspamd_rcl_parse_struct_string,
-               G_STRUCT_OFFSET (struct rspamd_classifier_config, backend),
-               0);
+                       "backend",
+                       rspamd_rcl_parse_struct_string,
+                       G_STRUCT_OFFSET (struct rspamd_classifier_config, backend),
+                       0);
 
        /*
         * Statfile defaults
         */
        ssub = rspamd_rcl_add_section (&sub->subsections,
-               "statfile", "symbol",
-               rspamd_rcl_statfile_handler,
-               UCL_OBJECT,
-               TRUE,
-               TRUE);
+                       "statfile", "symbol",
+                       rspamd_rcl_statfile_handler,
+                       UCL_OBJECT,
+                       TRUE,
+                       TRUE);
        rspamd_rcl_add_default_handler (ssub,
-               "label",
-               rspamd_rcl_parse_struct_string,
-               G_STRUCT_OFFSET (struct rspamd_statfile_config, label),
-               0);
+                       "label",
+                       rspamd_rcl_parse_struct_string,
+                       G_STRUCT_OFFSET (struct rspamd_statfile_config, label),
+                       0);
        rspamd_rcl_add_default_handler (ssub,
-               "spam",
-               rspamd_rcl_parse_struct_boolean,
-               G_STRUCT_OFFSET (struct rspamd_statfile_config, is_spam),
-               0);
+                       "spam",
+                       rspamd_rcl_parse_struct_boolean,
+                       G_STRUCT_OFFSET (struct rspamd_statfile_config, is_spam),
+                       0);
 
        /**
         * Composites handler

diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 568efe934c004231a1acb2994a1311e9ff294ee4..75768c588a4173f9932497ad04434295e0341599 100644 (file)
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -43,6 +43,7 @@
 #define DEFAULT_RLIMIT_MAXCORE 0
 #define DEFAULT_MAP_TIMEOUT 10
 #define DEFAULT_MIN_WORD 4
+#define DEFAULT_MAX_WORD 40
 
 struct rspamd_ucl_map_cbdata {
        struct rspamd_config *cfg;
@@ -185,6 +186,8 @@ rspamd_config_defaults (struct rspamd_config *cfg)
                        " $time_virtual virtual, dns req: $dns_req";
        /* Allow non-mime input by default */
        cfg->allow_raw_input = TRUE;
+       /* Default maximum words processed */
+       cfg->words_decay = 200;
 }
 
 void