aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-09-01 20:20:05 +0200
committerKim Alvefur <zash@zash.se>2014-09-01 20:20:05 +0200
commitc2d718c06a1a178167ccf8c2dc4b865dc41b537e (patch)
treebffdbef6284cf931ecb7cec0e0d3a536a4b237bc
parent899b61ad0f1995e087c6b335d64c2e2d4b7efacc (diff)
downloadprosody-c2d718c06a1a178167ccf8c2dc4b865dc41b537e.tar.gz
prosody-c2d718c06a1a178167ccf8c2dc4b865dc41b537e.zip
mod_dialback: Move d-w-d after to/from validation
-rw-r--r--plugins/mod_dialback.lua18
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index 2584299c..4c5e3e44 100644
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -82,6 +82,15 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
local attr = stanza.attr;
local to, from = nameprep(attr.to), nameprep(attr.from);
+ if not hosts[to] then
+ -- Not a host that we serve
+ origin.log("warn", "%s tried to connect to %s, which we don't serve", from, to);
+ origin:close("host-unknown");
+ return true;
+ elseif not from then
+ origin:close("improper-addressing");
+ end
+
if dwd and origin.secure then
if check_cert_status(origin, from) == false then
return
@@ -92,15 +101,6 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
end
end
- if not hosts[to] then
- -- Not a host that we serve
- origin.log("warn", "%s tried to connect to %s, which we don't serve", from, to);
- origin:close("host-unknown");
- return true;
- elseif not from then
- origin:close("improper-addressing");
- end
-
origin.hosts[from] = { dialback_key = stanza[1] };
dialback_requests[from.."/"..origin.streamid] = origin;