diff options
author | Matthew Wild <mwild1@gmail.com> | 2008-12-05 05:23:42 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2008-12-05 05:23:42 +0000 |
commit | 7c9f4818c3558c260b2f37df92371c1b33a3b121 (patch) | |
tree | ff8caf06849642257e1664d30d19aefa428179bb /plugins/mod_dialback.lua | |
parent | ffd26762181bfbbd870e91ae39ac77876f9e5382 (diff) | |
download | prosody-7c9f4818c3558c260b2f37df92371c1b33a3b121.tar.gz prosody-7c9f4818c3558c260b2f37df92371c1b33a3b121.zip |
Remove an incorrect line which I didn't add, and fix the proper way. Corrects the sending of stanzas over unauthed s2sout's. Also fixes mod_dialback to send stanzas and not strings.
Diffstat (limited to 'plugins/mod_dialback.lua')
-rw-r--r-- | plugins/mod_dialback.lua | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua index ea0f9e91..4b3a970d 100644 --- a/plugins/mod_dialback.lua +++ b/plugins/mod_dialback.lua @@ -24,6 +24,8 @@ local send_s2s = require "core.s2smanager".send_to_host; local s2s_make_authenticated = require "core.s2smanager".make_authenticated; local s2s_verify_dialback = require "core.s2smanager".verify_dialback; +local st = require "util.stanza"; + local log = require "util.logger".init("mod_dialback"); local xmlns_dialback = "jabber:server:dialback"; @@ -42,7 +44,7 @@ module:add_handler({"s2sin_unauthed", "s2sin"}, "verify", xmlns_dialback, type = "invalid" log("warn", "Asked to verify a dialback key that was incorrect. An imposter is claiming to be %s?", attr.to); end - log("debug", "verifyied dialback key... it is %s", type); + log("debug", "verified dialback key... it is %s", type); origin.sends2s(format("<db:verify from='%s' to='%s' id='%s' type='%s'>%s</db:verify>", attr.to, attr.from, attr.id, type, stanza[1])); end); @@ -57,8 +59,7 @@ module:add_handler("s2sin_unauthed", "result", xmlns_dialback, origin.dialback_key = stanza[1]; log("debug", "asking %s if key %s belongs to them", origin.from_host, origin.dialback_key); send_s2s(origin.to_host, origin.from_host, - format("<db:verify from='%s' to='%s' id='%s'>%s</db:verify>", origin.to_host, origin.from_host, - origin.streamid, origin.dialback_key)); + st.stanza("db:verify", { from = origin.to_host, to = origin.from_host, id = origin.streamid }):text(origin.dialback_key)); hosts[origin.to_host].s2sout[origin.from_host].dialback_verifying = origin; end); |