aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_dialback.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-04-30 03:05:56 +0100
committerMatthew Wild <mwild1@gmail.com>2009-04-30 03:05:56 +0100
commit0188e331a5f9e8cd99c9872e9580f5b7811a5ccc (patch)
tree169a549af80682e0effdff00a5c0414ff734b300 /plugins/mod_dialback.lua
parent5553cf3c48dbcbdc66fa734ce9371793d42d48bc (diff)
parenta1a1fd2213c069994ddbb9b03e8ae39281deb6d5 (diff)
downloadprosody-0188e331a5f9e8cd99c9872e9580f5b7811a5ccc.tar.gz
prosody-0188e331a5f9e8cd99c9872e9580f5b7811a5ccc.zip
Merge with 0.4
Diffstat (limited to 'plugins/mod_dialback.lua')
-rw-r--r--plugins/mod_dialback.lua14
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index fe65d394..b1bc3ae3 100644
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -13,9 +13,9 @@ local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
local s2s_verify_dialback = require "core.s2smanager".verify_dialback;
local s2s_destroy_session = require "core.s2smanager".destroy_session;
-local st = require "util.stanza";
+local log = module._log;
-local log = require "util.logger".init("mod_dialback");
+local st = require "util.stanza";
local xmlns_dialback = "jabber:server:dialback";
@@ -24,7 +24,7 @@ local dialback_requests = setmetatable({}, { __mode = 'v' });
module:add_handler({"s2sin_unauthed", "s2sin"}, "verify", xmlns_dialback,
function (origin, stanza)
-- We are being asked to verify the key, to ensure it was generated by us
- log("debug", "verifying dialback key...");
+ origin.log("debug", "verifying that dialback key is ours...");
local attr = stanza.attr;
-- FIXME: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34
--if attr.from ~= origin.to_host then error("invalid-from"); end
@@ -33,9 +33,9 @@ module:add_handler({"s2sin_unauthed", "s2sin"}, "verify", xmlns_dialback,
type = "valid"
else
type = "invalid"
- log("warn", "Asked to verify a dialback key that was incorrect. An imposter is claiming to be %s?", attr.to);
+ origin.log("warn", "Asked to verify a dialback key that was incorrect. An imposter is claiming to be %s?", attr.to);
end
- log("debug", "verified dialback key... it is %s", type);
+ origin.log("debug", "verified dialback key... it is %s", type);
origin.sends2s(st.stanza("db:verify", { from = attr.to, to = attr.from, id = attr.id, type = type }):text(stanza[1]));
end);
@@ -48,7 +48,7 @@ module:add_handler({ "s2sin_unauthed", "s2sin" }, "result", xmlns_dialback,
if not hosts[attr.to] then
-- Not a host that we serve
- log("info", "%s tried to connect to %s, which we don't serve", attr.from, attr.to);
+ origin.log("info", "%s tried to connect to %s, which we don't serve", attr.from, attr.to);
origin:close("host-unknown");
return;
end
@@ -64,7 +64,7 @@ module:add_handler({ "s2sin_unauthed", "s2sin" }, "result", xmlns_dialback,
origin.to_host = attr.to;
end
- log("debug", "asking %s if key %s belongs to them", attr.from, stanza[1]);
+ origin.log("debug", "asking %s if key %s belongs to them", attr.from, stanza[1]);
send_s2s(attr.to, attr.from,
st.stanza("db:verify", { from = attr.to, to = attr.from, id = origin.streamid }):text(stanza[1]));
end);