diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_dialback.lua | 14 | ||||
| -rw-r--r-- | plugins/mod_saslauth.lua | 23 |
2 files changed, 21 insertions, 16 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); diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index f7b30aab..f27d8060 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -21,7 +21,7 @@ local jid_split = require "util.jid".split local md5 = require "util.hashes".md5; local config = require "core.configmanager"; -local log = require "util.logger".init("mod_saslauth"); +local log = module._log; local xmlns_sasl ='urn:ietf:params:xml:ns:xmpp-sasl'; local xmlns_bind ='urn:ietf:params:xml:ns:xmpp-bind'; @@ -32,16 +32,16 @@ local new_sasl = require "util.sasl".new; local function build_reply(status, ret, err_msg) local reply = st.stanza(status, {xmlns = xmlns_sasl}); if status == "challenge" then - log("debug", ret or ""); + log("debug", "%s", ret or ""); reply:text(base64.encode(ret or "")); elseif status == "failure" then reply:tag(ret):up(); if err_msg then reply:tag("text"):text(err_msg); end elseif status == "success" then - log("debug", ret or ""); + log("debug", "%s", ret or ""); reply:text(base64.encode(ret or "")); else - error("Unknown sasl status: "..status); + module:log("error", "Unknown sasl status: %s", status); end return reply; end @@ -50,7 +50,12 @@ local function handle_status(session, status) if status == "failure" then session.sasl_handler = nil; elseif status == "success" then - if not session.sasl_handler.username then error("SASL succeeded but we didn't get a username!"); end -- TODO move this to sessionmanager + if not session.sasl_handler.username then -- TODO move this to sessionmanager + module:log("warn", "SASL succeeded but we didn't get a username!"); + session.sasl_handler = nil; + session:reset_stream(); + return; + end sm_make_authenticated(session, session.sasl_handler.username); session.sasl_handler = nil; session:reset_stream(); @@ -89,7 +94,7 @@ local function sasl_handler(session, stanza) local text = stanza[1]; if text then text = base64.decode(text); - log("debug", text); + log("debug", "%s", text); if not text then session.sasl_handler = nil; session.send(build_reply("failure", "incorrect-encoding")); @@ -99,7 +104,7 @@ local function sasl_handler(session, stanza) local status, ret, err_msg = session.sasl_handler:feed(text); handle_status(session, status); local s = build_reply(status, ret, err_msg); - log("debug", "sasl reply: "..tostring(s)); + log("debug", "sasl reply: %s", tostring(s)); session.send(s); end @@ -130,7 +135,7 @@ module:add_event_hook("stream-features", module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind", function (session, stanza) - log("debug", "Client tried to bind to a resource"); + log("debug", "Client requesting a resource bind"); local resource; if stanza.attr.type == "set" then local bind = stanza.tags[1]; @@ -153,6 +158,6 @@ module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind", module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-session", function (session, stanza) - log("debug", "Client tried to bind to a resource"); + log("debug", "Client requesting a session"); session.send(st.reply(stanza)); end); |