From 3559d707bf2e32b6a3a7ed17095a0ac5fc26607d Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 3 Mar 2021 20:48:54 +0100 Subject: net.resolvers.basic: Disable DANE for now, completely broken Turns out 'extra' is, at least for mod_s2s, the same table for *all* connections. --- CHANGES | 1 - net/resolvers/basic.lua | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 55e2136d..f91e8e44 100644 --- a/CHANGES +++ b/CHANGES @@ -17,7 +17,6 @@ TRUNK - `daemonize` option deprecated - SASL DIGEST-MD5 removed - Switch to libunbound for DNS queries -- DANE Support - mod_external_services (XEP-0215) - util.error for encapsulating errors - MUC: support for XEP-0421 occupant identifiers diff --git a/net/resolvers/basic.lua b/net/resolvers/basic.lua index 220cb0c8..c0e7cb88 100644 --- a/net/resolvers/basic.lua +++ b/net/resolvers/basic.lua @@ -36,15 +36,14 @@ function methods:next(cb) n = n - 1; if n > 0 then return; end self.targets = targets; + --[[ + -- TODO stash tlsa somewhere per connection + -- FIXME 'extra' here is not per connection if self.extra and self.extra.use_dane then if secure and tlsa[1] then - self.extra.tlsa = tlsa; - self.extra.dane_hostname = self.hostname; - else - self.extra.tlsa = nil; - self.extra.dane_hostname = nil; end end + --]] self:next(cb); end -- cgit v1.2.3