diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-08-17 13:48:01 -0700 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-08-17 13:48:01 -0700 |
| commit | 7c5fd966bf8069e4132adcdf8819e7f410ffb010 (patch) | |
| tree | 0b43027c9e0adab0143c34674e0df99133ba2a9d | |
| parent | 795b01a1b5a4998cb3d2b004ce109e0f505076eb (diff) | |
| download | rspamd-7c5fd966bf8069e4132adcdf8819e7f410ffb010.tar.gz rspamd-7c5fd966bf8069e4132adcdf8819e7f410ffb010.zip | |
Update default configs.
| -rw-r--r-- | conf/lua/regexp/headers.lua | 6 | ||||
| -rw-r--r-- | conf/lua/rspamd.lua | 6 | ||||
| m--------- | src/rdns | 0 |
3 files changed, 6 insertions, 6 deletions
diff --git a/conf/lua/regexp/headers.lua b/conf/lua/regexp/headers.lua index d3828d4fa..7920eaa91 100644 --- a/conf/lua/regexp/headers.lua +++ b/conf/lua/regexp/headers.lua @@ -432,7 +432,7 @@ reconf['FORGED_GENERIC_RECEIVED3'] = 'Received=/^\\s*(.+\\n)*by \\d{1,3}\\.\\d{1 reconf['FORGED_GENERIC_RECEIVED4'] = 'Received=/^\\s*(.+\\n)*from localhost by \\S+;\\s+\\w{3}, \\d+ \\w{3} 20\\d\\d \\d\\d\\:\\d\\d\\:\\d\\d [+-]\\d\\d\\d0[\\s\\r\\n]*$/X' -reconf['FORGED_GENERIC_RECEIVED5'] = function (task) +rspamd_config.FORGED_GENERIC_RECEIVED5 = function (task) local regexp_text = '^\\s*from \\[(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3})\\].*\\n(.+\\n)*\\s*from \\1 by \\S+;\\s+\\w{3}, \\d+ \\w{3} 20\\d\\d \\d\\d\\:\\d\\d\\:\\d\\d [+-]\\d\\d\\d0$' local re = regexp.get_cached(regexp_text) if not re then re = regexp.create(regexp_text, 'i') end @@ -449,7 +449,7 @@ end reconf['INVALID_POSTFIX_RECEIVED'] = 'Received=/ \\(Postfix\\) with ESMTP id [A-Z\\d]+([\\s\\r\\n]+for <\\S+?>)?;[\\s\\r\\n]*[A-Z][a-z]{2}, \\d{1,2} [A-Z][a-z]{2} \\d\\d\\d\\d \\d\\d:\\d\\d:\\d\\d [\\+\\-]\\d\\d\\d\\d$/X' -reconf['INVALID_EXIM_RECEIVED'] = function (task) +rspamd_config.INVALID_EXIM_RECEIVED = function (task) local checked = 0 local headers_to = task:get_message():get_header('To') if headers_to then @@ -475,7 +475,7 @@ reconf['INVALID_EXIM_RECEIVED'] = function (task) return false end -reconf['INVALID_EXIM_RECEIVED2'] = function (task) +rspamd_config.INVALID_EXIM_RECEIVED2 = function (task) local checked = 0 local headers_to = task:get_message():get_header('To') if headers_to then diff --git a/conf/lua/rspamd.lua b/conf/lua/rspamd.lua index 795e639a6..c460cf1d5 100644 --- a/conf/lua/rspamd.lua +++ b/conf/lua/rspamd.lua @@ -24,7 +24,7 @@ reconf['R_FLASH_REDIR_IMGSHACK'] = '/^(?:http:\\/\\/)?img\\d{1,5}\\.imageshack\\ -- Different text parts reconf['R_PARTS_DIFFER'] = 'compare_parts_distance(50)'; -reconf['R_EMPTY_IMAGE'] = function (task) +rspamd_config.R_EMPTY_IMAGE = function (task) parts = task:get_text_parts() if parts then for _,part in ipairs(parts) do @@ -41,7 +41,7 @@ reconf['R_EMPTY_IMAGE'] = function (task) end -- Date issues -reconf['DATE_IN_FUTURE'] = function(task) +rspamd_config.DATE_IN_FUTURE = function(task) if rspamd_config:get_api_version() >= 5 then local m = task:get_message() local dm = m:get_date() @@ -54,7 +54,7 @@ reconf['DATE_IN_FUTURE'] = function(task) return false end -reconf['DATE_IN_PAST'] = function(task) +rspamd_config.DATE_IN_PAST = function(task) if rspamd_config:get_api_version() >= 5 then local m = task:get_message() local dm = m:get_date() diff --git a/src/rdns b/src/rdns -Subproject 40d4eb2ad845643fe6a949f98042bb14c1ea24b +Subproject 221f5b4d44b9ad288c218dc0a241220742b3a7d |