aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/stanza_dispatch.lua71
-rw-r--r--core/xmlhandlers.lua92
2 files changed, 143 insertions, 20 deletions
diff --git a/core/stanza_dispatch.lua b/core/stanza_dispatch.lua
index b7428ecd..e392b5ba 100644
--- a/core/stanza_dispatch.lua
+++ b/core/stanza_dispatch.lua
@@ -12,14 +12,17 @@ function init_stanza_dispatcher(session)
local session_log = session.log;
local log = function (type, msg) session_log(type, "stanza_dispatcher", msg); end
local send = session.send;
-
-
+ local send_to;
+ do
+ local _send_to = session.send_to;
+ send_to = function (...) _send_to(session, ...); end
+ end
iq_handlers["jabber:iq:auth"] =
function (stanza)
- local username = stanza[1]:child_with_name("username");
- local password = stanza[1]:child_with_name("password");
- local resource = stanza[1]:child_with_name("resource");
+ local username = stanza.tags[1]:child_with_name("username");
+ local password = stanza.tags[1]:child_with_name("password");
+ local resource = stanza.tags[1]:child_with_name("resource");
if not (username and password and resource) then
local reply = st.reply(stanza);
send(reply:query("jabber:iq:auth")
@@ -78,24 +81,52 @@ function init_stanza_dispatcher(session)
return function (stanza)
log("info", "--> "..tostring(stanza));
- if stanza.name == "iq" then
- if not stanza[1] then log("warn", "<iq> without child is invalid"); return; end
- if not stanza.attr.id then log("warn", "<iq> without id attribute is invalid"); end
- local xmlns = stanza[1].attr.xmlns;
- if not xmlns then log("warn", "Child of <iq> has no xmlns - invalid"); return; end
- if (((not stanza.attr.to) or stanza.attr.to == session.host or stanza.attr.to:match("@[^/]+$")) and (stanza.attr.type == "get" or stanza.attr.type == "set")) then -- Stanza sent to us
- if iq_handlers[xmlns] then
- if iq_handlers[xmlns](stanza) then return; end;
+ if (not stanza.attr.to) or (hosts[stanza.attr.to] and hosts[stanza.attr.to].type == "local") then
+ if stanza.name == "iq" then
+ if not stanza.tags[1] then log("warn", "<iq> without child is invalid"); return; end
+ if not stanza.attr.id then log("warn", "<iq> without id attribute is invalid"); end
+ local xmlns = (stanza.tags[1].attr and stanza.tags[1].attr.xmlns) or nil;
+ if not xmlns then log("warn", "Child of <iq> has no xmlns - invalid"); return; end
+ if (((not stanza.attr.to) or stanza.attr.to == session.host or stanza.attr.to:match("@[^/]+$")) and (stanza.attr.type == "get" or stanza.attr.type == "set")) then -- Stanza sent to us
+ if iq_handlers[xmlns] then
+ if iq_handlers[xmlns](stanza) then return; end;
+ end
+ log("warn", "Unhandled namespace: "..xmlns);
+ send(format("<iq type='error' id='%s'><error type='cancel'><service-unavailable/></error></iq>", stanza.attr.id));
+ return;
+ end
+ elseif stanza.name == "presence" then
+ if session.roster then
+ -- Broadcast presence and probes
+ local broadcast = st.presence({ from = session.username.."@"..session.host.."/"..session.resource });
+ local probe = st.presence { from = broadcast.attr.from, type = "probe" };
+
+ for child in stanza:children() do
+ broadcast:tag(child.name, child.attr);
+ end
+ for contact in pairs(session.roster) do
+ broadcast.attr.to = contact;
+ send_to(contact, broadcast);
+ --local host = jid.host(contact);
+ --if hosts[host] and hosts[host].type == "local" then
+ --local node, host = jid.split(contact);
+ --if host[host].sessions[node]
+ --local pres = st.presence { from = con
+ --else
+ -- probe.attr.to = contact;
+ -- send_to(contact, probe);
+ --end
+ end
+
+ -- Probe for our contacts' presence
end
- log("warn", "Unhandled namespace: "..xmlns);
- send(format("<iq type='error' id='%s'><error type='cancel'><service-unavailable/></error></iq>", stanza.attr.id));
end
-
- end
- -- Need to route stanza
- if stanza.attr.to and ((not hosts[stanza.attr.to]) or hosts[stanza.attr.to].type ~= "local") then
+ else
+ --end
+ --if stanza.attr.to and ((not hosts[stanza.attr.to]) or hosts[stanza.attr.to].type ~= "local") then
+ -- Need to route stanza
stanza.attr.from = session.username.."@"..session.host;
- session.send_to(stanza.attr.to, stanza);
+ session:send_to(stanza.attr.to, stanza);
end
end
diff --git a/core/xmlhandlers.lua b/core/xmlhandlers.lua
new file mode 100644
index 00000000..4d536ce3
--- /dev/null
+++ b/core/xmlhandlers.lua
@@ -0,0 +1,92 @@
+
+require "util.stanza"
+
+local st = stanza;
+local tostring = tostring;
+local format = string.format;
+local m_random = math.random;
+local t_insert = table.insert;
+local t_remove = table.remove;
+local t_concat = table.concat;
+local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end
+
+local error = error;
+
+module "xmlhandlers"
+
+function init_xmlhandlers(session)
+ local ns_stack = { "" };
+ local curr_ns = "";
+ local curr_tag;
+ local chardata = {};
+ local xml_handlers = {};
+ local log = session.log;
+ local print = function (...) log("info", "xmlhandlers", t_concatall({...}, "\t")); end
+
+ local send = session.send;
+
+ local stanza
+ function xml_handlers:StartElement(name, attr)
+ if stanza and #chardata > 0 then
+ stanza:text(t_concat(chardata));
+ print("Char data:", t_concat(chardata));
+ chardata = {};
+ end
+ curr_ns,name = name:match("^(.+):(%w+)$");
+ print("Tag received:", name, tostring(curr_ns));
+ if not stanza then
+ if session.notopen then
+ if name == "stream" then
+ session.host = attr.to or error("Client failed to specify destination hostname");
+ session.version = attr.version or 0;
+ session.streamid = m_random(1000000, 99999999);
+ print(session, session.host, "Client opened stream");
+ send("<?xml version='1.0'?>");
+ send(format("<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' id='%s' from='%s' >", session.streamid, session.host));
+ --send("<stream:features>");
+ --send("<mechanism>PLAIN</mechanism>");
+ --send [[<register xmlns="http://jabber.org/features/iq-register"/> ]]
+ --send("</stream:features>");
+ log("info", "core", "Stream opened successfully");
+ session.notopen = nil;
+ return;
+ end
+ error("Client failed to open stream successfully");
+ end
+ if name ~= "iq" and name ~= "presence" and name ~= "message" then
+ error("Client sent invalid top-level stanza");
+ end
+ stanza = st.stanza(name, { to = attr.to, type = attr.type, id = attr.id, xmlns = curr_ns });
+ curr_tag = stanza;
+ else
+ attr.xmlns = curr_ns;
+ stanza:tag(name, attr);
+ end
+ end
+ function xml_handlers:CharacterData(data)
+ if stanza then
+ t_insert(chardata, data);
+ end
+ end
+ function xml_handlers:EndElement(name)
+ curr_ns,name = name:match("^(.+):(%w+)$");
+ --print("<"..name.."/>", tostring(stanza), tostring(#stanza.last_add < 1), tostring(stanza.last_add[#stanza.last_add].name));
+ if (not stanza) or #stanza.last_add < 0 or (#stanza.last_add > 0 and name ~= stanza.last_add[#stanza.last_add].name) then error("XML parse error in client stream"); end
+ if stanza and #chardata > 0 then
+ stanza:text(t_concat(chardata));
+ print("Char data:", t_concat(chardata));
+ chardata = {};
+ end
+ -- Complete stanza
+ print(name, tostring(#stanza.last_add));
+ if #stanza.last_add == 0 then
+ session.stanza_dispatch(stanza);
+ stanza = nil;
+ else
+ stanza:up();
+ end
+ end
+ return xml_handlers;
+end
+
+return init_xmlhandlers;