author | Kim Alvefur <zash@zash.se> |
Fri, 28 Feb 2020 22:38:41 +0100 | |
changeset 3927 | 3c3d216c6f6d |
parent 3926 | ea59c9455f93 |
child 3936 | 8b34222216f4 |
permissions | -rw-r--r-- |
3817 | 1 |
local array = require "util.array"; |
2 |
local jid = require "util.jid"; |
|
3827
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
3 |
local json = require "util.json"; |
3817 | 4 |
local st = require "util.stanza"; |
5 |
local xml = require "util.xml"; |
|
6 |
||
3926
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
7 |
local field_mappings; -- in scope for "func" mappings |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
8 |
field_mappings = { |
3890
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
9 |
-- top level stanza attributes |
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
10 |
-- needed here to mark them as known fields |
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
11 |
kind = "attr", |
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
12 |
type = "attr", |
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
13 |
to = "attr", |
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
14 |
from = "attr", |
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
15 |
id = "attr", |
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
16 |
|
3817 | 17 |
-- basic message |
18 |
body = "text_tag", |
|
19 |
subject = "text_tag", |
|
20 |
thread = "text_tag", |
|
21 |
||
22 |
-- basic presence |
|
23 |
show = "text_tag", |
|
24 |
status = "text_tag", |
|
25 |
priority = "text_tag", |
|
26 |
||
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
27 |
state = { type = "name", xmlns = "http://jabber.org/protocol/chatstates" }, |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
28 |
nick = { type = "text_tag", xmlns = "http://jabber.org/protocol/nick", tagname = "nick" }, |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
29 |
delay = { type = "attr", xmlns = "urn:xmpp:delay", tagname = "delay", attr = "stamp" }, |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
30 |
replace = { type = "attr", xmlns = "urn:xmpp:message-correct:0", tagname = "replace", attr = "id" }, |
3817 | 31 |
|
32 |
-- XEP-0045 MUC |
|
33 |
-- TODO history, password, ??? |
|
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
34 |
join = { type = "bool_tag", xmlns = "http://jabber.org/protocol/muc", tagname = "x" }, |
3817 | 35 |
|
36 |
-- XEP-0071 |
|
37 |
html = { |
|
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
38 |
type = "func", xmlns = "http://jabber.org/protocol/xhtml-im", tagname = "html", |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
39 |
st2json = function (s) --> json string |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
40 |
return (tostring(s:get_child("body", "http://www.w3.org/1999/xhtml")):gsub(" xmlns='[^']*'", "", 1)); |
3817 | 41 |
end; |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
42 |
json2st = function (s) --> xml |
3821
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
43 |
if type(s) == "string" then |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
44 |
return assert(xml.parse("<x:html xmlns:x='http://jabber.org/protocol/xhtml-im' xmlns='http://www.w3.org/1999/xhtml'>" .. s .. "</x:html>")); |
3821
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
45 |
end |
3817 | 46 |
end; |
47 |
}; |
|
48 |
||
3859
0e1e900577c4
mod_rest: Improve some comments
Kim Alvefur <zash@zash.se>
parents:
3858
diff
changeset
|
49 |
-- XEP-0199: XMPP Ping |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
50 |
ping = { type = "bool_tag", xmlns = "urn:xmpp:ping", tagname = "ping" }, |
3817 | 51 |
|
3858
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
52 |
-- XEP-0092: Software Version |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
53 |
version = { type = "func", xmlns = "jabber:iq:version", tagname = "query", |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
54 |
st2json = function (s) |
3858
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
55 |
return { |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
56 |
name = s:get_child_text("name"); |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
57 |
version = s:get_child_text("version"); |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
58 |
os = s:get_child_text("os"); |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
59 |
} |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
60 |
end, |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
61 |
json2st = function (s) |
3858
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
62 |
local v = st.stanza("query", { xmlns = "jabber:iq:version" }); |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
63 |
if type(s) == "table" then |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
64 |
v:text_tag("name", s.name); |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
65 |
v:text_tag("version", s.version); |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
66 |
if s.os then |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
67 |
v:text_tag("os", s.os); |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
68 |
end |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
69 |
end |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
70 |
return v; |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
71 |
end |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
72 |
}; |
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
73 |
|
3817 | 74 |
-- XEP-0030 |
75 |
disco = { |
|
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
76 |
type = "func", xmlns = "http://jabber.org/protocol/disco#info", tagname = "query", |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
77 |
st2json = function (s) --> array of features |
3817 | 78 |
local identities, features = array(), array(); |
79 |
for tag in s:childtags() do |
|
80 |
if tag.name == "identity" and tag.attr.category and tag.attr.type then |
|
81 |
identities:push({ category = tag.attr.category, type = tag.attr.type, name = tag.attr.name }); |
|
82 |
elseif tag.name == "feature" and tag.attr.var then |
|
83 |
features:push(tag.attr.var); |
|
84 |
end |
|
85 |
end |
|
3826
f0a1d113dce4
mod_rest: Add support for mapping 'node' attr in disco#info
Kim Alvefur <zash@zash.se>
parents:
3823
diff
changeset
|
86 |
return { node = s.attr.node, identities = identities, features = features, }; |
3817 | 87 |
end; |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
88 |
json2st = function (s) |
3864
9752a6f1b9f3
mod_rest: Avoid treating special json.null value as any other table
Kim Alvefur <zash@zash.se>
parents:
3863
diff
changeset
|
89 |
if type(s) == "table" and s ~= json.null then |
3863
da3a0f055526
mod_rest: Fix handling of 'node' attribute in disco#info
Kim Alvefur <zash@zash.se>
parents:
3860
diff
changeset
|
90 |
local disco = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info", node = s.node }); |
3817 | 91 |
if s.identities then |
3852
1b9834500123
mod_rest: Fix iteration over disco#info identities
Kim Alvefur <zash@zash.se>
parents:
3827
diff
changeset
|
92 |
for _, identity in ipairs(s.identities) do |
3854
8d13b9c9ba75
mod_rest: Fix disco#info identities data mapping
Kim Alvefur <zash@zash.se>
parents:
3853
diff
changeset
|
93 |
disco:tag("identity", { category = identity.category, type = identity.type, name = identity.name }):up(); |
3817 | 94 |
end |
95 |
end |
|
96 |
if s.features then |
|
3853
11c34e97fe1a
mod_rest: Fix iteration over disco#info features
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
97 |
for _, feature in ipairs(s.features) do |
3817 | 98 |
disco:tag("feature", { var = feature }):up(); |
99 |
end |
|
100 |
end |
|
3863
da3a0f055526
mod_rest: Fix handling of 'node' attribute in disco#info
Kim Alvefur <zash@zash.se>
parents:
3860
diff
changeset
|
101 |
return disco; |
da3a0f055526
mod_rest: Fix handling of 'node' attribute in disco#info
Kim Alvefur <zash@zash.se>
parents:
3860
diff
changeset
|
102 |
else |
3874 | 103 |
return st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info", }); |
3817 | 104 |
end |
105 |
end; |
|
106 |
}; |
|
107 |
||
108 |
items = { |
|
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
109 |
type = "func", xmlns = "http://jabber.org/protocol/disco#items", tagname = "query", |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
110 |
st2json = function (s) --> array of features | map with node |
3879
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
111 |
if s.attr.node and s.tags[1] == nil then |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
112 |
return { node = s.attr.node }; |
3879
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
113 |
end |
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
114 |
|
3817 | 115 |
local items = array(); |
116 |
for item in s:childtags("item") do |
|
117 |
items:push({ jid = item.attr.jid, node = item.attr.node, name = item.attr.name }); |
|
118 |
end |
|
119 |
return items; |
|
120 |
end; |
|
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
121 |
json2st = function (s) |
3864
9752a6f1b9f3
mod_rest: Avoid treating special json.null value as any other table
Kim Alvefur <zash@zash.se>
parents:
3863
diff
changeset
|
122 |
if type(s) == "table" and s ~= json.null then |
3879
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
123 |
local disco = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#items", node = s.node }); |
3817 | 124 |
for _, item in ipairs(s) do |
3856
66f96b98d219
mod_rest: Allow returning an array of JID strings as disco#items
Kim Alvefur <zash@zash.se>
parents:
3855
diff
changeset
|
125 |
if type(item) == "string" then |
66f96b98d219
mod_rest: Allow returning an array of JID strings as disco#items
Kim Alvefur <zash@zash.se>
parents:
3855
diff
changeset
|
126 |
disco:tag("item", { jid = item }); |
66f96b98d219
mod_rest: Allow returning an array of JID strings as disco#items
Kim Alvefur <zash@zash.se>
parents:
3855
diff
changeset
|
127 |
elseif type(item) == "table" then |
66f96b98d219
mod_rest: Allow returning an array of JID strings as disco#items
Kim Alvefur <zash@zash.se>
parents:
3855
diff
changeset
|
128 |
disco:tag("item", { jid = item.jid, node = item.node, name = item.name }); |
66f96b98d219
mod_rest: Allow returning an array of JID strings as disco#items
Kim Alvefur <zash@zash.se>
parents:
3855
diff
changeset
|
129 |
end |
3817 | 130 |
end |
3879
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
131 |
return disco; |
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
132 |
else |
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
133 |
return st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#items", }); |
3817 | 134 |
end |
135 |
end; |
|
136 |
}; |
|
137 |
||
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
138 |
-- XEP-0050: Ad-Hoc Commands |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
139 |
command = { type = "func", xmlns = "http://jabber.org/protocol/commands", tagname = "command", |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
140 |
st2json = function (s) |
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
141 |
local cmd = { |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
142 |
action = s.attr.action, |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
143 |
node = s.attr.node, |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
144 |
sessionid = s.attr.sessionid, |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
145 |
status = s.attr.status, |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
146 |
}; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
147 |
local actions = s:get_child("actions"); |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
148 |
local note = s:get_child("note"); |
3882
9a3dfe0bf9fd
mod_rest: Add JSON mapping for dataform (XEP-0004)
Kim Alvefur <zash@zash.se>
parents:
3881
diff
changeset
|
149 |
local form = s:get_child("x", "jabber:x:data"); |
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
150 |
if actions then |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
151 |
cmd.actions = { |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
152 |
execute = actions.attr.execute, |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
153 |
}; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
154 |
for action in actions:childtags() do |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
155 |
cmd.actions[action.name] = true |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
156 |
end |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
157 |
elseif note then |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
158 |
cmd.note = { |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
159 |
type = note.attr.type; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
160 |
text = note:get_text(); |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
161 |
}; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
162 |
end |
3882
9a3dfe0bf9fd
mod_rest: Add JSON mapping for dataform (XEP-0004)
Kim Alvefur <zash@zash.se>
parents:
3881
diff
changeset
|
163 |
if form then |
3926
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
164 |
cmd.form = field_mappings.dataform.st2json(form); |
3882
9a3dfe0bf9fd
mod_rest: Add JSON mapping for dataform (XEP-0004)
Kim Alvefur <zash@zash.se>
parents:
3881
diff
changeset
|
165 |
end |
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
166 |
return cmd; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
167 |
end; |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
168 |
json2st = function (s) |
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
169 |
if type(s) == "table" and s ~= json.null then |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
170 |
local cmd = st.stanza("command", { |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
171 |
xmlns = "http://jabber.org/protocol/commands", |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
172 |
action = s.action, |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
173 |
node = s.node, |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
174 |
sessionid = s.sessionid, |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
175 |
status = s.status, |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
176 |
}); |
3885
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
177 |
if type(s.actions) == "table" then |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
178 |
cmd:tag("actions", { execute = s.actions.execute }); |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
179 |
do |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
180 |
if s.actions.next == true then |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
181 |
cmd:tag("next"):up(); |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
182 |
end |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
183 |
if s.actions.prev == true then |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
184 |
cmd:tag("prev"):up(); |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
185 |
end |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
186 |
if s.actions.complete == true then |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
187 |
cmd:tag("complete"):up(); |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
188 |
end |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
189 |
end |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
190 |
cmd:up(); |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
191 |
elseif type(s.note) == "table" then |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
192 |
cmd:text_tag("note", s.note.text, { type = s.note.type }); |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
193 |
end |
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
194 |
if s.form then |
3926
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
195 |
cmd:add_child(field_mappings.dataform.json2st(s.form)); |
3892
04ea96a0488d
mod_rest: Allow passing form data in a more compact format
Kim Alvefur <zash@zash.se>
parents:
3890
diff
changeset
|
196 |
elseif s.data then |
3926
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
197 |
cmd:add_child(field_mappings.formdata.json2st(s.data)); |
3885
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3884
diff
changeset
|
198 |
end |
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
199 |
return cmd; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
200 |
elseif type(s) == "string" then -- assume node |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
201 |
return st.stanza("command", { xmlns = "http://jabber.org/protocol/commands", node = s }); |
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
202 |
end |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
203 |
-- else .. missing required attribute |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
204 |
end; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
205 |
}; |
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
206 |
|
3859
0e1e900577c4
mod_rest: Improve some comments
Kim Alvefur <zash@zash.se>
parents:
3858
diff
changeset
|
207 |
-- XEP-0066: Out of Band Data |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
208 |
oob_url = { type = "func", xmlns = "jabber:iq:oob", tagname = "query", |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
209 |
st2json = function (s) |
3817 | 210 |
return s:get_child_text("url"); |
211 |
end; |
|
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
212 |
json2st = function (s) |
3821
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
213 |
if type(s) == "string" then |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
214 |
return st.stanza("query", { xmlns = "jabber:iq:oob" }):text_tag("url", s); |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
215 |
end |
3817 | 216 |
end; |
217 |
}; |
|
3827
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
218 |
|
3911
d5ecb9b9cb3b
mod_rest: Update with namespace and name of XEP-0432
Kim Alvefur <zash@zash.se>
parents:
3910
diff
changeset
|
219 |
-- XEP-0432: Simple JSON Messaging |
d5ecb9b9cb3b
mod_rest: Update with namespace and name of XEP-0432
Kim Alvefur <zash@zash.se>
parents:
3910
diff
changeset
|
220 |
payload = { type = "func", xmlns = "urn:xmpp:json-msg:0", tagname = "payload", |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
221 |
st2json = function (s) |
3827
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
222 |
local rawjson = s:get_child_text("json", "urn:xmpp:json:0"); |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
223 |
if not rawjson then return nil, "missing-json-payload"; end |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
224 |
local parsed, err = json.decode(rawjson); |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
225 |
if not parsed then return nil, err; end |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
226 |
return { |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
227 |
datatype = s.attr.datatype; |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
228 |
data = parsed; |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
229 |
}; |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
230 |
end; |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
231 |
json2st = function (s) |
3827
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
232 |
if type(s) == "table" then |
3911
d5ecb9b9cb3b
mod_rest: Update with namespace and name of XEP-0432
Kim Alvefur <zash@zash.se>
parents:
3910
diff
changeset
|
233 |
return st.stanza("payload", { xmlns = "urn:xmpp:json-msg:0", datatype = s.datatype }) |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
234 |
:tag("json", { xmlns = "urn:xmpp:json:0" }):text(json.encode(s.data)); |
3827
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
235 |
end; |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
236 |
end |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
237 |
}; |
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3826
diff
changeset
|
238 |
|
3893
59765d1bb6dc
mod_rest: Support mapping XEP-0004 Data Forms directly
Kim Alvefur <zash@zash.se>
parents:
3892
diff
changeset
|
239 |
-- XEP-0004: Data Forms |
3926
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
240 |
dataform = { |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
241 |
-- Generic and complete dataforms mapping |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
242 |
type = "func", xmlns = "jabber:x:data", tagname = "x", |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
243 |
st2json = function (s) |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
244 |
local fields = array(); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
245 |
local form = { |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
246 |
type = s.attr.type; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
247 |
title = s:get_child_text("title"); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
248 |
instructions = s:get_child_text("instructions"); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
249 |
fields = fields; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
250 |
}; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
251 |
for field in s:childtags("field") do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
252 |
local i = { |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
253 |
var = field.attr.var; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
254 |
type = field.attr.type; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
255 |
label = field.attr.label; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
256 |
desc = field:get_child_text("desc"); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
257 |
required = field:get_child("required") and true or nil; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
258 |
value = field:get_child_text("value"); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
259 |
}; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
260 |
if field.attr.type == "jid-multi" or field.attr.type == "list-multi" or field.attr.type == "text-multi" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
261 |
local value = array(); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
262 |
for v in field:childtags("value") do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
263 |
value:push(v:get_text()); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
264 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
265 |
if field.attr.type == "text-multi" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
266 |
i.value = value:concat("\n"); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
267 |
else |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
268 |
i.value = value; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
269 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
270 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
271 |
if field.attr.type == "list-single" or field.attr.type == "list-multi" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
272 |
local options = array(); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
273 |
for o in field:childtags("option") do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
274 |
options:push({ label = o.attr.label, value = o:get_child_text("value") }); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
275 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
276 |
i.options = options; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
277 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
278 |
fields:push(i); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
279 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
280 |
return form; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
281 |
end; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
282 |
json2st = function (x) |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
283 |
if type(x) == "table" and x ~= json.null then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
284 |
local form = st.stanza("x", { xmlns = "jabber:x:data", type = x.type }); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
285 |
if x.title then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
286 |
form:text_tag("title", x.title); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
287 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
288 |
if x.instructions then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
289 |
form:text_tag("instructions", x.instructions); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
290 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
291 |
if type(x.fields) == "table" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
292 |
for _, f in ipairs(x.fields) do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
293 |
if type(f) == "table" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
294 |
form:tag("field", { var = f.var, type = f.type, label = f.label }); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
295 |
if f.desc then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
296 |
form:text_tag("desc", f.desc); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
297 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
298 |
if f.required == true then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
299 |
form:tag("required"):up(); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
300 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
301 |
if type(f.value) == "string" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
302 |
form:text_tag("value", f.value); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
303 |
elseif type(f.value) == "table" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
304 |
for _, v in ipairs(f.value) do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
305 |
form:text_tag("value", v); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
306 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
307 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
308 |
if type(f.options) == "table" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
309 |
for _, o in ipairs(f.value) do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
310 |
if type(o) == "table" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
311 |
form:tag("option", { label = o.label }); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
312 |
form:text_tag("value", o.value); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
313 |
form:up(); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
314 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
315 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
316 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
317 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
318 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
319 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
320 |
return form; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
321 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
322 |
end; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
323 |
}; |
3893
59765d1bb6dc
mod_rest: Support mapping XEP-0004 Data Forms directly
Kim Alvefur <zash@zash.se>
parents:
3892
diff
changeset
|
324 |
|
3926
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
325 |
-- Simpler mapping of dataform from JSON map |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
326 |
formdata = { type = "func", xmlns = "jabber:x:data", tagname = "", |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
327 |
st2json = function () |
3893
59765d1bb6dc
mod_rest: Support mapping XEP-0004 Data Forms directly
Kim Alvefur <zash@zash.se>
parents:
3892
diff
changeset
|
328 |
-- Tricky to do in a generic way without each form layout |
59765d1bb6dc
mod_rest: Support mapping XEP-0004 Data Forms directly
Kim Alvefur <zash@zash.se>
parents:
3892
diff
changeset
|
329 |
-- In the future, some well-known layouts might be understood |
59765d1bb6dc
mod_rest: Support mapping XEP-0004 Data Forms directly
Kim Alvefur <zash@zash.se>
parents:
3892
diff
changeset
|
330 |
return nil, "not-implemented"; |
59765d1bb6dc
mod_rest: Support mapping XEP-0004 Data Forms directly
Kim Alvefur <zash@zash.se>
parents:
3892
diff
changeset
|
331 |
end, |
3926
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
332 |
json2st = function (s, t) |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
333 |
local form = st.stanza("x", { xmlns = "jabber:x:data", type = t }); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
334 |
for k, v in pairs(s) do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
335 |
form:tag("field", { var = k }); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
336 |
if type(v) == "string" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
337 |
form:text_tag("value", v); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
338 |
elseif type(v) == "table" then |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
339 |
for _, v_ in ipairs(v) do |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
340 |
form:text_tag("value", v_); |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
341 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
342 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
343 |
end |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
344 |
return form; |
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3916
diff
changeset
|
345 |
end |
3893
59765d1bb6dc
mod_rest: Support mapping XEP-0004 Data Forms directly
Kim Alvefur <zash@zash.se>
parents:
3892
diff
changeset
|
346 |
}; |
3927
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
347 |
|
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
348 |
-- XEP-0039: Statistics Gathering |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
349 |
stats = { type = "func", xmlns = "http://jabber.org/protocol/stats", tagname = "query", |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
350 |
st2json = function (s) |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
351 |
local o = array(); |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
352 |
for stat in s:childtags("stat") do |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
353 |
o:push({ |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
354 |
name = stat.attr.name; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
355 |
unit = stat.attr.unit; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
356 |
value = stat.attr.value; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
357 |
}); |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
358 |
end |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
359 |
return o; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
360 |
end; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
361 |
json2st = function (j) |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
362 |
local stats = st.stanza("query", { xmlns = "http://jabber.org/protocol/stats" }); |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
363 |
if type(j) == "table" then |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
364 |
for _, stat in ipairs(j) do |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
365 |
stats:tag("stat", { name = stat.name, unit = stat.unit, value = stat.value }):up(); |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
366 |
end |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
367 |
end |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
368 |
return stats; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
369 |
end; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
370 |
}; |
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3926
diff
changeset
|
371 |
|
3817 | 372 |
}; |
373 |
||
374 |
local implied_kinds = { |
|
375 |
disco = "iq", |
|
376 |
items = "iq", |
|
377 |
ping = "iq", |
|
3858
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
378 |
version = "iq", |
3881
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3879
diff
changeset
|
379 |
command = "iq", |
3817 | 380 |
|
381 |
body = "message", |
|
382 |
html = "message", |
|
383 |
replace = "message", |
|
384 |
state = "message", |
|
385 |
subject = "message", |
|
386 |
thread = "message", |
|
387 |
||
388 |
join = "presence", |
|
389 |
priority = "presence", |
|
390 |
show = "presence", |
|
391 |
status = "presence", |
|
392 |
} |
|
393 |
||
394 |
local kind_by_type = { |
|
395 |
get = "iq", set = "iq", result = "iq", |
|
396 |
normal = "message", chat = "message", headline = "message", groupchat = "message", |
|
397 |
available = "presence", unavailable = "presence", |
|
398 |
subscribe = "presence", unsubscribe = "presence", |
|
399 |
subscribed = "presence", unsubscribed = "presence", |
|
400 |
} |
|
401 |
||
402 |
local function st2json(s) |
|
403 |
local t = { |
|
404 |
kind = s.name, |
|
405 |
type = s.attr.type, |
|
406 |
to = s.attr.to, |
|
407 |
from = s.attr.from, |
|
408 |
id = s.attr.id, |
|
409 |
}; |
|
410 |
if s.name == "presence" and not s.attr.type then |
|
411 |
t.type = "available"; |
|
412 |
end |
|
413 |
||
414 |
if t.to then |
|
415 |
t.to = jid.prep(t.to); |
|
416 |
if not t.to then return nil, "invalid-jid-to"; end |
|
417 |
end |
|
418 |
if t.from then |
|
419 |
t.from = jid.prep(t.from); |
|
420 |
if not t.from then return nil, "invalid-jid-from"; end |
|
421 |
end |
|
422 |
||
423 |
if t.type == "error" then |
|
3875
e5d08bb58155
mod_rest: Map the error@by attribute
Kim Alvefur <zash@zash.se>
parents:
3874
diff
changeset
|
424 |
local error = s:get_child("error"); |
3817 | 425 |
local err_typ, err_condition, err_text = s:get_error(); |
426 |
t.error = { |
|
427 |
type = err_typ, |
|
428 |
condition = err_condition, |
|
3875
e5d08bb58155
mod_rest: Map the error@by attribute
Kim Alvefur <zash@zash.se>
parents:
3874
diff
changeset
|
429 |
text = err_text, |
e5d08bb58155
mod_rest: Map the error@by attribute
Kim Alvefur <zash@zash.se>
parents:
3874
diff
changeset
|
430 |
by = error.attr.by, |
3817 | 431 |
}; |
432 |
return t; |
|
433 |
end |
|
434 |
||
3899
25a3ad36ef3e
mod_rest: Rename loop variable for improved clarity
Kim Alvefur <zash@zash.se>
parents:
3898
diff
changeset
|
435 |
for k, mapping in pairs(field_mappings) do |
25a3ad36ef3e
mod_rest: Rename loop variable for improved clarity
Kim Alvefur <zash@zash.se>
parents:
3898
diff
changeset
|
436 |
if mapping == "text_tag" then |
3817 | 437 |
t[k] = s:get_child_text(k); |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
438 |
elseif mapping.type == "text_tag" then |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
439 |
t[k] = s:get_child_text(mapping.tagname, mapping.xmlns); |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
440 |
elseif mapping.type == "name" then |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
441 |
local child = s:get_child(nil, mapping.xmlns); |
3817 | 442 |
if child then |
443 |
t[k] = child.name; |
|
444 |
end |
|
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
445 |
elseif mapping.type == "attr" then |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
446 |
local child = s:get_child(mapping.tagname, mapping.xmlns); |
3817 | 447 |
if child then |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
448 |
t[k] = child.attr[mapping.attr]; |
3817 | 449 |
end |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
450 |
elseif mapping.type == "bool_tag" then |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
451 |
if s:get_child(mapping.tagname, mapping.xmlns) then |
3817 | 452 |
t[k] = true; |
453 |
end |
|
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
454 |
elseif mapping.type == "func" and mapping.st2json then |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
455 |
local child = s:get_child(mapping.tagname, mapping.xmlns or k); |
3817 | 456 |
-- TODO handle err |
457 |
if child then |
|
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
458 |
t[k] = mapping.st2json(child); |
3817 | 459 |
end |
460 |
end |
|
461 |
end |
|
462 |
||
463 |
return t; |
|
464 |
end |
|
465 |
||
3821
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
466 |
local function str(s) |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
467 |
if type(s) == "string" then |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
468 |
return s; |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
469 |
end |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
470 |
end |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
471 |
|
3817 | 472 |
local function json2st(t) |
3821
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
473 |
if type(t) ~= "table" or not str(next(t)) then |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
474 |
return nil, "invalid-json"; |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
475 |
end |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
476 |
local kind = str(t.kind) or kind_by_type[str(t.type)]; |
3817 | 477 |
if not kind then |
478 |
for k, implied in pairs(implied_kinds) do |
|
479 |
if t[k] then |
|
480 |
kind = implied; |
|
481 |
break |
|
482 |
end |
|
483 |
end |
|
484 |
end |
|
485 |
||
486 |
local s = st.stanza(kind or "message", { |
|
3821
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
487 |
type = t.type ~= "available" and str(t.type) or nil, |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
488 |
to = str(t.to) and jid.prep(t.to); |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
489 |
from = str(t.to) and jid.prep(t.from); |
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
490 |
id = str(t.id), |
3817 | 491 |
}); |
492 |
||
493 |
if t.to and not s.attr.to then |
|
494 |
return nil, "invalid-jid-to"; |
|
495 |
end |
|
496 |
if t.from and not s.attr.from then |
|
497 |
return nil, "invalid-jid-from"; |
|
498 |
end |
|
3823 | 499 |
if kind == "iq" and not s.attr.type then |
500 |
s.attr.type = "get"; |
|
3822
a607c69d0804
mod_rest: Guess 'get' as default type for 'iq' stanzas in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3821
diff
changeset
|
501 |
end |
3817 | 502 |
|
3821
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
503 |
if type(t.error) == "table" then |
3875
e5d08bb58155
mod_rest: Map the error@by attribute
Kim Alvefur <zash@zash.se>
parents:
3874
diff
changeset
|
504 |
return st.error_reply(st.reply(s), str(t.error.type), str(t.error.condition), str(t.error.text), str(t.error.by)); |
3817 | 505 |
elseif t.type == "error" then |
506 |
s:text_tag("error", t.body, { code = t.error_code and tostring(t.error_code) }); |
|
507 |
return s; |
|
508 |
end |
|
509 |
||
510 |
for k, v in pairs(t) do |
|
3899
25a3ad36ef3e
mod_rest: Rename loop variable for improved clarity
Kim Alvefur <zash@zash.se>
parents:
3898
diff
changeset
|
511 |
local mapping = field_mappings[k]; |
25a3ad36ef3e
mod_rest: Rename loop variable for improved clarity
Kim Alvefur <zash@zash.se>
parents:
3898
diff
changeset
|
512 |
if mapping then |
25a3ad36ef3e
mod_rest: Rename loop variable for improved clarity
Kim Alvefur <zash@zash.se>
parents:
3898
diff
changeset
|
513 |
if mapping == "text_tag" then |
3817 | 514 |
s:text_tag(k, v); |
3899
25a3ad36ef3e
mod_rest: Rename loop variable for improved clarity
Kim Alvefur <zash@zash.se>
parents:
3898
diff
changeset
|
515 |
elseif mapping == "attr" then -- luacheck: ignore 542 |
3890
b64b08b7bf8e
mod_rest: Ignore already handled top-level stanza attr fields
Kim Alvefur <zash@zash.se>
parents:
3889
diff
changeset
|
516 |
-- handled already |
3900
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
517 |
elseif mapping.type == "text_tag" then |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
518 |
s:text_tag(mapping.tagname or k, v, mapping.xmlns and { xmlns = mapping.xmlns }); |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
519 |
elseif mapping.type == "name" then |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
520 |
s:tag(v, { xmlns = mapping.xmlns }):up(); |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
521 |
elseif mapping.type == "attr" then |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
522 |
s:tag(mapping.tagname or k, { xmlns = mapping.xmlns, [mapping.attr or k] = v }):up(); |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
523 |
elseif mapping.type == "bool_tag" then |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
524 |
s:tag(mapping.tagname or k, { xmlns = mapping.xmlns }):up(); |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
525 |
elseif mapping.type == "func" and mapping.json2st then |
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3899
diff
changeset
|
526 |
s:add_child(mapping.json2st(v)):up(); |
3817 | 527 |
end |
3889
1ec45dbc7db5
mod_rest: Return an error for unknown fields in JSON input
Kim Alvefur <zash@zash.se>
parents:
3885
diff
changeset
|
528 |
else |
1ec45dbc7db5
mod_rest: Return an error for unknown fields in JSON input
Kim Alvefur <zash@zash.se>
parents:
3885
diff
changeset
|
529 |
return nil, "unknown-field"; |
3817 | 530 |
end |
531 |
end |
|
532 |
||
533 |
s:reset(); |
|
534 |
||
535 |
return s; |
|
536 |
end |
|
537 |
||
538 |
return { |
|
539 |
st2json = st2json; |
|
540 |
json2st = json2st; |
|
541 |
}; |