Software / code / prosody-modules
Changeset
2197:90a444ccaa8e
mod_s2s_auth_dane: Use util.async if available (current prosody trunk)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 01 Jun 2016 22:33:51 +0200 |
| parents | 2196:09f6e1a09b2b |
| children | 2198:eb53a830864c |
| files | mod_s2s_auth_dane/mod_s2s_auth_dane.lua |
| diffstat | 1 files changed, 31 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mod_s2s_auth_dane/mod_s2s_auth_dane.lua Wed Jun 01 14:50:39 2016 +0200 +++ b/mod_s2s_auth_dane/mod_s2s_auth_dane.lua Wed Jun 01 22:33:51 2016 +0200 @@ -19,6 +19,7 @@ module:set_global(); +local have_async, async = pcall(require, "util.async"); local noop = function () end local type = type; local t_insert = table.insert; @@ -208,6 +209,28 @@ host_session.conn:resume() end +if have_async then + function pause(host_session) + host_session.log("debug", "Pausing connection until DANE lookup is completed"); + local wait, done = async.waiter(); + host_session._done_waiting_for_dane = done; + wait(); + end + local function _resume(_, host_session) + if host_session._done_waiting_for_dane then + host_session.log("debug", "DANE lookup completed, resuming connection"); + host_session._done_waiting_for_dane(); + host_session._done_waiting_for_dane = nil; + end + end + function resume(host_session) + -- Something about the way luaunbound calls callbacks is messed up + if host_session._done_waiting_for_dane then + module:add_timer(0, _resume, host_session); + end + end +end + function module.add_host(module) local function on_new_s2s(event) local host_session = event.origin; @@ -217,9 +240,8 @@ if host_session.dane ~= nil then return; -- Already done DANE lookup end - if dane_lookup(host_session, resume) then - pause(host_session); - end + dane_lookup(host_session, resume); + -- Let it run in parallell until we need to check the cert end -- New outgoing connections @@ -281,6 +303,12 @@ if not cert then return end local log = session.log or module._log; local dane = session.dane; + if type(dane) ~= "table" then + if dane == nil and dane_lookup(session, resume) then + pause(session); + dane = session.dane; + end + end if type(dane) == "table" then local match_found, supported_found; for i = 1, #dane do
