Software /
code /
prosody
Annotate
util/stanza.lua @ 91:6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
author | Waqas Hussain <waqas20@gmail.com> |
---|---|
date | Thu, 09 Oct 2008 22:19:35 +0500 |
parent | 90:da468ed49a7b |
child | 145:fbb3a4ff9cf1 |
rev | line source |
---|---|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
1 local t_insert = table.insert; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
2 local t_remove = table.remove; |
23 | 3 local s_format = string.format; |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
4 local tostring = tostring; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
5 local setmetatable = setmetatable; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
6 local pairs = pairs; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
7 local ipairs = ipairs; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
8 local type = type; |
90
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
9 local unpack = unpack; |
4 | 10 local s_gsub = string.gsub; |
0 | 11 module "stanza" |
12 | |
13 stanza_mt = {}; | |
14 stanza_mt.__index = stanza_mt; | |
15 | |
16 function stanza(name, attr) | |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
17 local stanza = { name = name, attr = attr or {}, tags = {}, last_add = {}}; |
0 | 18 return setmetatable(stanza, stanza_mt); |
19 end | |
20 | |
21 function stanza_mt:query(xmlns) | |
22 return self:tag("query", { xmlns = xmlns }); | |
23 end | |
24 function stanza_mt:tag(name, attrs) | |
25 local s = stanza(name, attrs); | |
26 (self.last_add[#self.last_add] or self):add_child(s); | |
27 t_insert(self.last_add, s); | |
28 return self; | |
29 end | |
30 | |
31 function stanza_mt:text(text) | |
32 (self.last_add[#self.last_add] or self):add_child(text); | |
33 return self; | |
34 end | |
35 | |
36 function stanza_mt:up() | |
37 t_remove(self.last_add); | |
38 return self; | |
39 end | |
40 | |
41 function stanza_mt:add_child(child) | |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
42 if type(child) == "table" then |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
43 t_insert(self.tags, child); |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
44 end |
0 | 45 t_insert(self, child); |
46 end | |
47 | |
48 function stanza_mt:child_with_name(name) | |
49 for _, child in ipairs(self) do | |
50 if child.name == name then return child; end | |
51 end | |
52 end | |
53 | |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
54 function stanza_mt:children() |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
55 local i = 0; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
56 return function (a) |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
57 i = i + 1 |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
58 local v = a[i] |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
59 if v then return v; end |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
60 end, self, i; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
61 |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
62 end |
2 | 63 function stanza_mt:childtags() |
64 local i = 0; | |
65 return function (a) | |
66 i = i + 1 | |
67 local v = self.tags[i] | |
68 if v then return v; end | |
69 end, self.tags[1], i; | |
70 | |
71 end | |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
72 |
4 | 73 do |
74 local xml_entities = { ["'"] = "'", ["\""] = """, ["<"] = "<", [">"] = ">", ["&"] = "&" }; | |
75 function xml_escape(s) return s_gsub(s, "['&<>\"]", xml_entities); end | |
76 end | |
77 | |
78 local xml_escape = xml_escape; | |
79 | |
0 | 80 function stanza_mt.__tostring(t) |
81 local children_text = ""; | |
82 for n, child in ipairs(t) do | |
4 | 83 if type(child) == "string" then |
84 children_text = children_text .. xml_escape(child); | |
85 else | |
86 children_text = children_text .. tostring(child); | |
87 end | |
0 | 88 end |
89 | |
90 local attr_string = ""; | |
91 if t.attr then | |
23 | 92 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 |
0 | 93 end |
94 | |
23 | 95 return s_format("<%s%s>%s</%s>", t.name, attr_string, children_text, t.name); |
0 | 96 end |
97 | |
98 function stanza_mt.__add(s1, s2) | |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
99 return s1:add_child(s2); |
0 | 100 end |
101 | |
102 | |
103 do | |
104 local id = 0; | |
105 function new_id() | |
106 id = id + 1; | |
107 return "lx"..id; | |
108 end | |
109 end | |
110 | |
90
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
111 function preserialize(stanza) |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
112 local s = { name = stanza.name, attr = stanza.attr }; |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
113 for _, child in ipairs(stanza) do |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
114 if type(child) == "table" then |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
115 t_insert(s, preserialize(child)); |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
116 else |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
117 t_insert(s, child); |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
118 end |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
119 end |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
120 return s; |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
121 end |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
122 |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
123 function deserialize(stanza) |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
124 -- Set metatable |
91
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
125 if stanza then |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
126 setmetatable(stanza, stanza_mt); |
90
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
127 for _, child in ipairs(stanza) do |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
128 if type(child) == "table" then |
91
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
129 deserialize(child); |
90
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
130 end |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
131 end |
91
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
132 if not stanza.tags then |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
133 -- Rebuild tags |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
134 local tags = {}; |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
135 for _, child in ipairs(stanza) do |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
136 if type(child) == "table" then |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
137 t_insert(tags, child); |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
138 end |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
139 end |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
140 stanza.tags = tags; |
6d66eb6b24cb
Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
90
diff
changeset
|
141 end |
90
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
142 end |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
143 |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
144 return stanza; |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
145 end |
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
146 |
0 | 147 function message(attr, body) |
148 if not body then | |
149 return stanza("message", attr); | |
150 else | |
151 return stanza("message", attr):tag("body"):text(body); | |
152 end | |
153 end | |
154 function iq(attr) | |
155 if attr and not attr.id then attr.id = new_id(); end | |
156 return stanza("iq", attr or { id = new_id() }); | |
157 end | |
158 | |
159 function reply(orig) | |
160 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) }); | |
161 end | |
162 | |
60
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
163 function error_reply(orig, type, condition, message, clone) |
70
a6c00467a3f8
Fixed typo in variable name
Waqas Hussain <waqas20@gmail.com>
parents:
62
diff
changeset
|
164 local t = reply(orig); |
60
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
165 t.attr.type = "error"; |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
166 -- TODO use clone |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
167 t:tag("error", {type = type}) |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
168 :tag(condition, {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up(); |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
169 if (message) then t:tag("text"):text(message):up(); end |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
170 return t; -- stanza ready for adding app-specific errors |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
171 end |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
172 |
0 | 173 function presence(attr) |
174 return stanza("presence", attr); | |
175 end | |
176 | |
90
da468ed49a7b
Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.
Matthew Wild <mwild1@gmail.com>
parents:
70
diff
changeset
|
177 return _M; |