Mercurial > prosody-modules
annotate mod_rest/jsonmap.lib.lua @ 3877:562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
This allows calling simple commands like the one provided by mod_uptime
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 04 Feb 2020 21:49:14 +0100 |
| parents | 93f71ab6cb00 |
| children | 9a3dfe0bf9fd |
| rev | line source |
|---|---|
| 3813 | 1 local array = require "util.array"; |
| 2 local jid = require "util.jid"; | |
|
3823
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
3 local json = require "util.json"; |
| 3813 | 4 local st = require "util.stanza"; |
| 5 local xml = require "util.xml"; | |
| 6 | |
| 7 local simple_types = { | |
| 8 -- basic message | |
| 9 body = "text_tag", | |
| 10 subject = "text_tag", | |
| 11 thread = "text_tag", | |
| 12 | |
| 13 -- basic presence | |
| 14 show = "text_tag", | |
| 15 status = "text_tag", | |
| 16 priority = "text_tag", | |
| 17 | |
| 18 state = {"name", "http://jabber.org/protocol/chatstates"}, | |
| 19 nick = {"text_tag", "http://jabber.org/protocol/nick", "nick"}, | |
| 20 delay = {"attr", "urn:xmpp:delay", "delay", "stamp"}, | |
| 21 replace = {"attr", "urn:xmpp:message-correct:0", "replace", "id"}, | |
| 22 | |
| 23 -- XEP-0045 MUC | |
| 24 -- TODO history, password, ??? | |
| 25 join = {"bool_tag", "http://jabber.org/protocol/muc", "x"}, | |
| 26 | |
| 27 -- XEP-0071 | |
| 28 html = { | |
| 29 "func", "http://jabber.org/protocol/xhtml-im", "html", | |
| 30 function (s) --> json string | |
|
3856
8bdb1729529b
mod_rest: Make XHTML-IM mapping more convenient
Kim Alvefur <zash@zash.se>
parents:
3855
diff
changeset
|
31 return (tostring(s:get_child("body", "http://www.w3.org/1999/xhtml")):gsub(" xmlns='[^']*'","", 1)); |
| 3813 | 32 end; |
| 33 function (s) --> xml | |
|
3817
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
34 if type(s) == "string" then |
|
3856
8bdb1729529b
mod_rest: Make XHTML-IM mapping more convenient
Kim Alvefur <zash@zash.se>
parents:
3855
diff
changeset
|
35 return assert(xml.parse([[<x:html xmlns:x='http://jabber.org/protocol/xhtml-im' xmlns='http://www.w3.org/1999/xhtml'>]]..s..[[</x:html>]])); |
|
3817
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
36 end |
| 3813 | 37 end; |
| 38 }; | |
| 39 | |
|
3855
0e1e900577c4
mod_rest: Improve some comments
Kim Alvefur <zash@zash.se>
parents:
3854
diff
changeset
|
40 -- XEP-0199: XMPP Ping |
| 3813 | 41 ping = {"bool_tag", "urn:xmpp:ping", "ping"}, |
| 42 | |
|
3854
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
43 -- XEP-0092: Software Version |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
44 version = {"func", "jabber:iq:version", "query", |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
45 function (s) |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
46 return { |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
47 name = s:get_child_text("name"); |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
48 version = s:get_child_text("version"); |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
49 os = s:get_child_text("os"); |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
50 } |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
51 end, |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
52 function (s) |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
53 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:
3852
diff
changeset
|
54 if type(s) == "table" then |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
55 v:text_tag("name", s.name); |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
56 v:text_tag("version", s.version); |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
57 if s.os then |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
58 v:text_tag("os", s.os); |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
59 end |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
60 end |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
61 return v; |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
62 end |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
63 }; |
|
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
64 |
| 3813 | 65 -- XEP-0030 |
| 66 disco = { | |
| 67 "func", "http://jabber.org/protocol/disco#info", "query", | |
| 68 function (s) --> array of features | |
| 69 local identities, features = array(), array(); | |
| 70 for tag in s:childtags() do | |
| 71 if tag.name == "identity" and tag.attr.category and tag.attr.type then | |
| 72 identities:push({ category = tag.attr.category, type = tag.attr.type, name = tag.attr.name }); | |
| 73 elseif tag.name == "feature" and tag.attr.var then | |
| 74 features:push(tag.attr.var); | |
| 75 end | |
| 76 end | |
|
3822
f0a1d113dce4
mod_rest: Add support for mapping 'node' attr in disco#info
Kim Alvefur <zash@zash.se>
parents:
3819
diff
changeset
|
77 return { node = s.attr.node, identities = identities, features = features, }; |
| 3813 | 78 end; |
| 79 function (s) | |
|
3860
9752a6f1b9f3
mod_rest: Avoid treating special json.null value as any other table
Kim Alvefur <zash@zash.se>
parents:
3859
diff
changeset
|
80 if type(s) == "table" and s ~= json.null then |
|
3859
da3a0f055526
mod_rest: Fix handling of 'node' attribute in disco#info
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
81 local disco = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info", node = s.node }); |
| 3813 | 82 if s.identities then |
|
3848
1b9834500123
mod_rest: Fix iteration over disco#info identities
Kim Alvefur <zash@zash.se>
parents:
3823
diff
changeset
|
83 for _, identity in ipairs(s.identities) do |
|
3850
8d13b9c9ba75
mod_rest: Fix disco#info identities data mapping
Kim Alvefur <zash@zash.se>
parents:
3849
diff
changeset
|
84 disco:tag("identity", { category = identity.category, type = identity.type, name = identity.name }):up(); |
| 3813 | 85 end |
| 86 end | |
| 87 if s.features then | |
|
3849
11c34e97fe1a
mod_rest: Fix iteration over disco#info features
Kim Alvefur <zash@zash.se>
parents:
3848
diff
changeset
|
88 for _, feature in ipairs(s.features) do |
| 3813 | 89 disco:tag("feature", { var = feature }):up(); |
| 90 end | |
| 91 end | |
|
3859
da3a0f055526
mod_rest: Fix handling of 'node' attribute in disco#info
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
92 return disco; |
|
da3a0f055526
mod_rest: Fix handling of 'node' attribute in disco#info
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
93 else |
| 3870 | 94 return st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info", }); |
| 3813 | 95 end |
| 96 end; | |
| 97 }; | |
| 98 | |
| 99 items = { | |
| 100 "func", "http://jabber.org/protocol/disco#items", "query", | |
|
3875
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3871
diff
changeset
|
101 function (s) --> array of features | map with node |
|
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3871
diff
changeset
|
102 if s.attr.node and s.tags[1] == nil then |
|
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3871
diff
changeset
|
103 return { node = s.attr. node }; |
|
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3871
diff
changeset
|
104 end |
|
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3871
diff
changeset
|
105 |
| 3813 | 106 local items = array(); |
| 107 for item in s:childtags("item") do | |
| 108 items:push({ jid = item.attr.jid, node = item.attr.node, name = item.attr.name }); | |
| 109 end | |
| 110 return items; | |
| 111 end; | |
| 112 function (s) | |
|
3860
9752a6f1b9f3
mod_rest: Avoid treating special json.null value as any other table
Kim Alvefur <zash@zash.se>
parents:
3859
diff
changeset
|
113 if type(s) == "table" and s ~= json.null then |
|
3875
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3871
diff
changeset
|
114 local disco = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#items", node = s.node }); |
| 3813 | 115 for _, item in ipairs(s) do |
|
3852
66f96b98d219
mod_rest: Allow returning an array of JID strings as disco#items
Kim Alvefur <zash@zash.se>
parents:
3851
diff
changeset
|
116 if type(item) == "string" then |
|
66f96b98d219
mod_rest: Allow returning an array of JID strings as disco#items
Kim Alvefur <zash@zash.se>
parents:
3851
diff
changeset
|
117 disco:tag("item", { jid = item }); |
|
66f96b98d219
mod_rest: Allow returning an array of JID strings as disco#items
Kim Alvefur <zash@zash.se>
parents:
3851
diff
changeset
|
118 elseif type(item) == "table" then |
|
66f96b98d219
mod_rest: Allow returning an array of JID strings as disco#items
Kim Alvefur <zash@zash.se>
parents:
3851
diff
changeset
|
119 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:
3851
diff
changeset
|
120 end |
| 3813 | 121 end |
|
3875
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3871
diff
changeset
|
122 return disco; |
|
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3871
diff
changeset
|
123 else |
|
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3871
diff
changeset
|
124 return st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#items", }); |
| 3813 | 125 end |
| 126 end; | |
| 127 }; | |
| 128 | |
|
3877
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
129 -- XEP-0050: Ad-Hoc Commands |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
130 command = {"func", "http://jabber.org/protocol/commands", "command", |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
131 function (s) |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
132 local cmd = { |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
133 action = s.attr.action, |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
134 node = s.attr.node, |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
135 sessionid = s.attr.sessionid, |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
136 status = s.attr.status, |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
137 }; |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
138 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:
3875
diff
changeset
|
139 local note = s:get_child("note"); |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
140 -- TODO -- local form = s:get_child("x", "jabber:x:data"); |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
141 if actions then |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
142 cmd.actions = { |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
143 execute = actions.attr.execute, |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
144 }; |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
145 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:
3875
diff
changeset
|
146 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:
3875
diff
changeset
|
147 end |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
148 elseif note then |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
149 cmd.note = { |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
150 type = note.attr.type; |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
151 text = note:get_text(); |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
152 }; |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
153 end |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
154 return cmd; |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
155 end; |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
156 function (s) |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
157 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:
3875
diff
changeset
|
158 local cmd = st.stanza("command", { |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
159 xmlns = "http://jabber.org/protocol/commands", |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
160 action = s.action, |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
161 node = s.node, |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
162 sessionid = s.sessionid, |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
163 status = s.status, |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
164 }); |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
165 return cmd; |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
166 elseif type(s) == "string" then -- assume node |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
167 return st.stanza("command", { xmlns = "http://jabber.org/protocol/commands", node = s }); |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
168 end |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
169 -- else .. missing required attribute |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
170 end; |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
171 }; |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
172 |
|
3855
0e1e900577c4
mod_rest: Improve some comments
Kim Alvefur <zash@zash.se>
parents:
3854
diff
changeset
|
173 -- XEP-0066: Out of Band Data |
| 3813 | 174 oob_url = {"func", "jabber:iq:oob", "query", |
| 175 function (s) | |
| 176 return s:get_child_text("url"); | |
| 177 end; | |
| 178 function (s) | |
|
3817
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
179 if type(s) == "string" then |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
180 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:
3813
diff
changeset
|
181 end |
| 3813 | 182 end; |
| 183 }; | |
|
3823
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
184 |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
185 -- XEP-XXXX: User-defined Data Transfer |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
186 payload = {"func", "urn:xmpp:udt:0", "payload", |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
187 function (s) |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
188 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:
3822
diff
changeset
|
189 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:
3822
diff
changeset
|
190 local parsed, err = json.decode(rawjson); |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
191 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:
3822
diff
changeset
|
192 return { |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
193 datatype = s.attr.datatype; |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
194 data = parsed; |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
195 }; |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
196 end; |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
197 function (s) |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
198 if type(s) == "table" then |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
199 return st.stanza("payload", { xmlns = "urn:xmpp:udt:0", datatype = s.datatype }) |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
200 :tag("json", { xmlns = "urn:xmpp:json:0" }):text(json.encode(s.data)); |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
201 end; |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
202 end |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
203 }; |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
204 |
| 3813 | 205 }; |
| 206 | |
| 207 local implied_kinds = { | |
| 208 disco = "iq", | |
| 209 items = "iq", | |
| 210 ping = "iq", | |
|
3854
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
211 version = "iq", |
|
3877
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
212 command = "iq", |
| 3813 | 213 |
| 214 body = "message", | |
| 215 html = "message", | |
| 216 replace = "message", | |
| 217 state = "message", | |
| 218 subject = "message", | |
| 219 thread = "message", | |
| 220 | |
| 221 join = "presence", | |
| 222 priority = "presence", | |
| 223 show = "presence", | |
| 224 status = "presence", | |
| 225 } | |
| 226 | |
| 227 local kind_by_type = { | |
| 228 get = "iq", set = "iq", result = "iq", | |
| 229 normal = "message", chat = "message", headline = "message", groupchat = "message", | |
| 230 available = "presence", unavailable = "presence", | |
| 231 subscribe = "presence", unsubscribe = "presence", | |
| 232 subscribed = "presence", unsubscribed = "presence", | |
| 233 } | |
| 234 | |
| 235 local function st2json(s) | |
| 236 local t = { | |
| 237 kind = s.name, | |
| 238 type = s.attr.type, | |
| 239 to = s.attr.to, | |
| 240 from = s.attr.from, | |
| 241 id = s.attr.id, | |
| 242 }; | |
| 243 if s.name == "presence" and not s.attr.type then | |
| 244 t.type = "available"; | |
| 245 end | |
| 246 | |
| 247 if t.to then | |
| 248 t.to = jid.prep(t.to); | |
| 249 if not t.to then return nil, "invalid-jid-to"; end | |
| 250 end | |
| 251 if t.from then | |
| 252 t.from = jid.prep(t.from); | |
| 253 if not t.from then return nil, "invalid-jid-from"; end | |
| 254 end | |
| 255 | |
| 256 if t.type == "error" then | |
|
3871
e5d08bb58155
mod_rest: Map the error@by attribute
Kim Alvefur <zash@zash.se>
parents:
3870
diff
changeset
|
257 local error = s:get_child("error"); |
| 3813 | 258 local err_typ, err_condition, err_text = s:get_error(); |
| 259 t.error = { | |
| 260 type = err_typ, | |
| 261 condition = err_condition, | |
|
3871
e5d08bb58155
mod_rest: Map the error@by attribute
Kim Alvefur <zash@zash.se>
parents:
3870
diff
changeset
|
262 text = err_text, |
|
e5d08bb58155
mod_rest: Map the error@by attribute
Kim Alvefur <zash@zash.se>
parents:
3870
diff
changeset
|
263 by = error.attr.by, |
| 3813 | 264 }; |
| 265 return t; | |
| 266 end | |
| 267 | |
| 268 for k, typ in pairs(simple_types) do | |
| 269 if typ == "text_tag" then | |
| 270 t[k] = s:get_child_text(k); | |
| 271 elseif typ[1] == "text_tag" then | |
| 272 t[k] = s:get_child_text(typ[3], typ[2]); | |
| 273 elseif typ[1] == "name" then | |
| 274 local child = s:get_child(nil, typ[2]); | |
| 275 if child then | |
| 276 t[k] = child.name; | |
| 277 end | |
| 278 elseif typ[1] == "attr" then | |
| 279 local child = s:get_child(typ[3], typ[2]) | |
| 280 if child then | |
| 281 t[k] = child.attr[typ[4]]; | |
| 282 end | |
| 283 elseif typ[1] == "bool_tag" then | |
| 284 if s:get_child(typ[3], typ[2]) then | |
| 285 t[k] = true; | |
| 286 end | |
| 287 elseif typ[1] == "func" then | |
| 288 local child = s:get_child(typ[3], typ[2] or k); | |
| 289 -- TODO handle err | |
| 290 if child then | |
| 291 t[k] = typ[4](child); | |
| 292 end | |
| 293 end | |
| 294 end | |
| 295 | |
| 296 return t; | |
| 297 end | |
| 298 | |
|
3817
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
299 local function str(s) |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
300 if type(s) == "string" then |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
301 return s; |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
302 end |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
303 end |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
304 |
| 3813 | 305 local function json2st(t) |
|
3817
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
306 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:
3813
diff
changeset
|
307 return nil, "invalid-json"; |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
308 end |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
309 local kind = str(t.kind) or kind_by_type[str(t.type)]; |
| 3813 | 310 if not kind then |
| 311 for k, implied in pairs(implied_kinds) do | |
| 312 if t[k] then | |
| 313 kind = implied; | |
| 314 break | |
| 315 end | |
| 316 end | |
| 317 end | |
| 318 | |
| 319 local s = st.stanza(kind or "message", { | |
|
3817
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
320 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:
3813
diff
changeset
|
321 to = str(t.to) and jid.prep(t.to); |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
322 from = str(t.to) and jid.prep(t.from); |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
323 id = str(t.id), |
| 3813 | 324 }); |
| 325 | |
| 326 if t.to and not s.attr.to then | |
| 327 return nil, "invalid-jid-to"; | |
| 328 end | |
| 329 if t.from and not s.attr.from then | |
| 330 return nil, "invalid-jid-from"; | |
| 331 end | |
| 3819 | 332 if kind == "iq" and not s.attr.type then |
| 333 s.attr.type = "get"; | |
|
3818
a607c69d0804
mod_rest: Guess 'get' as default type for 'iq' stanzas in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3817
diff
changeset
|
334 end |
| 3813 | 335 |
|
3817
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
336 if type(t.error) == "table" then |
|
3871
e5d08bb58155
mod_rest: Map the error@by attribute
Kim Alvefur <zash@zash.se>
parents:
3870
diff
changeset
|
337 return st.error_reply(st.reply(s), str(t.error.type), str(t.error.condition), str(t.error.text), str(t.error.by)); |
| 3813 | 338 elseif t.type == "error" then |
| 339 s:text_tag("error", t.body, { code = t.error_code and tostring(t.error_code) }); | |
| 340 return s; | |
| 341 end | |
| 342 | |
| 343 for k, v in pairs(t) do | |
| 344 local typ = simple_types[k]; | |
| 345 if typ then | |
| 346 if typ == "text_tag" then | |
| 347 s:text_tag(k, v); | |
| 348 elseif typ[1] == "text_tag" then | |
| 349 s:text_tag(typ[3] or k, v, typ[2] and { xmlns = typ[2] }); | |
| 350 elseif typ[1] == "name" then | |
| 351 s:tag(v, { xmlns = typ[2] }):up(); | |
| 352 elseif typ[1] == "attr" then | |
| 353 s:tag(typ[3] or k, { xmlns = typ[2], [ typ[4] or k ] = v }):up(); | |
| 354 elseif typ[1] == "bool_tag" then | |
| 355 s:tag(typ[3] or k, { xmlns = typ[2] }):up(); | |
| 356 elseif typ[1] == "func" then | |
| 357 s:add_child(typ[5](v)):up(); | |
| 358 end | |
| 359 end | |
| 360 end | |
| 361 | |
| 362 s:reset(); | |
| 363 | |
| 364 return s; | |
| 365 end | |
| 366 | |
| 367 return { | |
| 368 st2json = st2json; | |
| 369 json2st = json2st; | |
| 370 }; |