diff options
| author | LBahtarliev <22945773+lbahtarliev@users.noreply.github.com> | 2023-09-12 23:59:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-12 23:59:56 +0300 |
| commit | 7846b2f3203c1fefce8560fb89ef198e2323d939 (patch) | |
| tree | 1c0ef246d8dd5a2f52a7c9cbea99e0ef89199032 /src | |
| parent | 4824b17181d300954751b84272543ece4b81e9a7 (diff) | |
| parent | 7ff64cd1359375974155e560c7d3200f03a4e500 (diff) | |
| download | rspamd-7846b2f3203c1fefce8560fb89ef198e2323d939.tar.gz rspamd-7846b2f3203c1fefce8560fb89ef198e2323d939.zip | |
Merge branch 'rspamd:master' into master
Diffstat (limited to 'src')
| -rw-r--r-- | src/lua/lua_ip.c | 20 | ||||
| -rw-r--r-- | src/plugins/lua/rbl.lua | 5 | ||||
| -rw-r--r-- | src/ragel/content_disposition.rl | 4 |
3 files changed, 16 insertions, 13 deletions
diff --git a/src/lua/lua_ip.c b/src/lua/lua_ip.c index 92a066406..ac24dc52b 100644 --- a/src/lua/lua_ip.c +++ b/src/lua/lua_ip.c @@ -87,24 +87,24 @@ LUA_FUNCTION_DEF(ip, to_table); * @see ip:to_table() is that this method returns just hex strings for ipv6 * addresses. * @return {table or nil} string octets of IP address or `nil` if IP is invalid + * @example +local ip = rspamd_ip.from_string('fe80::11') +print(table.concat(ip:str_octets(), ".")) +-- Output: +-- f.e.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.1 */ LUA_FUNCTION_DEF(ip, str_octets); /*** - * @method ip:str_octets() + * @method ip:inversed_str_octets() * Converts valid IP address to the table of string octets in reversed order. The difference from * @see ip:to_table() is that this method returns just hex strings for ipv6 - * addresses. + * addresses in reversed order. * @return {table or nil} string octets of IP address or `nil` if IP is invalid * @example -local ip = rspamd_ip.from_string('127.0.0.1') -for _,o in ipairs(ip:to_table()) do - print(o) -end +local ip = rspamd_ip.from_string('fe80::11') +print(table.concat(ip:inversed_str_octets(), ".")) -- Output: --- 1 --- 0 --- 0 --- 127 +-- 1.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.e.f */ LUA_FUNCTION_DEF(ip, inversed_str_octets); /*** diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua index 6dce0e0f1..c5cdbef1c 100644 --- a/src/plugins/lua/rbl.lua +++ b/src/plugins/lua/rbl.lua @@ -572,6 +572,9 @@ local function gen_rbl_callback(rule) if rule.images then table.insert(ex_params.flags, 'image') end + if rule.numeric_urls then + table.insert(ex_params.flags, 'numeric') + end end local urls = lua_util.extract_specific_urls(ex_params) @@ -805,7 +808,7 @@ local function gen_rbl_callback(rule) description[#description + 1] = 'replyto' end - if rule.urls or rule.content_urls or rule.images then + if rule.urls or rule.content_urls or rule.images or rule.numeric_urls then pipeline[#pipeline + 1] = check_urls description[#description + 1] = 'urls' end diff --git a/src/ragel/content_disposition.rl b/src/ragel/content_disposition.rl index 6087d3d17..862015ea1 100644 --- a/src/ragel/content_disposition.rl +++ b/src/ragel/content_disposition.rl @@ -13,8 +13,8 @@ (((FWS? qcontent)* FWS?) >Quoted_Str_Start %Quoted_Str_End) DQUOTE) CFWS?; token = 0x21..0x27 | 0x2a..0x2b | 0x2c..0x2e | 0x30..0x39 | 0x41..0x5a | 0x5e..0x7e; - value = (quoted_string | (token -- '"' | 0x3d | utf8_2c | utf8_3c | utf8_4c)+) >Param_Value_Start %Param_Value_End; - attribute = (quoted_string | (token -- '"' | 0x3d)+) >Param_Name_Start %Param_Name_End; + value = (quoted_string | (token -- ('"' | 0x3d | utf8_2c | utf8_3c | utf8_4c))+) >Param_Value_Start %Param_Value_End; + attribute = (quoted_string | (token -- ('"' | '='))+) >Param_Name_Start %Param_Name_End; parameter = CFWS? attribute FWS? "=" FWS? value CFWS?; ietf_token = token+; |