summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/chartable.c15
-rw-r--r--src/plugins/dkim_check.c10
-rw-r--r--src/plugins/fuzzy_check.c6
-rw-r--r--src/plugins/regexp.c1
-rw-r--r--src/plugins/spf.c1
-rw-r--r--src/plugins/surbl.c42
6 files changed, 30 insertions, 45 deletions
diff --git a/src/plugins/chartable.c b/src/plugins/chartable.c
index 937cf1dc0..e33052063 100644
--- a/src/plugins/chartable.c
+++ b/src/plugins/chartable.c
@@ -36,7 +36,6 @@
#include "message.h"
#include "cfg_file.h"
#include "expressions.h"
-#include "view.h"
#define DEFAULT_SYMBOL "R_CHARSET_MIXED"
#define DEFAULT_THRESHOLD 0.1
@@ -202,15 +201,13 @@ chartable_symbol_callback (struct rspamd_task *task, void *unused)
GList *cur;
struct mime_text_part *part;
- if (check_view (task->cfg->views, chartable_module_ctx->symbol, task)) {
- cur = g_list_first (task->text_parts);
- while (cur) {
- part = cur->data;
- if (!part->is_empty && check_part (part, task->cfg->raw_mode)) {
- insert_result (task, chartable_module_ctx->symbol, 1, NULL);
- }
- cur = g_list_next (cur);
+ cur = g_list_first (task->text_parts);
+ while (cur) {
+ part = cur->data;
+ if (!part->is_empty && check_part (part, task->cfg->raw_mode)) {
+ insert_result (task, chartable_module_ctx->symbol, 1, NULL);
}
+ cur = g_list_next (cur);
}
}
diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c
index 9610db6a8..ac12c0909 100644
--- a/src/plugins/dkim_check.c
+++ b/src/plugins/dkim_check.c
@@ -43,7 +43,6 @@
#include "cfg_file.h"
#include "expressions.h"
#include "util.h"
-#include "view.h"
#include "map.h"
#include "dkim.h"
#include "hash.h"
@@ -315,12 +314,9 @@ dkim_symbol_callback (struct rspamd_task *task, void *unused)
if (hlist != NULL) {
/* Check whitelist */
msg_debug ("dkim signature found");
-#ifdef HAVE_INET_PTON
- if (!task->from_addr.has_addr ||
- radix32tree_find (dkim_module_ctx->whitelist_ip, ntohl (task->from_addr.d.in4.s_addr)) == RADIX_NO_VALUE) {
-#else
- if (radix32tree_find (dkim_module_ctx->whitelist_ip, ntohl (task->from_addr.s_addr)) == RADIX_NO_VALUE) {
-#endif
+ if (task->from_addr.af == AF_INET ||
+ radix32tree_find (dkim_module_ctx->whitelist_ip,
+ ntohl (task->from_addr.addr.s4.sin_addr.s_addr)) == RADIX_NO_VALUE) {
/* Parse signature */
msg_debug ("create dkim signature");
/*
diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index 595cfc99b..195ee19da 100644
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -45,7 +45,6 @@
#include "cfg_file.h"
#include "expressions.h"
#include "util.h"
-#include "view.h"
#include "map.h"
#include "images.h"
#include "fuzzy_storage.h"
@@ -823,8 +822,9 @@ fuzzy_symbol_callback (struct rspamd_task *task, void *unused)
/* Check whitelist */
#ifdef HAVE_INET_PTON
- if (fuzzy_module_ctx->whitelist && !task->from_addr.ipv6 && task->from_addr.d.in4.s_addr != INADDR_NONE) {
- if (radix32tree_find (fuzzy_module_ctx->whitelist, ntohl ((guint32) task->from_addr.d.in4.s_addr)) != RADIX_NO_VALUE) {
+ if (fuzzy_module_ctx->whitelist && task->from_addr.af == AF_INET) {
+ if (radix32tree_find (fuzzy_module_ctx->whitelist,
+ ntohl (task->from_addr.addr.s4.sin_addr.s_addr)) != RADIX_NO_VALUE) {
msg_info ("<%s>, address %s is whitelisted, skip fuzzy check",
task->message_id, inet_ntoa (task->from_addr.d.in4));
return;
diff --git a/src/plugins/regexp.c b/src/plugins/regexp.c
index 0229236f6..ddc03db38 100644
--- a/src/plugins/regexp.c
+++ b/src/plugins/regexp.c
@@ -34,7 +34,6 @@
#include "map.h"
#include "util.h"
#include "expressions.h"
-#include "view.h"
#include "lua/lua_common.h"
#include "json/jansson.h"
diff --git a/src/plugins/spf.c b/src/plugins/spf.c
index 149e3104d..94245ea7e 100644
--- a/src/plugins/spf.c
+++ b/src/plugins/spf.c
@@ -38,7 +38,6 @@
#include "cfg_file.h"
#include "expressions.h"
#include "util.h"
-#include "view.h"
#include "map.h"
#include "spf.h"
#include "hash.h"
diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c
index 3358b65d0..59c13b450 100644
--- a/src/plugins/surbl.c
+++ b/src/plugins/surbl.c
@@ -47,7 +47,6 @@
#include "cfg_file.h"
#include "expressions.h"
#include "util.h"
-#include "view.h"
#include "map.h"
#include "dns.h"
#include "hash.h"
@@ -634,31 +633,26 @@ make_surbl_requests (struct uri *url, struct rspamd_task *task,
f.begin = url->host;
f.len = url->hostlen;
- if (check_view (task->cfg->views, suffix->symbol, task)) {
- if ((surbl_req = format_surbl_request (task->task_pool, &f, suffix, TRUE,
- &err, forced, tree)) != NULL) {
- param = rspamd_mempool_alloc (task->task_pool, sizeof (struct dns_param));
- param->url = url;
- param->task = task;
- param->suffix = suffix;
- param->host_resolve = rspamd_mempool_strdup (task->task_pool, surbl_req);
- debug_task ("send surbl dns request %s", surbl_req);
- if (make_dns_request (task->resolver, task->s, task->task_pool, dns_callback,
- (void *)param, RDNS_REQUEST_A, surbl_req)) {
- task->dns_requests ++;
- }
- }
- else if (err != NULL && err->code != WHITELIST_ERROR && err->code != DUPLICATE_ERROR) {
- msg_info ("cannot format url string for surbl %s, %s", struri (url), err->message);
- g_error_free (err);
- return;
- }
- else if (err != NULL) {
- g_error_free (err);
+ if ((surbl_req = format_surbl_request (task->task_pool, &f, suffix, TRUE,
+ &err, forced, tree)) != NULL) {
+ param = rspamd_mempool_alloc (task->task_pool, sizeof (struct dns_param));
+ param->url = url;
+ param->task = task;
+ param->suffix = suffix;
+ param->host_resolve = rspamd_mempool_strdup (task->task_pool, surbl_req);
+ debug_task ("send surbl dns request %s", surbl_req);
+ if (make_dns_request (task->resolver, task->s, task->task_pool, dns_callback,
+ (void *)param, RDNS_REQUEST_A, surbl_req)) {
+ task->dns_requests ++;
}
}
- else {
- debug_task ("skipping symbol that is not in view: %s", suffix->symbol);
+ else if (err != NULL && err->code != WHITELIST_ERROR && err->code != DUPLICATE_ERROR) {
+ msg_info ("cannot format url string for surbl %s, %s", struri (url), err->message);
+ g_error_free (err);
+ return;
+ }
+ else if (err != NULL) {
+ g_error_free (err);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 20:40:00 +0000