Software / code / prosody
Annotate
core/xmlhandlers.lua @ 1132:3a63efe285c2
Default config: Add 'presence' to list of modules
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 07 May 2009 19:37:54 +0100 |
| parent | 1051:0327c569eb1a |
| child | 1153:1184cb19b6f2 |
| rev | line source |
|---|---|
| 896 | 1 -- Prosody IM v0.4 |
|
760
90ce865eebd8
Update copyright notices for 2009
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
2 -- Copyright (C) 2008-2009 Matthew Wild |
|
90ce865eebd8
Update copyright notices for 2009
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
3 -- Copyright (C) 2008-2009 Waqas Hussain |
|
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
355
diff
changeset
|
4 -- |
| 758 | 5 -- This project is MIT/X11 licensed. Please see the |
| 6 -- COPYING file in the source package for more information. | |
|
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
355
diff
changeset
|
7 -- |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
355
diff
changeset
|
8 |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
355
diff
changeset
|
9 |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
10 |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
11 require "util.stanza" |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
12 |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
13 local st = stanza; |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
14 local tostring = tostring; |
| 148 | 15 local pairs = pairs; |
| 16 local ipairs = ipairs; | |
| 17 local type = type; | |
| 18 local print = print; | |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
19 local format = string.format; |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
20 local m_random = math.random; |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
21 local t_insert = table.insert; |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
22 local t_remove = table.remove; |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
23 local t_concat = table.concat; |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
24 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 |
|
53
14ea0fe6ca86
Session destruction fixes, some debugging code while we fix the rest. Also change logger to be more useful.
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
25 local sm_destroy_session = import("core.sessionmanager", "destroy_session"); |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
26 |
| 145 | 27 local default_log = require "util.logger".init("xmlhandlers"); |
| 28 | |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
29 local error = error; |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
30 |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
31 module "xmlhandlers" |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
32 |
| 148 | 33 local ns_prefixes = { |
| 34 ["http://www.w3.org/XML/1998/namespace"] = "xml"; | |
| 35 } | |
| 36 | |
| 331 | 37 function init_xmlhandlers(session, stream_callbacks) |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
38 local ns_stack = { "" }; |
|
625
cad4dcfbf295
Change xmlhandlers to match stream opening tag with ns+tag
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
39 local curr_ns, name = ""; |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
40 local curr_tag; |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
41 local chardata = {}; |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
42 local xml_handlers = {}; |
| 145 | 43 local log = session.log or default_log; |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
44 |
| 331 | 45 local cb_streamopened = stream_callbacks.streamopened; |
| 46 local cb_streamclosed = stream_callbacks.streamclosed; | |
|
557
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
47 local cb_error = stream_callbacks.error or function (session, e) error("XML stream error: "..tostring(e)); end; |
|
545
60002993be04
Abstract xmlhandlers a bit more, also add error callbacks
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
48 local cb_handlestanza = stream_callbacks.handlestanza; |
| 331 | 49 |
|
625
cad4dcfbf295
Change xmlhandlers to match stream opening tag with ns+tag
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
50 local stream_tag = stream_callbacks.stream_tag; |
|
899
b95368f199a1
core.xmlhandlers: Filter out default stream namespace from stanzas
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
51 local stream_default_ns = stream_callbacks.default_ns; |
|
557
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
52 |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
53 local stanza |
|
625
cad4dcfbf295
Change xmlhandlers to match stream opening tag with ns+tag
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
54 function xml_handlers:StartElement(tagname, attr) |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
55 if stanza and #chardata > 0 then |
|
31
aaccbf07849b
Remove now useless debug output
Matthew Wild <mwild1@gmail.com>
parents:
20
diff
changeset
|
56 -- We have some character data in the buffer |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
57 stanza:text(t_concat(chardata)); |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
58 chardata = {}; |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
59 end |
|
1051
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
60 local curr_ns,name = tagname:match("^(.-)|?([^%|]-)$"); |
|
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
61 if not name then |
|
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
62 curr_ns, name = "", curr_ns; |
|
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
63 end |
|
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
64 |
|
899
b95368f199a1
core.xmlhandlers: Filter out default stream namespace from stanzas
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
65 if curr_ns ~= stream_default_ns then |
| 148 | 66 attr.xmlns = curr_ns; |
| 67 end | |
| 68 | |
| 69 -- FIXME !!!!! | |
| 70 for i, k in ipairs(attr) do | |
| 71 if type(k) == "string" then | |
| 72 local ns, nm = k:match("^([^|]+)|?([^|]-)$") | |
| 73 if ns and nm then | |
| 74 ns = ns_prefixes[ns]; | |
| 75 if ns then | |
| 76 attr[ns..":"..nm] = attr[k]; | |
| 77 attr[i] = ns..":"..nm; | |
| 78 attr[k] = nil; | |
| 79 end | |
| 80 end | |
| 81 end | |
| 82 end | |
| 145 | 83 |
| 84 if not stanza then --if we are not currently inside a stanza | |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
85 if session.notopen then |
|
625
cad4dcfbf295
Change xmlhandlers to match stream opening tag with ns+tag
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
86 if tagname == stream_tag then |
|
341
a9e02b5c58d2
Don't error if streamopened/streamclosed callback is not specified for a session
Matthew Wild <mwild1@gmail.com>
parents:
334
diff
changeset
|
87 if cb_streamopened then |
|
a9e02b5c58d2
Don't error if streamopened/streamclosed callback is not specified for a session
Matthew Wild <mwild1@gmail.com>
parents:
334
diff
changeset
|
88 cb_streamopened(session, attr); |
|
a9e02b5c58d2
Don't error if streamopened/streamclosed callback is not specified for a session
Matthew Wild <mwild1@gmail.com>
parents:
334
diff
changeset
|
89 end |
|
545
60002993be04
Abstract xmlhandlers a bit more, also add error callbacks
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
90 else |
|
60002993be04
Abstract xmlhandlers a bit more, also add error callbacks
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
91 -- Garbage before stream? |
|
557
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
92 cb_error(session, "no-stream"); |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
93 end |
|
545
60002993be04
Abstract xmlhandlers a bit more, also add error callbacks
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
94 return; |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
95 end |
| 38 | 96 if curr_ns == "jabber:client" and name ~= "iq" and name ~= "presence" and name ~= "message" then |
|
557
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
97 cb_error(session, "invalid-top-level-element"); |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
98 end |
| 145 | 99 |
| 331 | 100 stanza = st.stanza(name, attr); |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
101 curr_tag = stanza; |
| 145 | 102 else -- we are inside a stanza, so add a tag |
| 148 | 103 attr.xmlns = nil; |
|
899
b95368f199a1
core.xmlhandlers: Filter out default stream namespace from stanzas
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
104 if curr_ns ~= stream_default_ns then |
| 148 | 105 attr.xmlns = curr_ns; |
| 106 end | |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
107 stanza:tag(name, attr); |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
108 end |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
109 end |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
110 function xml_handlers:CharacterData(data) |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
111 if stanza then |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
112 t_insert(chardata, data); |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
113 end |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
114 end |
|
625
cad4dcfbf295
Change xmlhandlers to match stream opening tag with ns+tag
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
115 function xml_handlers:EndElement(tagname) |
|
1051
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
116 curr_ns,name = tagname:match("^(.-)|?([^%|]-)$"); |
|
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
117 if not name then |
|
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
118 curr_ns, name = "", curr_ns; |
|
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
119 end |
|
334
bffd80e8c7a3
*ahem* Yes, move along please... though really, quite a classic. :)
Matthew Wild <mwild1@gmail.com>
parents:
331
diff
changeset
|
120 if (not stanza) or (#stanza.last_add > 0 and name ~= stanza.last_add[#stanza.last_add].name) then |
|
625
cad4dcfbf295
Change xmlhandlers to match stream opening tag with ns+tag
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
121 if tagname == stream_tag then |
|
341
a9e02b5c58d2
Don't error if streamopened/streamclosed callback is not specified for a session
Matthew Wild <mwild1@gmail.com>
parents:
334
diff
changeset
|
122 if cb_streamclosed then |
|
a9e02b5c58d2
Don't error if streamopened/streamclosed callback is not specified for a session
Matthew Wild <mwild1@gmail.com>
parents:
334
diff
changeset
|
123 cb_streamclosed(session); |
|
a9e02b5c58d2
Don't error if streamopened/streamclosed callback is not specified for a session
Matthew Wild <mwild1@gmail.com>
parents:
334
diff
changeset
|
124 end |
|
53
14ea0fe6ca86
Session destruction fixes, some debugging code while we fix the rest. Also change logger to be more useful.
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
125 return; |
| 145 | 126 elseif name == "error" then |
|
557
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
127 cb_error(session, "stream-error", stanza); |
|
53
14ea0fe6ca86
Session destruction fixes, some debugging code while we fix the rest. Also change logger to be more useful.
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
128 else |
|
557
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
129 cb_error(session, "parse-error", "unexpected-element-close", name); |
|
53
14ea0fe6ca86
Session destruction fixes, some debugging code while we fix the rest. Also change logger to be more useful.
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
130 end |
|
14ea0fe6ca86
Session destruction fixes, some debugging code while we fix the rest. Also change logger to be more useful.
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
131 end |
|
838
1035846d6273
core.xmlhandlers: Optimise completed stanza logic
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
132 if stanza then |
|
844
503ca8da1000
core.xmlhandlers: Remove redundant check in condition
Matthew Wild <mwild1@gmail.com>
parents:
838
diff
changeset
|
133 if #chardata > 0 then |
|
838
1035846d6273
core.xmlhandlers: Optimise completed stanza logic
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
134 -- We have some character data in the buffer |
|
1035846d6273
core.xmlhandlers: Optimise completed stanza logic
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
135 stanza:text(t_concat(chardata)); |
|
1035846d6273
core.xmlhandlers: Optimise completed stanza logic
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
136 chardata = {}; |
|
1035846d6273
core.xmlhandlers: Optimise completed stanza logic
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
137 end |
|
1035846d6273
core.xmlhandlers: Optimise completed stanza logic
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
138 -- Complete stanza |
|
1035846d6273
core.xmlhandlers: Optimise completed stanza logic
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
139 if #stanza.last_add == 0 then |
|
1035846d6273
core.xmlhandlers: Optimise completed stanza logic
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
140 cb_handlestanza(session, stanza); |
|
1035846d6273
core.xmlhandlers: Optimise completed stanza logic
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
141 stanza = nil; |
|
1035846d6273
core.xmlhandlers: Optimise completed stanza logic
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
142 else |
|
1035846d6273
core.xmlhandlers: Optimise completed stanza logic
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
143 stanza:up(); |
|
1035846d6273
core.xmlhandlers: Optimise completed stanza logic
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
144 end |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
145 end |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
146 end |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
147 return xml_handlers; |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
148 end |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
149 |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
150 return init_xmlhandlers; |