Selaa lähdekoodia

[Rework] Allow multiple conditions for dkim signing when using vault/redis

pull/4866/head
Vsevolod Stakhov 3 kuukautta sitten
vanhempi
commit
3de247b318
No account linked to committer's email address
2 muutettua tiedostoa jossa 6 lisäystä ja 7 poistoa
  1. 5
    6
      lualib/lua_dkim_tools.lua
  2. 1
    1
      src/plugins/lua/dkim_signing.lua

+ 5
- 6
lualib/lua_dkim_tools.lua Näytä tiedosto

if settings.use_vault then if settings.use_vault then
if settings.vault_domains then if settings.vault_domains then
if settings.vault_domains:get_key(dkim_domain) then if settings.vault_domains:get_key(dkim_domain) then
return true, {
table.insert(p, {
domain = dkim_domain, domain = dkim_domain,
vault = true, vault = true,
}
})
else else
lua_util.debugm(N, task, 'domain %s is not designated for vault', lua_util.debugm(N, task, 'domain %s is not designated for vault',
dkim_domain) dkim_domain)
return false, {}
end end
else else
-- TODO: try every domain in the vault -- TODO: try every domain in the vault
return true, {
table.insert(p, {
domain = dkim_domain, domain = dkim_domain,
vault = true, vault = true,
}
})
end end
end end


insert_or_update_prop(N, task, p, 'domain', 'dkim_domain', insert_or_update_prop(N, task, p, 'domain', 'dkim_domain',
dkim_domain) dkim_domain)


return true, p
return #p > 0 and true or false, p
end end


exports.prepare_dkim_signing = prepare_dkim_signing exports.prepare_dkim_signing = prepare_dkim_signing

+ 1
- 1
src/plugins/lua/dkim_signing.lua Näytä tiedosto

local function dkim_signing_cb(task) local function dkim_signing_cb(task)
local ret, selectors = dkim_sign_tools.prepare_dkim_signing(N, task, settings) local ret, selectors = dkim_sign_tools.prepare_dkim_signing(N, task, settings)


if not ret then
if not ret or #selectors == 0 then
return return
end end



Loading…
Peruuta
Tallenna