Software / code / prosody
Changeset
6374:f1dd1716aa9d
mod_dialback: Move d-w-d after to/from validation
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 01 Sep 2014 20:20:05 +0200 |
| parents | 6373:84e7e418c29a |
| children | 6375:76d8907d5301 |
| files | plugins/mod_dialback.lua |
| diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_dialback.lua Fri Aug 29 02:24:49 2014 +0200 +++ b/plugins/mod_dialback.lua Mon Sep 01 20:20:05 2014 +0200 @@ -82,6 +82,15 @@ 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 @@ 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;
