mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s

Browse source
This commit is contained in:
Kim Alvefur 2015-04-24 14:14:01 +02:00
parent 51bef3673c
commit 7dff400ed5
2 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
net/dns.lua
View file

@ -694,15 +694,20 @@ local function comp_mx(a, b) -- - - - - - - - - - - - - - - - - - - comp_mx
end
function resolver:peek (qname, qtype, qclass) -- - - - - - - - - - - - peek
function resolver:peek (qname, qtype, qclass, n) -- - - - - - - - - - - - peek
qname, qtype, qclass = standardize(qname, qtype, qclass);
local rrs = get(self.cache, qclass, qtype, qname);
if not rrs then return nil; end
if not rrs then
if n then if n <= 0 then return end else n = 3 end
rrs = get(self.cache, qclass, "CNAME", qname);
if not (rrs and rrs[1]) then return end
return self:peek(rrs[1].cname, qtype, qclass, n - 1);
end
if prune(rrs, socket.gettime()) and qtype == '*' or not next(rrs) then
set(self.cache, qclass, qtype, qname, nil);
return nil;
end
if self.unsorted[rrs] then table.sort (rrs, comp_mx); end
if self.unsorted[rrs] then table.sort (rrs, comp_mx); self.unsorted[rrs] = nil; end
return rrs;
end

12
plugins/mod_s2s/s2sout.lib.lua
View file

@ -169,18 +169,6 @@ function s2sout.try_connect(host_session, connect_host, connect_port, err)
handle4 = adns.lookup(function (reply, err)
handle4 = nil;
-- COMPAT: This is a compromise for all you CNAME-(ab)users :)
if not (reply and reply[#reply] and reply[#reply].a) then
local count = max_dns_depth;
reply = dns.peek(connect_host, "CNAME", "IN");
while count > 0 and reply and reply[#reply] and not reply[#reply].a and reply[#reply].cname do
log("debug", "Looking up %s (DNS depth is %d)", tostring(reply[#reply].cname), count);
reply = dns.peek(reply[#reply].cname, "A", "IN") or dns.peek(reply[#reply].cname, "CNAME", "IN");
count = count - 1;
end
end
-- end of CNAME resolving
if reply and reply[#reply] and reply[#reply].a then
for _, ip in ipairs(reply) do
log("debug", "DNS reply for %s gives us %s", connect_host, ip.a);