Annotate

util/stanza.lua @ 89:081e920dc74e

Fixed: incorrect auth check
author Waqas Hussain <waqas20@gmail.com>
date Thu, 09 Oct 2008 03:40:16 +0500
parent 70:a6c00467a3f8
child 90:da468ed49a7b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
236375777f8c Some docs written by Thorns. Need reviewing.
bt@silverblade
parents: 6
diff changeset
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;
4
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
9 local s_gsub = string.gsub;
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
10 module "stanza"
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
11
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
12 stanza_mt = {};
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
13 stanza_mt.__index = stanza_mt;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
14
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
15 function stanza(name, attr)
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
16 local stanza = { name = name, attr = attr or {}, tags = {}, last_add = {}};
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
17 return setmetatable(stanza, stanza_mt);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
18 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
19
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
20 function stanza_mt:query(xmlns)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
21 return self:tag("query", { xmlns = xmlns });
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
22 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
23 function stanza_mt:tag(name, attrs)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
24 local s = stanza(name, attrs);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
25 (self.last_add[#self.last_add] or self):add_child(s);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
26 t_insert(self.last_add, s);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
27 return self;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
28 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
29
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
30 function stanza_mt:text(text)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
31 (self.last_add[#self.last_add] or self):add_child(text);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
32 return self;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
33 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
34
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
35 function stanza_mt:up()
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
36 t_remove(self.last_add);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
37 return self;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
38 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
39
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
40 function stanza_mt:add_child(child)
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
41 if type(child) == "table" then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
42 t_insert(self.tags, child);
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
43 end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
44 t_insert(self, child);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
45 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
46
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
47 function stanza_mt:child_with_name(name)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
48 for _, child in ipairs(self) do
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
49 if child.name == name then return child; end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
50 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
51 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
52
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
53 function stanza_mt:children()
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
54 local i = 0;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
55 return function (a)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
56 i = i + 1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
57 local v = a[i]
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
58 if v then return v; end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
59 end, self, i;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
60
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
61 end
2
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
62 function stanza_mt:childtags()
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
63 local i = 0;
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
64 return function (a)
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
65 i = i + 1
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
66 local v = self.tags[i]
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
67 if v then return v; end
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
68 end, self.tags[1], i;
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
69
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
70 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
71
4
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
72 do
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
73 local xml_entities = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
74 function xml_escape(s) return s_gsub(s, "['&<>\"]", xml_entities); end
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
75 end
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
76
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
77 local xml_escape = xml_escape;
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
78
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
79 function stanza_mt.__tostring(t)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
80 local children_text = "";
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
81 for n, child in ipairs(t) do
4
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
82 if type(child) == "string" then
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
83 children_text = children_text .. xml_escape(child);
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
84 else
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
85 children_text = children_text .. tostring(child);
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
86 end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
87 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
88
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
89 local attr_string = "";
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
90 if t.attr then
23
236375777f8c Some docs written by Thorns. Need reviewing.
bt@silverblade
parents: 6
diff changeset
91 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
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
92 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
93
23
236375777f8c Some docs written by Thorns. Need reviewing.
bt@silverblade
parents: 6
diff changeset
94 return s_format("<%s%s>%s</%s>", t.name, attr_string, children_text, t.name);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
95 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
96
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
97 function stanza_mt.__add(s1, s2)
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
98 return s1:add_child(s2);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
99 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
100
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
101
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
102 do
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
103 local id = 0;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
104 function new_id()
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
105 id = id + 1;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
106 return "lx"..id;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
107 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
108 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
109
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
110 function message(attr, body)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
111 if not body then
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
112 return stanza("message", attr);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
113 else
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
114 return stanza("message", attr):tag("body"):text(body);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
115 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
116 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
117 function iq(attr)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
118 if attr and not attr.id then attr.id = new_id(); end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
119 return stanza("iq", attr or { id = new_id() });
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
120 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
121
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
122 function reply(orig)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
123 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) });
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
124 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
125
60
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
126 function error_reply(orig, type, condition, message, clone)
70
a6c00467a3f8 Fixed typo in variable name
Waqas Hussain <waqas20@gmail.com>
parents: 62
diff changeset
127 local t = reply(orig);
60
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
128 t.attr.type = "error";
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
129 -- TODO use clone
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
130 t:tag("error", {type = type})
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
131 :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
132 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
133 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
134 end
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
135
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
136 function presence(attr)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
137 return stanza("presence", attr);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
138 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
139
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents: 23
diff changeset
140 return _M;