Software /
code /
prosody
Annotate
util/stanza.lua @ 11545:7b8a482f4efd 0.11
MUC: Add support for advertising muc#roomconfig_allowinvites in room disco#info
The de-facto interpretation of this (undocumented) option is to indicate to
the client whether it is allowed to invite other users to the MUC.
This is differs from the existing option in our config form, which only
controls the behaviour of sending of invites in a members-only MUC (we always
allow invites in open rooms).
Conversations is one client known to use this disco#info item to determine
whether it may send invites.
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Mon, 10 May 2021 17:01:38 +0100 |
parent | 11261:be38ae8fdfa5 |
child | 11264:2cdcf55c6dd5 |
child | 12797:be09ac8300a7 |
rev | line source |
---|---|
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1517
diff
changeset
|
1 -- Prosody IM |
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2848
diff
changeset
|
2 -- Copyright (C) 2008-2010 Matthew Wild |
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2848
diff
changeset
|
3 -- Copyright (C) 2008-2010 Waqas Hussain |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5435
diff
changeset
|
4 -- |
758 | 5 -- This project is MIT/X11 licensed. Please see the |
6 -- COPYING file in the source package for more information. | |
4199
43cf7d96956f
util.stanza: Whitespace fix after merge (complicated)
Matthew Wild <mwild1@gmail.com>
parents:
4184
diff
changeset
|
7 -- |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
373
diff
changeset
|
8 |
1984
f2b1f89e1d7c
util.stanza: Don't add xmlns to tags when serializing if same as the parent tag's xmlns. Should hopefully shut up Gajim once and for all :)
Matthew Wild <mwild1@gmail.com>
parents:
1935
diff
changeset
|
9 |
8626
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
10 local error = error; |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
11 local t_insert = table.insert; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
12 local t_remove = table.remove; |
613
6c09127b50fb
New, faster, stanza serialization
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
13 local t_concat = table.concat; |
23 | 14 local s_format = string.format; |
829
b01fd698495e
util/stanza: Added clone function
Waqas Hussain <waqas20@gmail.com>
parents:
776
diff
changeset
|
15 local s_match = string.match; |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
16 local tostring = tostring; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
17 local setmetatable = setmetatable; |
7750
e58524240b30
util.stanza: Add an is_stanza() function to check if an object is a stanza
Kim Alvefur <zash@zash.se>
parents:
7253
diff
changeset
|
18 local getmetatable = getmetatable; |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
19 local pairs = pairs; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
20 local ipairs = ipairs; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
21 local type = type; |
4 | 22 local s_gsub = string.gsub; |
5424
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
23 local s_sub = string.sub; |
1431
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
24 local s_find = string.find; |
613
6c09127b50fb
New, faster, stanza serialization
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
25 local os = os; |
145 | 26 |
8599
62bfc85a53c8
util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents:
8555
diff
changeset
|
27 local valid_utf8 = require "util.encodings".utf8.valid; |
62bfc85a53c8
util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents:
8555
diff
changeset
|
28 |
262 | 29 local do_pretty_printing = not os.getenv("WINDIR"); |
1932
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
30 local getstyle, getstring; |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
31 if do_pretty_printing then |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
32 local ok, termcolours = pcall(require, "util.termcolours"); |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
33 if ok then |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
34 getstyle, getstring = termcolours.getstyle, termcolours.getstring; |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
35 else |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
36 do_pretty_printing = nil; |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
37 end |
af8cdbb63b13
util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents:
1931
diff
changeset
|
38 end |
262 | 39 |
2955
f807dc244a5b
util.stanza: Fixed a nil global access.
Waqas Hussain <waqas20@gmail.com>
parents:
2923
diff
changeset
|
40 local xmlns_stanzas = "urn:ietf:params:xml:ns:xmpp-stanzas"; |
f807dc244a5b
util.stanza: Fixed a nil global access.
Waqas Hussain <waqas20@gmail.com>
parents:
2923
diff
changeset
|
41 |
6777
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
42 local _ENV = nil; |
8555
4f0f5b49bb03
vairious: Add annotation when an empty environment is set [luacheck]
Kim Alvefur <zash@zash.se>
parents:
8520
diff
changeset
|
43 -- luacheck: std none |
0 | 44 |
8520
e959bc51de75
util.stanza: Change __type to __name as this is used by Lua 5.3 in some error reporting functions
Kim Alvefur <zash@zash.se>
parents:
8382
diff
changeset
|
45 local stanza_mt = { __name = "stanza" }; |
0 | 46 stanza_mt.__index = stanza_mt; |
47 | |
11205
9d1e21c23784
util.stanza: Reject ASCII control characters (fixes #1606)
Kim Alvefur <zash@zash.se>
parents:
9674
diff
changeset
|
48 local function valid_xml_cdata(str, attr) |
9d1e21c23784
util.stanza: Reject ASCII control characters (fixes #1606)
Kim Alvefur <zash@zash.se>
parents:
9674
diff
changeset
|
49 return not s_find(str, attr and "[^\1\9\10\13\20-~\128-\247]" or "[^\9\10\13\20-~\128-\247]"); |
9d1e21c23784
util.stanza: Reject ASCII control characters (fixes #1606)
Kim Alvefur <zash@zash.se>
parents:
9674
diff
changeset
|
50 end |
9d1e21c23784
util.stanza: Reject ASCII control characters (fixes #1606)
Kim Alvefur <zash@zash.se>
parents:
9674
diff
changeset
|
51 |
8626
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
52 local function check_name(name, name_type) |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
53 if type(name) ~= "string" then |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
54 error("invalid "..name_type.." name: expected string, got "..type(name)); |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
55 elseif #name == 0 then |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
56 error("invalid "..name_type.." name: empty string"); |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
57 elseif s_find(name, "[<>& '\"]") then |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
58 error("invalid "..name_type.." name: contains invalid characters"); |
11205
9d1e21c23784
util.stanza: Reject ASCII control characters (fixes #1606)
Kim Alvefur <zash@zash.se>
parents:
9674
diff
changeset
|
59 elseif not valid_xml_cdata(name, name_type == "attribute") then |
9d1e21c23784
util.stanza: Reject ASCII control characters (fixes #1606)
Kim Alvefur <zash@zash.se>
parents:
9674
diff
changeset
|
60 error("invalid "..name_type.." name: contains control characters"); |
8626
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
61 elseif not valid_utf8(name) then |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
62 error("invalid "..name_type.." name: contains invalid utf8"); |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
63 end |
8599
62bfc85a53c8
util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents:
8555
diff
changeset
|
64 end |
8626
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
65 |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
66 local function check_text(text, text_type) |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
67 if type(text) ~= "string" then |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
68 error("invalid "..text_type.." value: expected string, got "..type(text)); |
11261
be38ae8fdfa5
util.stanza: Move misplaced argument to correct place
Kim Alvefur <zash@zash.se>
parents:
11205
diff
changeset
|
69 elseif not valid_xml_cdata(text, false) then |
11205
9d1e21c23784
util.stanza: Reject ASCII control characters (fixes #1606)
Kim Alvefur <zash@zash.se>
parents:
9674
diff
changeset
|
70 error("invalid "..text_type.." value: contains control characters"); |
11261
be38ae8fdfa5
util.stanza: Move misplaced argument to correct place
Kim Alvefur <zash@zash.se>
parents:
11205
diff
changeset
|
71 elseif not valid_utf8(text) then |
8626
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
72 error("invalid "..text_type.." value: contains invalid utf8"); |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
73 end |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
74 end |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
75 |
8599
62bfc85a53c8
util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents:
8555
diff
changeset
|
76 local function check_attr(attr) |
62bfc85a53c8
util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents:
8555
diff
changeset
|
77 if attr ~= nil then |
8626
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
78 if type(attr) ~= "table" then |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
79 error("invalid attributes, expected table got "..type(attr)); |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
80 end |
8599
62bfc85a53c8
util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents:
8555
diff
changeset
|
81 for k, v in pairs(attr) do |
8626
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
82 check_name(k, "attribute"); |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
83 check_text(v, "attribute"); |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
84 if type(v) ~= "string" then |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
85 error("invalid attribute value for '"..k.."': expected string, got "..type(v)); |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
86 elseif not valid_utf8(v) then |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
87 error("invalid attribute value for '"..k.."': contains invalid utf8"); |
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
88 end |
8599
62bfc85a53c8
util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents:
8555
diff
changeset
|
89 end |
62bfc85a53c8
util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents:
8555
diff
changeset
|
90 end |
62bfc85a53c8
util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents:
8555
diff
changeset
|
91 end |
62bfc85a53c8
util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents:
8555
diff
changeset
|
92 |
7256 | 93 local function new_stanza(name, attr, namespaces) |
8626
20532f191f8d
util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents:
8599
diff
changeset
|
94 check_name(name, "tag"); |
8599
62bfc85a53c8
util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents:
8555
diff
changeset
|
95 check_attr(attr); |
6978
30c96a5db360
util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator)
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
96 local stanza = { name = name, attr = attr or {}, namespaces = namespaces, tags = {} }; |
0 | 97 return setmetatable(stanza, stanza_mt); |
98 end | |
99 | |
7750
e58524240b30
util.stanza: Add an is_stanza() function to check if an object is a stanza
Kim Alvefur <zash@zash.se>
parents:
7253
diff
changeset
|
100 local function is_stanza(s) |
e58524240b30
util.stanza: Add an is_stanza() function to check if an object is a stanza
Kim Alvefur <zash@zash.se>
parents:
7253
diff
changeset
|
101 return getmetatable(s) == stanza_mt; |
e58524240b30
util.stanza: Add an is_stanza() function to check if an object is a stanza
Kim Alvefur <zash@zash.se>
parents:
7253
diff
changeset
|
102 end |
e58524240b30
util.stanza: Add an is_stanza() function to check if an object is a stanza
Kim Alvefur <zash@zash.se>
parents:
7253
diff
changeset
|
103 |
0 | 104 function stanza_mt:query(xmlns) |
105 return self:tag("query", { xmlns = xmlns }); | |
106 end | |
373
dd0345edeaf4
Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
338
diff
changeset
|
107 |
dd0345edeaf4
Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
338
diff
changeset
|
108 function stanza_mt:body(text, attr) |
dd0345edeaf4
Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
338
diff
changeset
|
109 return self:tag("body", attr):text(text); |
dd0345edeaf4
Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
338
diff
changeset
|
110 end |
dd0345edeaf4
Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
338
diff
changeset
|
111 |
8645
06c73b010488
util.stanza: Add :text_tag(), a shortcut for adding nodes with text
Kim Alvefur <zash@zash.se>
parents:
8640
diff
changeset
|
112 function stanza_mt:text_tag(name, text, attr, namespaces) |
06c73b010488
util.stanza: Add :text_tag(), a shortcut for adding nodes with text
Kim Alvefur <zash@zash.se>
parents:
8640
diff
changeset
|
113 return self:tag(name, attr, namespaces):text(text):up(); |
06c73b010488
util.stanza: Add :text_tag(), a shortcut for adding nodes with text
Kim Alvefur <zash@zash.se>
parents:
8640
diff
changeset
|
114 end |
06c73b010488
util.stanza: Add :text_tag(), a shortcut for adding nodes with text
Kim Alvefur <zash@zash.se>
parents:
8640
diff
changeset
|
115 |
6978
30c96a5db360
util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator)
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
116 function stanza_mt:tag(name, attr, namespaces) |
7256 | 117 local s = new_stanza(name, attr, namespaces); |
3638
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
118 local last_add = self.last_add; |
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
119 if not last_add then last_add = {}; self.last_add = last_add; end |
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
120 (last_add[#last_add] or self):add_direct_child(s); |
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
121 t_insert(last_add, s); |
0 | 122 return self; |
123 end | |
124 | |
125 function stanza_mt:text(text) | |
8640
8f13ec2ceb06
util.stanza: Allow :text(nil) and :text("") as harmless nops
Matthew Wild <mwild1@gmail.com>
parents:
8626
diff
changeset
|
126 if text ~= nil and text ~= "" then |
8f13ec2ceb06
util.stanza: Allow :text(nil) and :text("") as harmless nops
Matthew Wild <mwild1@gmail.com>
parents:
8626
diff
changeset
|
127 local last_add = self.last_add; |
8f13ec2ceb06
util.stanza: Allow :text(nil) and :text("") as harmless nops
Matthew Wild <mwild1@gmail.com>
parents:
8626
diff
changeset
|
128 (last_add and last_add[#last_add] or self):add_direct_child(text); |
8f13ec2ceb06
util.stanza: Allow :text(nil) and :text("") as harmless nops
Matthew Wild <mwild1@gmail.com>
parents:
8626
diff
changeset
|
129 end |
2482
a1570e371258
util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
130 return self; |
0 | 131 end |
132 | |
133 function stanza_mt:up() | |
3638
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
134 local last_add = self.last_add; |
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
135 if last_add then t_remove(last_add); end |
0 | 136 return self; |
137 end | |
138 | |
964
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
139 function stanza_mt:reset() |
3638
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
140 self.last_add = nil; |
964
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
141 return self; |
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
142 end |
3296db2ad4a0
util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
143 |
180
d8b9a19d70eb
Make add_child() behave as expected. Old add_child() is now add_direct_child()
Matthew Wild <mwild1@gmail.com>
parents:
145
diff
changeset
|
144 function stanza_mt:add_direct_child(child) |
8889
c4e430c69f88
util.stanza: Verify that child tags added are really stanzas (closes #1165)
Kim Alvefur <zash@zash.se>
parents:
8645
diff
changeset
|
145 if is_stanza(child) then |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
146 t_insert(self.tags, child); |
8890
3490bc478804
util.stanza: Verify that other objects added as children are valid strings
Kim Alvefur <zash@zash.se>
parents:
8889
diff
changeset
|
147 t_insert(self, child); |
3490bc478804
util.stanza: Verify that other objects added as children are valid strings
Kim Alvefur <zash@zash.se>
parents:
8889
diff
changeset
|
148 else |
3490bc478804
util.stanza: Verify that other objects added as children are valid strings
Kim Alvefur <zash@zash.se>
parents:
8889
diff
changeset
|
149 check_text(child, "text"); |
3490bc478804
util.stanza: Verify that other objects added as children are valid strings
Kim Alvefur <zash@zash.se>
parents:
8889
diff
changeset
|
150 t_insert(self, child); |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
151 end |
0 | 152 end |
153 | |
180
d8b9a19d70eb
Make add_child() behave as expected. Old add_child() is now add_direct_child()
Matthew Wild <mwild1@gmail.com>
parents:
145
diff
changeset
|
154 function stanza_mt:add_child(child) |
3638
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
155 local last_add = self.last_add; |
6f58a3063c14
util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents:
3502
diff
changeset
|
156 (last_add and last_add[#last_add] or self):add_direct_child(child); |
180
d8b9a19d70eb
Make add_child() behave as expected. Old add_child() is now add_direct_child()
Matthew Wild <mwild1@gmail.com>
parents:
145
diff
changeset
|
157 return self; |
d8b9a19d70eb
Make add_child() behave as expected. Old add_child() is now add_direct_child()
Matthew Wild <mwild1@gmail.com>
parents:
145
diff
changeset
|
158 end |
d8b9a19d70eb
Make add_child() behave as expected. Old add_child() is now add_direct_child()
Matthew Wild <mwild1@gmail.com>
parents:
145
diff
changeset
|
159 |
8998
6bddc90eeb27
util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents:
7750
diff
changeset
|
160 function stanza_mt:remove_children(name, xmlns) |
6bddc90eeb27
util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents:
7750
diff
changeset
|
161 xmlns = xmlns or self.attr.xmlns; |
6bddc90eeb27
util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents:
7750
diff
changeset
|
162 return self:maptags(function (tag) |
6bddc90eeb27
util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents:
7750
diff
changeset
|
163 if (not name or tag.name == name) and tag.attr.xmlns == xmlns then |
6bddc90eeb27
util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents:
7750
diff
changeset
|
164 return nil; |
6bddc90eeb27
util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents:
7750
diff
changeset
|
165 end |
6bddc90eeb27
util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents:
7750
diff
changeset
|
166 return tag; |
6bddc90eeb27
util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents:
7750
diff
changeset
|
167 end); |
6bddc90eeb27
util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents:
7750
diff
changeset
|
168 end |
6bddc90eeb27
util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents:
7750
diff
changeset
|
169 |
2264
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
170 function stanza_mt:get_child(name, xmlns) |
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
171 for _, child in ipairs(self.tags) do |
2482
a1570e371258
util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
172 if (not name or child.name == name) |
2264
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
173 and ((not xmlns and self.attr.xmlns == child.attr.xmlns) |
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
174 or child.attr.xmlns == xmlns) then |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5435
diff
changeset
|
175 |
2264
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
176 return child; |
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
177 end |
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
178 end |
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
179 end |
49580a13f71e
util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns
Matthew Wild <mwild1@gmail.com>
parents:
2077
diff
changeset
|
180 |
4132
ccc16434dbe2
util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step)
Matthew Wild <mwild1@gmail.com>
parents:
3766
diff
changeset
|
181 function stanza_mt:get_child_text(name, xmlns) |
ccc16434dbe2
util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step)
Matthew Wild <mwild1@gmail.com>
parents:
3766
diff
changeset
|
182 local tag = self:get_child(name, xmlns); |
ccc16434dbe2
util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step)
Matthew Wild <mwild1@gmail.com>
parents:
3766
diff
changeset
|
183 if tag then |
ccc16434dbe2
util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step)
Matthew Wild <mwild1@gmail.com>
parents:
3766
diff
changeset
|
184 return tag:get_text(); |
ccc16434dbe2
util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step)
Matthew Wild <mwild1@gmail.com>
parents:
3766
diff
changeset
|
185 end |
ccc16434dbe2
util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step)
Matthew Wild <mwild1@gmail.com>
parents:
3766
diff
changeset
|
186 return nil; |
ccc16434dbe2
util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step)
Matthew Wild <mwild1@gmail.com>
parents:
3766
diff
changeset
|
187 end |
ccc16434dbe2
util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step)
Matthew Wild <mwild1@gmail.com>
parents:
3766
diff
changeset
|
188 |
0 | 189 function stanza_mt:child_with_name(name) |
2482
a1570e371258
util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
190 for _, child in ipairs(self.tags) do |
0 | 191 if child.name == name then return child; end |
192 end | |
193 end | |
194 | |
689
94b043fbaf33
Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children
Matthew Wild <mwild1@gmail.com>
parents:
680
diff
changeset
|
195 function stanza_mt:child_with_ns(ns) |
2482
a1570e371258
util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
196 for _, child in ipairs(self.tags) do |
689
94b043fbaf33
Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children
Matthew Wild <mwild1@gmail.com>
parents:
680
diff
changeset
|
197 if child.attr.xmlns == ns then return child; end |
94b043fbaf33
Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children
Matthew Wild <mwild1@gmail.com>
parents:
680
diff
changeset
|
198 end |
94b043fbaf33
Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children
Matthew Wild <mwild1@gmail.com>
parents:
680
diff
changeset
|
199 end |
94b043fbaf33
Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children
Matthew Wild <mwild1@gmail.com>
parents:
680
diff
changeset
|
200 |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
201 function stanza_mt:children() |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
202 local i = 0; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
203 return function (a) |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
204 i = i + 1 |
3475
0307a3ac3885
util.stanza: Optimisation, remove useless if...then in stanza:children() iterator
Matthew Wild <mwild1@gmail.com>
parents:
3474
diff
changeset
|
205 return a[i]; |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
206 end, self, i; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
207 end |
3474
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
208 |
4168
4919831b5b56
util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents:
4136
diff
changeset
|
209 function stanza_mt:childtags(name, xmlns) |
3474
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
210 local tags = self.tags; |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
211 local start_i, max_i = 1, #tags; |
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
212 return function () |
4168
4919831b5b56
util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents:
4136
diff
changeset
|
213 for i = start_i, max_i do |
4919831b5b56
util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents:
4136
diff
changeset
|
214 local v = tags[i]; |
4919831b5b56
util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents:
4136
diff
changeset
|
215 if (not name or v.name == name) |
4936
92c86e11fd44
util.stanza: Make stanza:childtags() behave like :get_child()
Kim Alvefur <zash@zash.se>
parents:
4749
diff
changeset
|
216 and ((not xmlns and self.attr.xmlns == v.attr.xmlns) |
92c86e11fd44
util.stanza: Make stanza:childtags() behave like :get_child()
Kim Alvefur <zash@zash.se>
parents:
4749
diff
changeset
|
217 or v.attr.xmlns == xmlns) then |
4168
4919831b5b56
util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents:
4136
diff
changeset
|
218 start_i = i+1; |
4919831b5b56
util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents:
4136
diff
changeset
|
219 return v; |
3474
730876bbe4e6
util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents:
2961
diff
changeset
|
220 end |
4168
4919831b5b56
util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents:
4136
diff
changeset
|
221 end |
4919831b5b56
util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents:
4136
diff
changeset
|
222 end; |
2 | 223 end |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
224 |
3477
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
225 function stanza_mt:maptags(callback) |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
226 local tags, curr_tag = self.tags, 1; |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
227 local n_children, n_tags = #self, #tags; |
9217
7df29c5fbb9b
util.stanza + tests: Bail out of loop if we are iterating too far, fixes #981
Matthew Wild <mwild1@gmail.com>
parents:
8999
diff
changeset
|
228 local max_iterations = n_children + 1; |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5435
diff
changeset
|
229 |
3477
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
230 local i = 1; |
5414
efec29eb4cdd
util.stanza: :maptags(): Fixes to make loop more robust on item removal
Matthew Wild <mwild1@gmail.com>
parents:
5090
diff
changeset
|
231 while curr_tag <= n_tags and n_tags > 0 do |
3477
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
232 if self[i] == tags[curr_tag] then |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
233 local ret = callback(self[i]); |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
234 if ret == nil then |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
235 t_remove(self, i); |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
236 t_remove(tags, curr_tag); |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
237 n_children = n_children - 1; |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
238 n_tags = n_tags - 1; |
5414
efec29eb4cdd
util.stanza: :maptags(): Fixes to make loop more robust on item removal
Matthew Wild <mwild1@gmail.com>
parents:
5090
diff
changeset
|
239 i = i - 1; |
efec29eb4cdd
util.stanza: :maptags(): Fixes to make loop more robust on item removal
Matthew Wild <mwild1@gmail.com>
parents:
5090
diff
changeset
|
240 curr_tag = curr_tag - 1; |
3477
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
241 else |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
242 self[i] = ret; |
5435
f56e449a63e3
util.stanza: Use correct index when replacing the tag in .tags (thanks daurnimator)
Matthew Wild <mwild1@gmail.com>
parents:
5424
diff
changeset
|
243 tags[curr_tag] = ret; |
3477
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
244 end |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
245 curr_tag = curr_tag + 1; |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
246 end |
5414
efec29eb4cdd
util.stanza: :maptags(): Fixes to make loop more robust on item removal
Matthew Wild <mwild1@gmail.com>
parents:
5090
diff
changeset
|
247 i = i + 1; |
9217
7df29c5fbb9b
util.stanza + tests: Bail out of loop if we are iterating too far, fixes #981
Matthew Wild <mwild1@gmail.com>
parents:
8999
diff
changeset
|
248 if i > max_iterations then |
7df29c5fbb9b
util.stanza + tests: Bail out of loop if we are iterating too far, fixes #981
Matthew Wild <mwild1@gmail.com>
parents:
8999
diff
changeset
|
249 -- COMPAT: Hopefully temporary guard against #981 while we |
7df29c5fbb9b
util.stanza + tests: Bail out of loop if we are iterating too far, fixes #981
Matthew Wild <mwild1@gmail.com>
parents:
8999
diff
changeset
|
250 -- figure out the root cause |
7df29c5fbb9b
util.stanza + tests: Bail out of loop if we are iterating too far, fixes #981
Matthew Wild <mwild1@gmail.com>
parents:
8999
diff
changeset
|
251 error("Invalid stanza state! Please report this error."); |
7df29c5fbb9b
util.stanza + tests: Bail out of loop if we are iterating too far, fixes #981
Matthew Wild <mwild1@gmail.com>
parents:
8999
diff
changeset
|
252 end |
3477
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
253 end |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
254 return self; |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
255 end |
6350b114e0e4
util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza)
Matthew Wild <mwild1@gmail.com>
parents:
3475
diff
changeset
|
256 |
5424
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
257 function stanza_mt:find(path) |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
258 local pos = 1; |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
259 local len = #path + 1; |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
260 |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
261 repeat |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
262 local xmlns, name, text; |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
263 local char = s_sub(path, pos, pos); |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
264 if char == "@" then |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
265 return self.attr[s_sub(path, pos + 1)]; |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
266 elseif char == "{" then |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
267 xmlns, pos = s_match(path, "^([^}]+)}()", pos + 1); |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
268 end |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
269 name, text, pos = s_match(path, "^([^@/#]*)([/#]?)()", pos); |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
270 name = name ~= "" and name or nil; |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
271 if pos == len then |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
272 if text == "#" then |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
273 return self:get_child_text(name, xmlns); |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
274 end |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
275 return self:get_child(name, xmlns); |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
276 end |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
277 self = self:get_child(name, xmlns); |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
278 until not self |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
279 end |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
280 |
7318527c6dea
util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents:
5414
diff
changeset
|
281 |
6777
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
282 local escape_table = { ["'"] = "'", ["\""] = """, ["<"] = "<", [">"] = ">", ["&"] = "&" }; |
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
283 local function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end |
1931
f203330eb82e
util.stanza: Make xml_escape publicly accessible
Matthew Wild <mwild1@gmail.com>
parents:
1874
diff
changeset
|
284 |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
285 local function _dostring(t, buf, self, _xml_escape, parentns) |
1431
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
286 local nsid = 0; |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
287 local name = t.name |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
288 t_insert(buf, "<"..name); |
1416
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
289 for k, v in pairs(t.attr) do |
2077
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
290 if s_find(k, "\1", 1, true) then |
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
291 local ns, attrk = s_match(k, "^([^\1]*)\1?(.*)$"); |
1416
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
292 nsid = nsid + 1; |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
293 t_insert(buf, " xmlns:ns"..nsid.."='".._xml_escape(ns).."' ".."ns"..nsid..":"..attrk.."='".._xml_escape(v).."'"); |
2077
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
294 elseif not(k == "xmlns" and v == parentns) then |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
295 t_insert(buf, " "..k.."='".._xml_escape(v).."'"); |
776
89eb9f59993c
util.stanza: Temporary fix for serializing attributes with namespaces
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
296 end |
1416
f916f0ff90e5
util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1415
diff
changeset
|
297 end |
1431
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
298 local len = #t; |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
299 if len == 0 then |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
300 t_insert(buf, "/>"); |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
301 else |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
302 t_insert(buf, ">"); |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
303 for n=1,len do |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
304 local child = t[n]; |
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
305 if child.name then |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
306 self(child, buf, self, _xml_escape, t.attr.xmlns); |
1431
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
307 else |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
308 t_insert(buf, _xml_escape(child)); |
1431
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
309 end |
4 | 310 end |
1431
9fe9ba693f4a
util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents:
1420
diff
changeset
|
311 t_insert(buf, "</"..name..">"); |
0 | 312 end |
626
cf1d26fd4d6f
Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
313 end |
cf1d26fd4d6f
Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
314 function stanza_mt.__tostring(t) |
cf1d26fd4d6f
Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
315 local buf = {}; |
2077
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
316 _dostring(t, buf, _dostring, xml_escape, nil); |
626
cf1d26fd4d6f
Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
317 return t_concat(buf); |
0 | 318 end |
319 | |
242
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
320 function stanza_mt.top_tag(t) |
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
321 local attr_string = ""; |
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
322 if t.attr then |
338
804f5e62a41f
Don't forget to escape XML in attributes. Thanks to the Postgres Q&A room on conference.jabber.org :)
Matthew Wild <mwild1@gmail.com>
parents:
262
diff
changeset
|
323 for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, xml_escape(tostring(v))); end end |
242
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
324 end |
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
325 return s_format("<%s%s>", t.name, attr_string); |
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
326 end |
f15afbcbc55c
Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
327 |
1420
1576a5aa52f8
util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents:
1416
diff
changeset
|
328 function stanza_mt.get_text(t) |
1576a5aa52f8
util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents:
1416
diff
changeset
|
329 if #t.tags == 0 then |
1576a5aa52f8
util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents:
1416
diff
changeset
|
330 return t_concat(t); |
1576a5aa52f8
util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents:
1416
diff
changeset
|
331 end |
1576a5aa52f8
util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents:
1416
diff
changeset
|
332 end |
1576a5aa52f8
util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents:
1416
diff
changeset
|
333 |
2526
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
334 function stanza_mt.get_error(stanza) |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
335 local error_type, condition, text; |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5435
diff
changeset
|
336 |
2526
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
337 local error_tag = stanza:get_child("error"); |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
338 if not error_tag then |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
339 return nil, nil, nil; |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
340 end |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
341 error_type = error_tag.attr.type; |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5435
diff
changeset
|
342 |
5090
61c7c53c06d5
util.stanza: Use ipairs instead of childtags (behavior changed in 92c86e11fd44)
Kim Alvefur <zash@zash.se>
parents:
4936
diff
changeset
|
343 for _, child in ipairs(error_tag.tags) do |
2526
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
344 if child.attr.xmlns == xmlns_stanzas then |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
345 if not text and child.name == "text" then |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
346 text = child:get_text(); |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
347 elseif not condition then |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
348 condition = child.name; |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
349 end |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
350 if condition and text then |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
351 break; |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
352 end |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
353 end |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
354 end |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
355 return error_type, condition or "undefined-condition", text; |
2526
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
356 end |
401ff68413a1
util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error
Matthew Wild <mwild1@gmail.com>
parents:
2482
diff
changeset
|
357 |
6777
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
358 local function preserialize(stanza) |
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
|
359 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
|
360 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
|
361 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
|
362 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
|
363 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
|
364 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
|
365 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
|
366 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
|
367 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
|
368 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
|
369 |
9489
09b873ac7eb8
util.stanza: Set preserialize as freeze metamethod
Kim Alvefur <zash@zash.se>
parents:
9307
diff
changeset
|
370 stanza_mt.__freeze = preserialize; |
09b873ac7eb8
util.stanza: Set preserialize as freeze metamethod
Kim Alvefur <zash@zash.se>
parents:
9307
diff
changeset
|
371 |
9674
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
372 local function deserialize(serialized) |
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
|
373 -- Set metatable |
9674
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
374 if serialized then |
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
375 local attr = serialized.attr; |
2077
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
376 local attrx = {}; |
9674
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
377 for att, val in pairs(attr) do |
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
378 if type(att) == "string" then |
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
379 if s_find(att, "|", 1, true) and not s_find(att, "\1", 1, true) then |
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
380 local ns,na = s_match(att, "^([^|]+)|(.+)$"); |
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
381 attrx[ns.."\1"..na] = val; |
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
382 else |
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
383 attrx[att] = val; |
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
384 end |
2077
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
385 end |
e33658f6052c
Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents:
1984
diff
changeset
|
386 end |
9674
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
387 local stanza = new_stanza(serialized.name, attrx); |
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
388 for _, child in ipairs(serialized) do |
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
|
389 if type(child) == "table" then |
9674
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
390 stanza:add_direct_child(deserialize(child)); |
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
391 elseif type(child) == "string" then |
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
392 stanza:add_direct_child(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
|
393 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
|
394 end |
9674
6f97acc4583b
util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents:
9630
diff
changeset
|
395 return stanza; |
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
|
396 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
|
397 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
|
398 |
9630
bff66c3faceb
util.stanza: Validate input to clone() (with brief tests)
Kim Alvefur <zash@zash.se>
parents:
9489
diff
changeset
|
399 local function _clone(stanza) |
4179
aa07a381e5a6
util.stanza: Rewrite clone() to be more optimized.
Waqas Hussain <waqas20@gmail.com>
parents:
4168
diff
changeset
|
400 local attr, tags = {}, {}; |
aa07a381e5a6
util.stanza: Rewrite clone() to be more optimized.
Waqas Hussain <waqas20@gmail.com>
parents:
4168
diff
changeset
|
401 for k,v in pairs(stanza.attr) do attr[k] = v; end |
6978
30c96a5db360
util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator)
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
402 local old_namespaces, namespaces = stanza.namespaces; |
30c96a5db360
util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator)
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
403 if old_namespaces then |
30c96a5db360
util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator)
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
404 namespaces = {}; |
30c96a5db360
util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator)
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
405 for k,v in pairs(old_namespaces) do namespaces[k] = v; end |
30c96a5db360
util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator)
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
406 end |
30c96a5db360
util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator)
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
407 local new = { name = stanza.name, attr = attr, namespaces = namespaces, tags = tags }; |
4179
aa07a381e5a6
util.stanza: Rewrite clone() to be more optimized.
Waqas Hussain <waqas20@gmail.com>
parents:
4168
diff
changeset
|
408 for i=1,#stanza do |
aa07a381e5a6
util.stanza: Rewrite clone() to be more optimized.
Waqas Hussain <waqas20@gmail.com>
parents:
4168
diff
changeset
|
409 local child = stanza[i]; |
aa07a381e5a6
util.stanza: Rewrite clone() to be more optimized.
Waqas Hussain <waqas20@gmail.com>
parents:
4168
diff
changeset
|
410 if child.name then |
9630
bff66c3faceb
util.stanza: Validate input to clone() (with brief tests)
Kim Alvefur <zash@zash.se>
parents:
9489
diff
changeset
|
411 child = _clone(child); |
4179
aa07a381e5a6
util.stanza: Rewrite clone() to be more optimized.
Waqas Hussain <waqas20@gmail.com>
parents:
4168
diff
changeset
|
412 t_insert(tags, child); |
1517
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
413 end |
4179
aa07a381e5a6
util.stanza: Rewrite clone() to be more optimized.
Waqas Hussain <waqas20@gmail.com>
parents:
4168
diff
changeset
|
414 t_insert(new, child); |
1517
22be7637a64d
util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents:
1431
diff
changeset
|
415 end |
4179
aa07a381e5a6
util.stanza: Rewrite clone() to be more optimized.
Waqas Hussain <waqas20@gmail.com>
parents:
4168
diff
changeset
|
416 return setmetatable(new, stanza_mt); |
829
b01fd698495e
util/stanza: Added clone function
Waqas Hussain <waqas20@gmail.com>
parents:
776
diff
changeset
|
417 end |
b01fd698495e
util/stanza: Added clone function
Waqas Hussain <waqas20@gmail.com>
parents:
776
diff
changeset
|
418 |
9630
bff66c3faceb
util.stanza: Validate input to clone() (with brief tests)
Kim Alvefur <zash@zash.se>
parents:
9489
diff
changeset
|
419 local function clone(stanza) |
bff66c3faceb
util.stanza: Validate input to clone() (with brief tests)
Kim Alvefur <zash@zash.se>
parents:
9489
diff
changeset
|
420 if not is_stanza(stanza) then |
bff66c3faceb
util.stanza: Validate input to clone() (with brief tests)
Kim Alvefur <zash@zash.se>
parents:
9489
diff
changeset
|
421 error("bad argument to clone: expected stanza, got "..type(stanza)); |
bff66c3faceb
util.stanza: Validate input to clone() (with brief tests)
Kim Alvefur <zash@zash.se>
parents:
9489
diff
changeset
|
422 end |
bff66c3faceb
util.stanza: Validate input to clone() (with brief tests)
Kim Alvefur <zash@zash.se>
parents:
9489
diff
changeset
|
423 return _clone(stanza); |
bff66c3faceb
util.stanza: Validate input to clone() (with brief tests)
Kim Alvefur <zash@zash.se>
parents:
9489
diff
changeset
|
424 end |
bff66c3faceb
util.stanza: Validate input to clone() (with brief tests)
Kim Alvefur <zash@zash.se>
parents:
9489
diff
changeset
|
425 |
6777
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
426 local function message(attr, body) |
0 | 427 if not body then |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
428 return new_stanza("message", attr); |
0 | 429 else |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
430 return new_stanza("message", attr):tag("body"):text(body):up(); |
0 | 431 end |
432 end | |
6777
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
433 local function iq(attr) |
9307
feaef6215bb8
util.stanza: Don't automatically generate ids for iq stanzas
Matthew Wild <mwild1@gmail.com>
parents:
9217
diff
changeset
|
434 if not (attr and attr.id) then |
feaef6215bb8
util.stanza: Don't automatically generate ids for iq stanzas
Matthew Wild <mwild1@gmail.com>
parents:
9217
diff
changeset
|
435 error("iq stanzas require an id attribute"); |
feaef6215bb8
util.stanza: Don't automatically generate ids for iq stanzas
Matthew Wild <mwild1@gmail.com>
parents:
9217
diff
changeset
|
436 end |
feaef6215bb8
util.stanza: Don't automatically generate ids for iq stanzas
Matthew Wild <mwild1@gmail.com>
parents:
9217
diff
changeset
|
437 return new_stanza("iq", attr); |
0 | 438 end |
439 | |
6777
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
440 local function reply(orig) |
8382
e5d00bf4a4d5
util: Various minor changes to please [luacheck]
Kim Alvefur <zash@zash.se>
parents:
7758
diff
changeset
|
441 return new_stanza(orig.name, |
e5d00bf4a4d5
util: Various minor changes to please [luacheck]
Kim Alvefur <zash@zash.se>
parents:
7758
diff
changeset
|
442 orig.attr and { |
e5d00bf4a4d5
util: Various minor changes to please [luacheck]
Kim Alvefur <zash@zash.se>
parents:
7758
diff
changeset
|
443 to = orig.attr.from, |
e5d00bf4a4d5
util: Various minor changes to please [luacheck]
Kim Alvefur <zash@zash.se>
parents:
7758
diff
changeset
|
444 from = orig.attr.to, |
e5d00bf4a4d5
util: Various minor changes to please [luacheck]
Kim Alvefur <zash@zash.se>
parents:
7758
diff
changeset
|
445 id = orig.attr.id, |
e5d00bf4a4d5
util: Various minor changes to please [luacheck]
Kim Alvefur <zash@zash.se>
parents:
7758
diff
changeset
|
446 type = ((orig.name == "iq" and "result") or orig.attr.type) |
e5d00bf4a4d5
util: Various minor changes to please [luacheck]
Kim Alvefur <zash@zash.se>
parents:
7758
diff
changeset
|
447 }); |
0 | 448 end |
449 | |
6777
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
450 local xmpp_stanzas_attr = { xmlns = xmlns_stanzas }; |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
451 local function error_reply(orig, error_type, condition, error_message) |
6777
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
452 local t = reply(orig); |
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
453 t.attr.type = "error"; |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
454 t:tag("error", {type = error_type}) --COMPAT: Some day xmlns:stanzas goes here |
6777
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
455 :tag(condition, xmpp_stanzas_attr):up(); |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
456 if error_message then t:tag("text", xmpp_stanzas_attr):text(error_message):up(); end |
6777
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
457 return t; -- stanza ready for adding app-specific errors |
60
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
458 end |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
30
diff
changeset
|
459 |
6777
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
460 local function presence(attr) |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
461 return new_stanza("presence", attr); |
0 | 462 end |
463 | |
262 | 464 if do_pretty_printing then |
465 local style_attrk = getstyle("yellow"); | |
466 local style_attrv = getstyle("red"); | |
467 local style_tagname = getstyle("red"); | |
468 local style_punc = getstyle("magenta"); | |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5435
diff
changeset
|
469 |
262 | 470 local attr_format = " "..getstring(style_attrk, "%s")..getstring(style_punc, "=")..getstring(style_attrv, "'%s'"); |
471 local top_tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">"); | |
472 --local tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">").."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">"); | |
473 local tag_format = top_tag_format.."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">"); | |
474 function stanza_mt.pretty_print(t) | |
475 local children_text = ""; | |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
476 for _, child in ipairs(t) do |
2482
a1570e371258
util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2264
diff
changeset
|
477 if type(child) == "string" then |
262 | 478 children_text = children_text .. xml_escape(child); |
479 else | |
480 children_text = children_text .. child:pretty_print(); | |
481 end | |
482 end | |
483 | |
484 local attr_string = ""; | |
485 if t.attr then | |
486 for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(attr_format, k, tostring(v)); end end | |
487 end | |
488 return s_format(tag_format, t.name, attr_string, children_text, t.name); | |
489 end | |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5435
diff
changeset
|
490 |
262 | 491 function stanza_mt.pretty_top_tag(t) |
492 local attr_string = ""; | |
493 if t.attr then | |
494 for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(attr_format, k, tostring(v)); end end | |
495 end | |
496 return s_format(top_tag_format, t.name, attr_string); | |
497 end | |
498 else | |
499 -- Sorry, fresh out of colours for you guys ;) | |
500 stanza_mt.pretty_print = stanza_mt.__tostring; | |
501 stanza_mt.pretty_top_tag = stanza_mt.top_tag; | |
502 end | |
503 | |
6777
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
504 return { |
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
505 stanza_mt = stanza_mt; |
7253
f4e71242556a
util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents:
6821
diff
changeset
|
506 stanza = new_stanza; |
7750
e58524240b30
util.stanza: Add an is_stanza() function to check if an object is a stanza
Kim Alvefur <zash@zash.se>
parents:
7253
diff
changeset
|
507 is_stanza = is_stanza; |
6777
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
508 preserialize = preserialize; |
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
509 deserialize = deserialize; |
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
510 clone = clone; |
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
511 message = message; |
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
512 iq = iq; |
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
513 reply = reply; |
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
514 error_reply = error_reply; |
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
515 presence = presence; |
6821
5de30376bf98
util.stanza: Export xml_escape (missed during removal of module() calls)
Kim Alvefur <zash@zash.se>
parents:
6777
diff
changeset
|
516 xml_escape = xml_escape; |
6777
5de6b93d0190
util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents:
6501
diff
changeset
|
517 }; |