author | Kim Alvefur <zash@zash.se> |
Wed, 27 Sep 2017 17:34:54 +0200 | |
changeset 8283 | 9ca0e3128b62 |
parent 8269 | 9a97dd174ec9 |
child 8558 | 4f0f5b49bb03 |
permissions | -rw-r--r-- |
1522
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1208
diff
changeset
|
1 |
-- Prosody IM |
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2710
diff
changeset
|
2 |
-- Copyright (C) 2008-2010 Matthew Wild |
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2710
diff
changeset
|
3 |
-- Copyright (C) 2008-2010 Waqas Hussain |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5730
diff
changeset
|
4 |
-- |
1522
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1208
diff
changeset
|
5 |
-- This project is MIT/X11 licensed. Please see the |
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1208
diff
changeset
|
6 |
-- COPYING file in the source package for more information. |
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1208
diff
changeset
|
7 |
-- |
569d58d21612
Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents:
1208
diff
changeset
|
8 |
|
870
4fd5d8f1657c
net.adns: Add helper module for performing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
9 |
local server = require "net.server"; |
8269
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
10 |
local new_resolver = require "net.dns".resolver; |
870
4fd5d8f1657c
net.adns: Add helper module for performing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
11 |
|
4fd5d8f1657c
net.adns: Add helper module for performing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
12 |
local log = require "util.logger".init("adns"); |
4fd5d8f1657c
net.adns: Add helper module for performing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
13 |
|
973
b091a1a7273b
net.adns: Catch errors in DNS response callbacks
Matthew Wild <mwild1@gmail.com>
parents:
886
diff
changeset
|
14 |
local coroutine, tostring, pcall = coroutine, tostring, pcall; |
8283
9ca0e3128b62
net.adns: Import setmetatable into a local (fixes traceback on Lua 5.2)
Kim Alvefur <zash@zash.se>
parents:
8269
diff
changeset
|
15 |
local setmetatable = setmetatable; |
870
4fd5d8f1657c
net.adns: Add helper module for performing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
16 |
|
2558
0a65fc0c7bee
net.adns: Use different flavour of voodoo to make UDP sockets work smoothly with libevent (no packet merging)
Matthew Wild <mwild1@gmail.com>
parents:
2556
diff
changeset
|
17 |
local function dummy_send(sock, data, i, j) return (j-i)+1; end |
0a65fc0c7bee
net.adns: Use different flavour of voodoo to make UDP sockets work smoothly with libevent (no packet merging)
Matthew Wild <mwild1@gmail.com>
parents:
2556
diff
changeset
|
18 |
|
6783
647adfd8f738
net.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6513
diff
changeset
|
19 |
local _ENV = nil; |
870
4fd5d8f1657c
net.adns: Add helper module for performing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
20 |
|
8269
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
21 |
local async_resolver_methods = {}; |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
22 |
local async_resolver_mt = { __index = async_resolver_methods }; |
870
4fd5d8f1657c
net.adns: Add helper module for performing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
23 |
|
8269
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
24 |
local query_methods = {}; |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
25 |
local query_mt = { __index = query_methods }; |
1203
23725bfdeed5
net.adns: Add support for cancelling a non-blocking lookup, optionally calling the handler
Matthew Wild <mwild1@gmail.com>
parents:
1005
diff
changeset
|
26 |
|
6783
647adfd8f738
net.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6513
diff
changeset
|
27 |
local function new_async_socket(sock, resolver) |
2232
aa8db84ae69d
net.adns: Some cleanup, happens to also make it compatible with libevent
Matthew Wild <mwild1@gmail.com>
parents:
2128
diff
changeset
|
28 |
local peername = "<unknown>"; |
870
4fd5d8f1657c
net.adns: Add helper module for performing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
29 |
local listener = {}; |
2232
aa8db84ae69d
net.adns: Some cleanup, happens to also make it compatible with libevent
Matthew Wild <mwild1@gmail.com>
parents:
2128
diff
changeset
|
30 |
local handler = {}; |
6287
a380b09649e6
net.adns: Add missing local declaration
Kim Alvefur <zash@zash.se>
parents:
5730
diff
changeset
|
31 |
local err; |
2128
f107f0205793
net.adns: Update for new net.server API (doesn't work with libevent yet)
Matthew Wild <mwild1@gmail.com>
parents:
1901
diff
changeset
|
32 |
function listener.onincoming(conn, data) |
2652
cbc58fc170ad
net.adns: Fix potential traceback on DNS responses with libevent enabled (thanks Flo)
Matthew Wild <mwild1@gmail.com>
parents:
2578
diff
changeset
|
33 |
if data then |
8269
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
34 |
resolver:feed(handler, data); |
2652
cbc58fc170ad
net.adns: Fix potential traceback on DNS responses with libevent enabled (thanks Flo)
Matthew Wild <mwild1@gmail.com>
parents:
2578
diff
changeset
|
35 |
end |
870
4fd5d8f1657c
net.adns: Add helper module for performing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
36 |
end |
2128
f107f0205793
net.adns: Update for new net.server API (doesn't work with libevent yet)
Matthew Wild <mwild1@gmail.com>
parents:
1901
diff
changeset
|
37 |
function listener.ondisconnect(conn, err) |
2661
be4b1e796bd2
net.adns: Don't treat locally-initiated disconnects as fatal with libevent backend in use (thanks Flo)
Matthew Wild <mwild1@gmail.com>
parents:
2652
diff
changeset
|
38 |
if err then |
be4b1e796bd2
net.adns: Don't treat locally-initiated disconnects as fatal with libevent backend in use (thanks Flo)
Matthew Wild <mwild1@gmail.com>
parents:
2652
diff
changeset
|
39 |
log("warn", "DNS socket for %s disconnected: %s", peername, err); |
be4b1e796bd2
net.adns: Don't treat locally-initiated disconnects as fatal with libevent backend in use (thanks Flo)
Matthew Wild <mwild1@gmail.com>
parents:
2652
diff
changeset
|
40 |
local servers = resolver.server; |
be4b1e796bd2
net.adns: Don't treat locally-initiated disconnects as fatal with libevent backend in use (thanks Flo)
Matthew Wild <mwild1@gmail.com>
parents:
2652
diff
changeset
|
41 |
if resolver.socketset[conn] == resolver.best_server and resolver.best_server == #servers then |
be4b1e796bd2
net.adns: Don't treat locally-initiated disconnects as fatal with libevent backend in use (thanks Flo)
Matthew Wild <mwild1@gmail.com>
parents:
2652
diff
changeset
|
42 |
log("error", "Exhausted all %d configured DNS servers, next lookup will try %s again", #servers, servers[1]); |
be4b1e796bd2
net.adns: Don't treat locally-initiated disconnects as fatal with libevent backend in use (thanks Flo)
Matthew Wild <mwild1@gmail.com>
parents:
2652
diff
changeset
|
43 |
end |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5730
diff
changeset
|
44 |
|
2661
be4b1e796bd2
net.adns: Don't treat locally-initiated disconnects as fatal with libevent backend in use (thanks Flo)
Matthew Wild <mwild1@gmail.com>
parents:
2652
diff
changeset
|
45 |
resolver:servfail(conn); -- Let the magic commence |
1787
c4dff34f3d32
net.adns: Utilise new net.dns API to handle DNS network errors
Matthew Wild <mwild1@gmail.com>
parents:
1522
diff
changeset
|
46 |
end |
870
4fd5d8f1657c
net.adns: Add helper module for performing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
47 |
end |
5730
411e9e7d8035
net.dns, net.adns: Make sure errors from net.server are propagated (thanks asterix)
Kim Alvefur <zash@zash.se>
parents:
4103
diff
changeset
|
48 |
handler, err = server.wrapclient(sock, "dns", 53, listener); |
2232
aa8db84ae69d
net.adns: Some cleanup, happens to also make it compatible with libevent
Matthew Wild <mwild1@gmail.com>
parents:
2128
diff
changeset
|
49 |
if not handler then |
5730
411e9e7d8035
net.dns, net.adns: Make sure errors from net.server are propagated (thanks asterix)
Kim Alvefur <zash@zash.se>
parents:
4103
diff
changeset
|
50 |
return nil, err; |
1787
c4dff34f3d32
net.adns: Utilise new net.dns API to handle DNS network errors
Matthew Wild <mwild1@gmail.com>
parents:
1522
diff
changeset
|
51 |
end |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5730
diff
changeset
|
52 |
|
2232
aa8db84ae69d
net.adns: Some cleanup, happens to also make it compatible with libevent
Matthew Wild <mwild1@gmail.com>
parents:
2128
diff
changeset
|
53 |
handler.settimeout = function () end |
aa8db84ae69d
net.adns: Some cleanup, happens to also make it compatible with libevent
Matthew Wild <mwild1@gmail.com>
parents:
2128
diff
changeset
|
54 |
handler.setsockname = function (_, ...) return sock:setsockname(...); end |
6509
f869eec511c8
net.adns: Preserve error from setpeername
Kim Alvefur <zash@zash.se>
parents:
6287
diff
changeset
|
55 |
handler.setpeername = function (_, ...) peername = (...); local ret, err = sock:setpeername(...); _:set_send(dummy_send); return ret, err; end |
2556
50d1ba86a959
net.adns: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2232
diff
changeset
|
56 |
handler.connect = function (_, ...) return sock:connect(...) end |
2558
0a65fc0c7bee
net.adns: Use different flavour of voodoo to make UDP sockets work smoothly with libevent (no packet merging)
Matthew Wild <mwild1@gmail.com>
parents:
2556
diff
changeset
|
57 |
--handler.send = function (_, data) _:write(data); return _.sendbuffer and _.sendbuffer(); end |
3990
764922062c38
net.adns: Log the DNS server that a query is sent to
Matthew Wild <mwild1@gmail.com>
parents:
3956
diff
changeset
|
58 |
handler.send = function (_, data) |
6510
84ca02c6a47e
net.adns: Log peername recorded from wrapped setpeername instead of calling sock:getpeername, it exists and throws an error on unconnected sockets (thanks wirehack7)
Kim Alvefur <zash@zash.se>
parents:
6509
diff
changeset
|
59 |
log("debug", "Sending DNS query to %s", peername); |
3990
764922062c38
net.adns: Log the DNS server that a query is sent to
Matthew Wild <mwild1@gmail.com>
parents:
3956
diff
changeset
|
60 |
return sock:send(data); |
764922062c38
net.adns: Log the DNS server that a query is sent to
Matthew Wild <mwild1@gmail.com>
parents:
3956
diff
changeset
|
61 |
end |
2232
aa8db84ae69d
net.adns: Some cleanup, happens to also make it compatible with libevent
Matthew Wild <mwild1@gmail.com>
parents:
2128
diff
changeset
|
62 |
return handler; |
870
4fd5d8f1657c
net.adns: Add helper module for performing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
63 |
end |
4fd5d8f1657c
net.adns: Add helper module for performing non-blocking DNS lookups
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
64 |
|
8269
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
65 |
function async_resolver_methods:lookup(handler, qname, qtype, qclass) |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
66 |
local resolver = self._resolver; |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
67 |
return coroutine.wrap(function (peek) |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
68 |
if peek then |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
69 |
log("debug", "Records for %s already cached, using those...", qname); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
70 |
handler(peek); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
71 |
return; |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
72 |
end |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
73 |
log("debug", "Records for %s not in cache, sending query (%s)...", qname, tostring(coroutine.running())); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
74 |
local ok, err = resolver:query(qname, qtype, qclass); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
75 |
if ok then |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
76 |
coroutine.yield(setmetatable({ resolver, qclass or "IN", qtype or "A", qname, coroutine.running()}, query_mt)); -- Wait for reply |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
77 |
log("debug", "Reply for %s (%s)", qname, tostring(coroutine.running())); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
78 |
end |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
79 |
if ok then |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
80 |
ok, err = pcall(handler, resolver:peek(qname, qtype, qclass)); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
81 |
else |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
82 |
log("error", "Error sending DNS query: %s", err); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
83 |
ok, err = pcall(handler, nil, err); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
84 |
end |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
85 |
if not ok then |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
86 |
log("error", "Error in DNS response handler: %s", tostring(err)); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
87 |
end |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
88 |
end)(resolver:peek(qname, qtype, qclass)); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
89 |
end |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
90 |
|
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
91 |
function query_methods:cancel(call_handler, reason) |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
92 |
log("warn", "Cancelling DNS lookup for %s", tostring(self[4])); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
93 |
self[1].cancel(self[2], self[3], self[4], self[5], call_handler); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
94 |
end |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
95 |
|
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
96 |
local function new_async_resolver() |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
97 |
local resolver = new_resolver(); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
98 |
resolver:socket_wrapper_set(new_async_socket); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
99 |
return setmetatable({ _resolver = resolver}, async_resolver_mt); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
100 |
end |
872 | 101 |
|
6783
647adfd8f738
net.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6513
diff
changeset
|
102 |
return { |
8269
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
103 |
lookup = function (...) |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
104 |
return new_async_resolver():lookup(...); |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
105 |
end; |
9a97dd174ec9
net.adns: Restructure to allow creating separate resolver objects, like net.dns
Matthew Wild <mwild1@gmail.com>
parents:
7478
diff
changeset
|
106 |
resolver = new_async_resolver; |
6783
647adfd8f738
net.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6513
diff
changeset
|
107 |
new_async_socket = new_async_socket; |
647adfd8f738
net.*: Remove use of module() function
Kim Alvefur <zash@zash.se>
parents:
6513
diff
changeset
|
108 |
}; |