Making the best attempt out of a bad merge from waqas

[prosody.git] / util / stanza.lua

diff --git a/util/stanza.lua b/util/stanza.lua
index 88d0609f9d26839f88f6a3faf3e39502d38ce17e..6bc70ab91d8cb609e0392b6c69371fc564c977d0 100644 (file)
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -1,30 +1,23 @@
-local t_insert  =   table.insert;
-local t_remove  =   table.remove;
-local format    =  string.format;
-local tostring  =       tostring;
-local setmetatable= setmetatable;
-local pairs     =          pairs;
-local ipairs    =         ipairs;
-
+local t_insert      =  table.insert;
+local t_remove      =  table.remove;
+local s_format      = string.format;
+local tostring      =      tostring;
+local setmetatable  =  setmetatable;
+local pairs         =         pairs;
+local ipairs        =        ipairs;
+local type          =          type;
+local unpack        =        unpack;
+local s_gsub        =   string.gsub;
 module "stanza"
 
 stanza_mt = {};
 stanza_mt.__index = stanza_mt;
 
 function stanza(name, attr)
-       local stanza = { name = name, attr = attr or {}, last_add = {}};
+       local stanza = { name = name, attr = attr or {}, tags = {}, last_add = {}};
        return setmetatable(stanza, stanza_mt);
 end
 
-function stanza_mt:iq(attrs)
-       return self + stanza("iq", attrs)
-end
-function stanza_mt:message(attrs)
-       return self + stanza("message", attrs)
-end
-function stanza_mt:presence(attrs)
-       return self + stanza("presence", attrs)
-end
 function stanza_mt:query(xmlns)
        return self:tag("query", { xmlns = xmlns });
 end
@@ -46,6 +39,9 @@ function stanza_mt:up()
 end
 
 function stanza_mt:add_child(child)
+       if type(child) == "table" then
+               t_insert(self.tags, child);
+       end
        t_insert(self, child);
 end
 
@@ -55,22 +51,52 @@ function stanza_mt:child_with_name(name)
        end
 end
 
+function stanza_mt:children()
+       local i = 0;
+       return function (a)
+                       i = i + 1
+                       local v = a[i]
+                       if v then return v; end
+               end, self, i;
+                                           
+end
+function stanza_mt:childtags()
+       local i = 0;
+       return function (a)
+                       i = i + 1
+                       local v = self.tags[i]
+                       if v then return v; end
+               end, self.tags[1], i;
+                                           
+end
+
+do
+       local xml_entities = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
+       function xml_escape(s) return s_gsub(s, "['&<>\"]", xml_entities); end
+end
+
+local xml_escape = xml_escape;
+
 function stanza_mt.__tostring(t)
        local children_text = "";
        for n, child in ipairs(t) do
-               children_text = children_text .. tostring(child);
+               if type(child) == "string" then 
+                       children_text = children_text .. xml_escape(child);
+               else
+                       children_text = children_text .. tostring(child);
+               end
        end
 
        local attr_string = "";
        if t.attr then
-               for k, v in pairs(t.attr) do attr_string = attr_string .. format(" %s='%s'", k, tostring(v)); end
+               for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, tostring(v)); end end
        end
 
-       return format("<%s%s>%s</%s>", t.name, attr_string, children_text, t.name);
+       return s_format("<%s%s>%s</%s>", t.name, attr_string, children_text, t.name);
 end
 
 function stanza_mt.__add(s1, s2)
-       return s:add_child(s2);
+       return s1:add_child(s2);
 end
 
 
@@ -82,6 +108,42 @@ do
         end
 end
 
+function preserialize(stanza)
+       local s = { name = stanza.name, attr = stanza.attr };
+       for _, child in ipairs(stanza) do
+               if type(child) == "table" then
+                       t_insert(s, preserialize(child));
+               else
+                       t_insert(s, child);
+               end
+       end
+       return s;
+end
+
+function deserialize(stanza)
+       -- Set metatable
+       if stanza then
+               setmetatable(stanza, stanza_mt);
+               for _, child in ipairs(stanza) do
+                       if type(child) == "table" then
+                               deserialize(child);
+                       end
+               end
+               if not stanza.tags then
+                       -- Rebuild tags
+                       local tags = {};
+                       for _, child in ipairs(stanza) do
+                               if type(child) == "table" then
+                                       t_insert(tags, child);
+                               end
+                       end
+                       stanza.tags = tags;
+               end
+       end
+       
+       return stanza;
+end
+
 function message(attr, body)
        if not body then
                return stanza("message", attr);
@@ -98,7 +160,18 @@ function reply(orig)
        return stanza(orig.name, orig.attr and { to = orig.attr.from, from = orig.attr.to, id = orig.attr.id, type = ((orig.name == "iq" and "result") or nil) });
 end
 
+function error_reply(orig, type, condition, message, clone)
+       local t = reply(orig);
+       t.attr.type = "error";
+       -- TODO use clone
+       t:tag("error", {type = type})
+               :tag(condition, {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
+       if (message) then t:tag("text"):text(message):up(); end
+       return t; -- stanza ready for adding app-specific errors
+end
+
 function presence(attr)
        return stanza("presence", attr);
 end
 
+return _M;