projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
55301ab
)
mod_dialback: Move d-w-d after to/from validation
author
Kim Alvefur
<zash@zash.se>
Mon, 1 Sep 2014 18:20:05 +0000
(20:20 +0200)
committer
Kim Alvefur
<zash@zash.se>
Mon, 1 Sep 2014 18:20:05 +0000
(20:20 +0200)
plugins/mod_dialback.lua
patch
|
blob
|
history
diff --git
a/plugins/mod_dialback.lua
b/plugins/mod_dialback.lua
index 2584299c0ff681b01ea974730e25a95c3e9cc62d..4c5e3e4458dfdc9cccfcd8b61ece3f768e57298f 100644
(file)
--- 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);
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
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
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;
origin.hosts[from] = { dialback_key = stanza[1] };
dialback_requests[from.."/"..origin.streamid] = origin;