diff options
| author | Vsevolod Stakhov <vsevolod@rspamd.com> | 2024-07-18 13:26:26 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rspamd.com> | 2024-07-18 13:26:26 +0100 |
| commit | 02e433ff1f9fa327387a7d0453e3e851776fd160 (patch) | |
| tree | dc83e02a07f3039f3c2e666461e008319b542ca1 /src | |
| parent | 180eb573d8d56b5c39313f389cda762122adb6b3 (diff) | |
| download | rspamd-02e433ff1f9fa327387a7d0453e3e851776fd160.tar.gz rspamd-02e433ff1f9fa327387a7d0453e3e851776fd160.zip | |
[Minor] Fix several issues with flag propagation
Diffstat (limited to 'src')
| -rw-r--r-- | src/libserver/spf.c | 5 | ||||
| -rw-r--r-- | src/libserver/spf.h | 1 | ||||
| -rw-r--r-- | src/lua/lua_spf.c | 7 | ||||
| -rw-r--r-- | src/plugins/lua/spf.lua | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/src/libserver/spf.c b/src/libserver/spf.c index afd77294b..562222042 100644 --- a/src/libserver/spf.c +++ b/src/libserver/spf.c @@ -451,6 +451,9 @@ rspamd_spf_process_reference(struct spf_resolved *target, target->flags |= RSPAMD_SPF_RESOLVED_NA; continue; } + if (cur->flags & RSPAMD_SPF_FLAG_PLUSALL) { + target->flags |= RSPAMD_SPF_RESOLVED_PLUSALL; + } if (cur->flags & RSPAMD_SPF_FLAG_INVALID) { /* Ignore invalid elements */ continue; @@ -1418,7 +1421,7 @@ parse_spf_all(struct spf_record *rec, struct spf_addr *addr) /* Disallow +all */ if (addr->mech == SPF_PASS) { - addr->flags |= RSPAMD_SPF_FLAG_INVALID | RSPAMD_SPF_FLAG_PLUSALL; + addr->flags |= RSPAMD_SPF_FLAG_PLUSALL; msg_notice_spf("domain %s allows any SPF (+all), ignore SPF record completely", rec->sender_domain); } diff --git a/src/libserver/spf.h b/src/libserver/spf.h index 2487b6d57..b89dc4d0e 100644 --- a/src/libserver/spf.h +++ b/src/libserver/spf.h @@ -105,6 +105,7 @@ enum rspamd_spf_resolved_flags { RSPAMD_SPF_RESOLVED_TEMP_FAILED = (1u << 0u), RSPAMD_SPF_RESOLVED_PERM_FAILED = (1u << 1u), RSPAMD_SPF_RESOLVED_NA = (1u << 2u), + RSPAMD_SPF_RESOLVED_PLUSALL = (1u << 3u), }; struct spf_resolved { diff --git a/src/lua/lua_spf.c b/src/lua/lua_spf.c index a9bcfc80c..850ce2120 100644 --- a/src/lua/lua_spf.c +++ b/src/lua/lua_spf.c @@ -89,7 +89,7 @@ lua_load_spf(lua_State *L) lua_setfield(L, -2, "perm_fail"); lua_pushinteger(L, RSPAMD_SPF_FLAG_CACHED); lua_setfield(L, -2, "cached"); - lua_pushinteger(L, RSPAMD_SPF_FLAG_PLUSALL); + lua_pushinteger(L, RSPAMD_SPF_RESOLVED_PLUSALL); lua_setfield(L, -2, "plusall"); lua_setfield(L, -2, "flags"); @@ -370,6 +370,11 @@ spf_check_element(lua_State *L, struct spf_resolved *rec, struct spf_addr *addr, lua_pushinteger(L, RSPAMD_SPF_RESOLVED_TEMP_FAILED); lua_pushfstring(L, "%cany", spf_mech_char(addr->mech)); } + else if (rec->flags & RSPAMD_SPF_RESOLVED_PLUSALL) { + lua_pushboolean(L, false); + lua_pushinteger(L, RSPAMD_SPF_RESOLVED_PLUSALL); + lua_pushfstring(L, "%cany", spf_mech_char(addr->mech)); + } else { lua_pushboolean(L, true); lua_pushinteger(L, addr->mech); diff --git a/src/plugins/lua/spf.lua b/src/plugins/lua/spf.lua index b9add61a6..356507250 100644 --- a/src/plugins/lua/spf.lua +++ b/src/plugins/lua/spf.lua @@ -119,6 +119,8 @@ local function spf_check_callback(task) local function flag_to_symbol(fl) if bit.band(fl, rspamd_spf.flags.temp_fail) ~= 0 then return local_config.symbols.dnsfail + elseif bit.band(fl, rspamd_spf.flags.plusall) ~= 0 then + return local_config.symbols.plusall elseif bit.band(fl, rspamd_spf.flags.perm_fail) ~= 0 then return local_config.symbols.permfail elseif bit.band(fl, rspamd_spf.flags.na) ~= 0 then |