author | Matthew Wild <mwild1@gmail.com> |
Wed, 01 May 2013 13:54:31 +0100 | |
branch | sasl |
changeset 5555 | 70a7ef4b6aaa |
parent 1523 | 841d61be198f |
child 2037 | a919511c45ac |
permissions | -rw-r--r-- |
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1414
diff
changeset
|
1 |
-- Prosody IM |
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; |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
17 |
local t_insert = table.insert; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
18 |
local t_concat = table.concat; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
19 |
|
145 | 20 |
local default_log = require "util.logger".init("xmlhandlers"); |
21 |
||
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
22 |
local error = error; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
23 |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
24 |
module "xmlhandlers" |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
25 |
|
148 | 26 |
local ns_prefixes = { |
27 |
["http://www.w3.org/XML/1998/namespace"] = "xml"; |
|
28 |
} |
|
29 |
||
331 | 30 |
function init_xmlhandlers(session, stream_callbacks) |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
31 |
local ns_stack = { "" }; |
625
cad4dcfbf295
Change xmlhandlers to match stream opening tag with ns+tag
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
32 |
local curr_ns, name = ""; |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
33 |
local curr_tag; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
34 |
local chardata = {}; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
35 |
local xml_handlers = {}; |
145 | 36 |
local log = session.log or default_log; |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
37 |
|
331 | 38 |
local cb_streamopened = stream_callbacks.streamopened; |
39 |
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
|
40 |
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
|
41 |
local cb_handlestanza = stream_callbacks.handlestanza; |
331 | 42 |
|
625
cad4dcfbf295
Change xmlhandlers to match stream opening tag with ns+tag
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
43 |
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
|
44 |
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
|
45 |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
46 |
local stanza |
625
cad4dcfbf295
Change xmlhandlers to match stream opening tag with ns+tag
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
47 |
function xml_handlers:StartElement(tagname, attr) |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
48 |
if stanza and #chardata > 0 then |
31
aaccbf07849b
Remove now useless debug output
Matthew Wild <mwild1@gmail.com>
parents:
20
diff
changeset
|
49 |
-- We have some character data in the buffer |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
50 |
stanza:text(t_concat(chardata)); |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
51 |
chardata = {}; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
52 |
end |
1051
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
53 |
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
|
54 |
if not name then |
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
55 |
curr_ns, name = "", curr_ns; |
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
56 |
end |
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
57 |
|
899
b95368f199a1
core.xmlhandlers: Filter out default stream namespace from stanzas
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
58 |
if curr_ns ~= stream_default_ns then |
148 | 59 |
attr.xmlns = curr_ns; |
60 |
end |
|
61 |
||
62 |
-- FIXME !!!!! |
|
1414
6f653b8beac9
xmlhandlers: Remove numeric attributes
Waqas Hussain <waqas20@gmail.com>
parents:
1155
diff
changeset
|
63 |
for i=1,#attr do |
6f653b8beac9
xmlhandlers: Remove numeric attributes
Waqas Hussain <waqas20@gmail.com>
parents:
1155
diff
changeset
|
64 |
local k = attr[i]; |
6f653b8beac9
xmlhandlers: Remove numeric attributes
Waqas Hussain <waqas20@gmail.com>
parents:
1155
diff
changeset
|
65 |
attr[i] = nil; |
1154
570c0427fcb8
xmlhandlers: Removed an unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1153
diff
changeset
|
66 |
local ns, nm = k:match("^([^|]+)|?([^|]-)$") |
570c0427fcb8
xmlhandlers: Removed an unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1153
diff
changeset
|
67 |
if ns and nm then |
570c0427fcb8
xmlhandlers: Removed an unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1153
diff
changeset
|
68 |
ns = ns_prefixes[ns]; |
570c0427fcb8
xmlhandlers: Removed an unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1153
diff
changeset
|
69 |
if ns then |
570c0427fcb8
xmlhandlers: Removed an unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1153
diff
changeset
|
70 |
attr[ns..":"..nm] = attr[k]; |
570c0427fcb8
xmlhandlers: Removed an unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1153
diff
changeset
|
71 |
attr[k] = nil; |
148 | 72 |
end |
73 |
end |
|
74 |
end |
|
145 | 75 |
|
76 |
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
|
77 |
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
|
78 |
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
|
79 |
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
|
80 |
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
|
81 |
end |
545
60002993be04
Abstract xmlhandlers a bit more, also add error callbacks
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
82 |
else |
60002993be04
Abstract xmlhandlers a bit more, also add error callbacks
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
83 |
-- 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
|
84 |
cb_error(session, "no-stream"); |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
85 |
end |
545
60002993be04
Abstract xmlhandlers a bit more, also add error callbacks
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
86 |
return; |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
87 |
end |
38 | 88 |
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
|
89 |
cb_error(session, "invalid-top-level-element"); |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
90 |
end |
145 | 91 |
|
331 | 92 |
stanza = st.stanza(name, attr); |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
93 |
curr_tag = stanza; |
145 | 94 |
else -- we are inside a stanza, so add a tag |
148 | 95 |
attr.xmlns = nil; |
899
b95368f199a1
core.xmlhandlers: Filter out default stream namespace from stanzas
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
96 |
if curr_ns ~= stream_default_ns then |
148 | 97 |
attr.xmlns = curr_ns; |
98 |
end |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
99 |
stanza:tag(name, attr); |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
100 |
end |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
101 |
end |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
102 |
function xml_handlers:CharacterData(data) |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
103 |
if stanza then |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
104 |
t_insert(chardata, data); |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
105 |
end |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
106 |
end |
625
cad4dcfbf295
Change xmlhandlers to match stream opening tag with ns+tag
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
107 |
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
|
108 |
curr_ns,name = tagname:match("^(.-)|?([^%|]-)$"); |
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
109 |
if not name then |
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
110 |
curr_ns, name = "", curr_ns; |
0327c569eb1a
xmlhandlers: Fix tag pattern again for the default namespace
Matthew Wild <mwild1@gmail.com>
parents:
1003
diff
changeset
|
111 |
end |
334
bffd80e8c7a3
*ahem* Yes, move along please... though really, quite a classic. :)
Matthew Wild <mwild1@gmail.com>
parents:
331
diff
changeset
|
112 |
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
|
113 |
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
|
114 |
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
|
115 |
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
|
116 |
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
|
117 |
return; |
145 | 118 |
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
|
119 |
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
|
120 |
else |
557
c9b3ffb08fe3
Disconnect with stream errors on bad XML, or invalid stream namespace
Matthew Wild <mwild1@gmail.com>
parents:
545
diff
changeset
|
121 |
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
|
122 |
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
|
123 |
end |
1155
a93b25f1528e
xmlhandlers: Removed another unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1154
diff
changeset
|
124 |
if #chardata > 0 then |
a93b25f1528e
xmlhandlers: Removed another unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1154
diff
changeset
|
125 |
-- We have some character data in the buffer |
a93b25f1528e
xmlhandlers: Removed another unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1154
diff
changeset
|
126 |
stanza:text(t_concat(chardata)); |
a93b25f1528e
xmlhandlers: Removed another unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1154
diff
changeset
|
127 |
chardata = {}; |
a93b25f1528e
xmlhandlers: Removed another unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1154
diff
changeset
|
128 |
end |
a93b25f1528e
xmlhandlers: Removed another unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1154
diff
changeset
|
129 |
-- Complete stanza |
a93b25f1528e
xmlhandlers: Removed another unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1154
diff
changeset
|
130 |
if #stanza.last_add == 0 then |
a93b25f1528e
xmlhandlers: Removed another unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1154
diff
changeset
|
131 |
cb_handlestanza(session, stanza); |
a93b25f1528e
xmlhandlers: Removed another unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1154
diff
changeset
|
132 |
stanza = nil; |
a93b25f1528e
xmlhandlers: Removed another unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1154
diff
changeset
|
133 |
else |
a93b25f1528e
xmlhandlers: Removed another unnecessary check
Waqas Hussain <waqas20@gmail.com>
parents:
1154
diff
changeset
|
134 |
stanza:up(); |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
135 |
end |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
136 |
end |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
137 |
return xml_handlers; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
138 |
end |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
139 |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff
changeset
|
140 |
return init_xmlhandlers; |