aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-27 20:29:32 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-27 20:29:32 +0100
commit47619af14cd24fcb48b4d2b4c4653f72b882087e (patch)
tree545c5eae31e066012bcda98bcae00e7ec8af2640 /plugins
parent28dfdedc653bd2977eb60e84e2f582e07eb37708 (diff)
downloadprosody-47619af14cd24fcb48b4d2b4c4653f72b882087e.tar.gz
prosody-47619af14cd24fcb48b4d2b4c4653f72b882087e.zip
mod_dialback: Ignore <db:verify/> with a 'type' attribute on incoming connections, instead of interpreting them as a request to verify a key
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_dialback.lua5
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index 73a799e9..69616a57 100644
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -41,6 +41,11 @@ module:hook("stanza/jabber:server:dialback:verify", function(event)
-- We are being asked to verify the key, to ensure it was generated by us
origin.log("debug", "verifying that dialback key is ours...");
local attr = stanza.attr;
+ if attr.type then
+ module:log("warn", "Ignoring incoming session from %s claiming a dialback key for %s is %s",
+ origin.from_host or "(unknown)", attr.from or "(unknown)", attr.type);
+ return true;
+ end
-- COMPAT: 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
local type;