aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/modulemanager.lua1
-rw-r--r--core/stanza_router.lua7
2 files changed, 7 insertions, 1 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 1ad1f990..24708232 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -50,6 +50,7 @@ function loadall()
load("roster");
load("register");
load("tls");
+ load("vcard");
end
function load(name)
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 02e0871f..e6085595 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -16,9 +16,12 @@ local jid_split = jid.split;
function core_process_stanza(origin, stanza)
log("debug", "Received: "..tostring(stanza))
-- TODO verify validity of stanza (as well as JID validity)
+ if stanza.name == "iq" and not(#stanza.tags == 1 and stanza.tags[1].attr.xmlns) then
+ error("Invalid IQ");
+ end
if origin.type == "c2s" and not origin.full_jid
- and not(stanza.name == "iq" and stanza.tags[1] and stanza.tags[1].name == "bind"
+ and not(stanza.name == "iq" and stanza.tags[1].name == "bind"
and stanza.tags[1].attr.xmlns == "urn:ietf:params:xml:ns:xmpp-bind") then
error("Client MUST bind resource after auth");
end
@@ -29,6 +32,8 @@ function core_process_stanza(origin, stanza)
if not to or (hosts[to] and hosts[to].type == "local") then
core_handle_stanza(origin, stanza);
+ elseif to and stanza.name == "iq" and not select(3, jid_split(to)) then
+ core_handle_stanza(origin, stanza);
elseif origin.type == "c2s" then
core_route_stanza(origin, stanza);
end