author | Matthew Wild <mwild1@gmail.com> |
Fri, 23 Feb 2024 12:13:06 +0000 | |
changeset 13434 | 1a5e3cf037f6 |
parent 13413 | 95d8875c90dc |
permissions | -rw-r--r-- |
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1510
diff
changeset
|
1 |
-- Prosody IM |
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
1704
diff
changeset
|
2 |
-- Copyright (C) 2008-2010 Matthew Wild |
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
1704
diff
changeset
|
3 |
-- Copyright (C) 2008-2010 Waqas Hussain |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5772
diff
changeset
|
4 |
-- |
758 | 5 |
-- This project is MIT/X11 licensed. Please see the |
6 |
-- COPYING file in the source package for more information. |
|
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
7 |
-- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
8 |
|
12981
74b9e05af71e
plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents:
12646
diff
changeset
|
9 |
local get_children = require "prosody.core.hostmanager".get_children; |
74b9e05af71e
plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents:
12646
diff
changeset
|
10 |
local is_contact_subscribed = require "prosody.core.rostermanager".is_contact_subscribed; |
74b9e05af71e
plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents:
12646
diff
changeset
|
11 |
local jid_split = require "prosody.util.jid".split; |
74b9e05af71e
plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents:
12646
diff
changeset
|
12 |
local jid_bare = require "prosody.util.jid".bare; |
74b9e05af71e
plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents:
12646
diff
changeset
|
13 |
local st = require "prosody.util.stanza" |
74b9e05af71e
plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents:
12646
diff
changeset
|
14 |
local calculate_hash = require "prosody.util.caps".calculate_hash; |
1510
83b2e07e9039
mod_disco: Convert from Windows line endings
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
15 |
|
12021
b3f040e57835
mod_disco: Optionally return info on admin accounts to non-contacts
Kim Alvefur <zash@zash.se>
parents:
12020
diff
changeset
|
16 |
local expose_admins = module:get_option_boolean("disco_expose_admins", false); |
b3f040e57835
mod_disco: Optionally return info on admin accounts to non-contacts
Kim Alvefur <zash@zash.se>
parents:
12020
diff
changeset
|
17 |
|
7980
01d6298de991
plugins/various: Use type-specific config API
Kim Alvefur <zash@zash.se>
parents:
7790
diff
changeset
|
18 |
local disco_items = module:get_option_array("disco_items", {}) |
2491
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
19 |
do -- validate disco_items |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
20 |
for _, item in ipairs(disco_items) do |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
21 |
local err; |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
22 |
if type(item) ~= "table" then |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
23 |
err = "item is not a table"; |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
24 |
elseif type(item[1]) ~= "string" then |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
25 |
err = "item jid is not a string"; |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
26 |
elseif item[2] and type(item[2]) ~= "string" then |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
27 |
err = "item name is not a string"; |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
28 |
end |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
29 |
if err then |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
30 |
module:log("error", "option disco_items is malformed: %s", err); |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
31 |
disco_items = {}; -- TODO clean up data instead of removing it? |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
32 |
break; |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
33 |
end |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
34 |
end |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
35 |
end |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
36 |
|
5772
9cef4b5c2fe3
mod_disco: Check for host type == 'local' ('normal' never existed)
Matthew Wild <mwild1@gmail.com>
parents:
5689
diff
changeset
|
37 |
if module:get_host_type() == "local" then |
12392
50fcd3879482
spelling: non-existing mistakes (thanks timeless)
Kim Alvefur <zash@zash.se>
parents:
12021
diff
changeset
|
38 |
module:add_identity("server", "im", module:get_option_string("name", "Prosody")); -- FIXME should be in the nonexisting mod_router |
5689
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
39 |
end |
1510
83b2e07e9039
mod_disco: Convert from Windows line endings
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
40 |
module:add_feature("http://jabber.org/protocol/disco#info"); |
83b2e07e9039
mod_disco: Convert from Windows line endings
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
41 |
module:add_feature("http://jabber.org/protocol/disco#items"); |
83b2e07e9039
mod_disco: Convert from Windows line endings
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
42 |
|
3347
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
43 |
-- Generate and cache disco result and caps hash |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
44 |
local _cached_server_disco_info, _cached_server_caps_feature, _cached_server_caps_hash; |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
45 |
local function build_server_disco_info() |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
46 |
local query = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info" }); |
3343
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
47 |
local done = {}; |
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
48 |
for _,identity in ipairs(module:get_host_items("identity")) do |
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
49 |
local identity_s = identity.category.."\0"..identity.type; |
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
50 |
if not done[identity_s] then |
3347
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
51 |
query:tag("identity", identity):up(); |
3343
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
52 |
done[identity_s] = true; |
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
53 |
end |
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
54 |
end |
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
55 |
for _,feature in ipairs(module:get_host_items("feature")) do |
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
56 |
if not done[feature] then |
3347
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
57 |
query:tag("feature", {var=feature}):up(); |
3343
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
58 |
done[feature] = true; |
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
59 |
end |
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
60 |
end |
4337
a2ee8ab82dd9
core.modulemanager, mod_disco: Add support for XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3695
diff
changeset
|
61 |
for _,extension in ipairs(module:get_host_items("extension")) do |
a2ee8ab82dd9
core.modulemanager, mod_disco: Add support for XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3695
diff
changeset
|
62 |
if not done[extension] then |
a2ee8ab82dd9
core.modulemanager, mod_disco: Add support for XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3695
diff
changeset
|
63 |
query:add_child(extension); |
a2ee8ab82dd9
core.modulemanager, mod_disco: Add support for XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3695
diff
changeset
|
64 |
done[extension] = true; |
a2ee8ab82dd9
core.modulemanager, mod_disco: Add support for XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3695
diff
changeset
|
65 |
end |
a2ee8ab82dd9
core.modulemanager, mod_disco: Add support for XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3695
diff
changeset
|
66 |
end |
3347
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
67 |
_cached_server_disco_info = query; |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
68 |
_cached_server_caps_hash = calculate_hash(query); |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
69 |
_cached_server_caps_feature = st.stanza("c", { |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
70 |
xmlns = "http://jabber.org/protocol/caps"; |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
71 |
hash = "sha-1"; |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
72 |
node = "http://prosody.im"; |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
73 |
ver = _cached_server_caps_hash; |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
74 |
}); |
3343
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
75 |
end |
11208
ae2a11066001
mod_disco: Add some spacing to improve readability and code navigation
Kim Alvefur <zash@zash.se>
parents:
9226
diff
changeset
|
76 |
|
3347
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
77 |
local function clear_disco_cache() |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
78 |
_cached_server_disco_info, _cached_server_caps_feature, _cached_server_caps_hash = nil, nil, nil; |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
79 |
end |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
80 |
local function get_server_disco_info() |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
81 |
if not _cached_server_disco_info then build_server_disco_info(); end |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
82 |
return _cached_server_disco_info; |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
83 |
end |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
84 |
local function get_server_caps_feature() |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
85 |
if not _cached_server_caps_feature then build_server_disco_info(); end |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
86 |
return _cached_server_caps_feature; |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
87 |
end |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
88 |
local function get_server_caps_hash() |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
89 |
if not _cached_server_caps_hash then build_server_disco_info(); end |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
90 |
return _cached_server_caps_hash; |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
91 |
end |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
92 |
|
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
93 |
module:hook("item-added/identity", clear_disco_cache); |
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
94 |
module:hook("item-added/feature", clear_disco_cache); |
4337
a2ee8ab82dd9
core.modulemanager, mod_disco: Add support for XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3695
diff
changeset
|
95 |
module:hook("item-added/extension", clear_disco_cache); |
3665
98b55c3a3deb
mod_disco: Fixed: Service discovery features were not being removed on module unload (issue #205).
Waqas Hussain <waqas20@gmail.com>
parents:
3600
diff
changeset
|
96 |
module:hook("item-removed/identity", clear_disco_cache); |
98b55c3a3deb
mod_disco: Fixed: Service discovery features were not being removed on module unload (issue #205).
Waqas Hussain <waqas20@gmail.com>
parents:
3600
diff
changeset
|
97 |
module:hook("item-removed/feature", clear_disco_cache); |
4337
a2ee8ab82dd9
core.modulemanager, mod_disco: Add support for XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3695
diff
changeset
|
98 |
module:hook("item-removed/extension", clear_disco_cache); |
3347
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
99 |
|
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
100 |
-- Handle disco requests to the server |
9226
80dbb60d81e4
mod_disco: Simplify iq handling by hooking on iq-get/ instead of iq/.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
8837
diff
changeset
|
101 |
module:hook("iq-get/host/http://jabber.org/protocol/disco#info:query", function(event) |
1699
53d16a28ee00
mod_disco: Handle disco#info queries using new APIs
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
102 |
local origin, stanza = event.origin, event.stanza; |
53d16a28ee00
mod_disco: Handle disco#info queries using new APIs
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
103 |
local node = stanza.tags[1].attr.node; |
5689
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
104 |
if node and node ~= "" and node ~= "http://prosody.im#"..get_server_caps_hash() then |
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
105 |
local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#info', node=node}); |
8044
3b2cc22e9b5b
mod_disco: Rename variables to avoid name clash [luacheck]
Kim Alvefur <zash@zash.se>
parents:
8006
diff
changeset
|
106 |
local node_event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false}; |
3b2cc22e9b5b
mod_disco: Rename variables to avoid name clash [luacheck]
Kim Alvefur <zash@zash.se>
parents:
8006
diff
changeset
|
107 |
local ret = module:fire_event("host-disco-info-node", node_event); |
5689
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
108 |
if ret ~= nil then return ret; end |
8044
3b2cc22e9b5b
mod_disco: Rename variables to avoid name clash [luacheck]
Kim Alvefur <zash@zash.se>
parents:
8006
diff
changeset
|
109 |
if node_event.exists then |
5689
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
110 |
origin.send(reply); |
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
111 |
else |
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
112 |
origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Node does not exist")); |
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
113 |
end |
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
114 |
return true; |
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
115 |
end |
3349
a416d714a905
mod_disco: Reflect requested 'node' attribute in the disco#info reply.
Waqas Hussain <waqas20@gmail.com>
parents:
3348
diff
changeset
|
116 |
local reply_query = get_server_disco_info(); |
8005
57060d0cee4b
mod_disco: Correctly set the 'node' attr (fixes #449)
Kim Alvefur <zash@zash.se>
parents:
5081
diff
changeset
|
117 |
reply_query.attr.node = node; |
3349
a416d714a905
mod_disco: Reflect requested 'node' attribute in the disco#info reply.
Waqas Hussain <waqas20@gmail.com>
parents:
3348
diff
changeset
|
118 |
local reply = st.reply(stanza):add_child(reply_query); |
1699
53d16a28ee00
mod_disco: Handle disco#info queries using new APIs
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
119 |
origin.send(reply); |
53d16a28ee00
mod_disco: Handle disco#info queries using new APIs
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
120 |
return true; |
53d16a28ee00
mod_disco: Handle disco#info queries using new APIs
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
121 |
end); |
11208
ae2a11066001
mod_disco: Add some spacing to improve readability and code navigation
Kim Alvefur <zash@zash.se>
parents:
9226
diff
changeset
|
122 |
|
9226
80dbb60d81e4
mod_disco: Simplify iq handling by hooking on iq-get/ instead of iq/.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
8837
diff
changeset
|
123 |
module:hook("iq-get/host/http://jabber.org/protocol/disco#items:query", function(event) |
1701
ceab61010f87
mod_disco: Handle disco#items queries using new APIs
Waqas Hussain <waqas20@gmail.com>
parents:
1700
diff
changeset
|
124 |
local origin, stanza = event.origin, event.stanza; |
ceab61010f87
mod_disco: Handle disco#items queries using new APIs
Waqas Hussain <waqas20@gmail.com>
parents:
1700
diff
changeset
|
125 |
local node = stanza.tags[1].attr.node; |
5689
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
126 |
if node and node ~= "" then |
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
127 |
local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#items', node=node}); |
8044
3b2cc22e9b5b
mod_disco: Rename variables to avoid name clash [luacheck]
Kim Alvefur <zash@zash.se>
parents:
8006
diff
changeset
|
128 |
local node_event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false}; |
3b2cc22e9b5b
mod_disco: Rename variables to avoid name clash [luacheck]
Kim Alvefur <zash@zash.se>
parents:
8006
diff
changeset
|
129 |
local ret = module:fire_event("host-disco-items-node", node_event); |
5689
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
130 |
if ret ~= nil then return ret; end |
8044
3b2cc22e9b5b
mod_disco: Rename variables to avoid name clash [luacheck]
Kim Alvefur <zash@zash.se>
parents:
8006
diff
changeset
|
131 |
if node_event.exists then |
5689
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
132 |
origin.send(reply); |
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
133 |
else |
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
134 |
origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Node does not exist")); |
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
135 |
end |
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
136 |
return true; |
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
137 |
end |
1701
ceab61010f87
mod_disco: Handle disco#items queries using new APIs
Waqas Hussain <waqas20@gmail.com>
parents:
1700
diff
changeset
|
138 |
local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#items"); |
5689
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
139 |
local ret = module:fire_event("host-disco-items", { origin = origin, stanza = stanza, reply = reply }); |
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
140 |
if ret ~= nil then return ret; end |
5081
c0c060e450be
hostmanager, mod_disco: Show optional 'name' option from the config in disco#items queries (fixes use-case in #292) (thanks diSabler, mva)
Matthew Wild <mwild1@gmail.com>
parents:
4985
diff
changeset
|
141 |
for jid, name in pairs(get_children(module.host)) do |
c0c060e450be
hostmanager, mod_disco: Show optional 'name' option from the config in disco#items queries (fixes use-case in #292) (thanks diSabler, mva)
Matthew Wild <mwild1@gmail.com>
parents:
4985
diff
changeset
|
142 |
reply:tag("item", {jid = jid, name = name~=true and name or nil}):up(); |
1701
ceab61010f87
mod_disco: Handle disco#items queries using new APIs
Waqas Hussain <waqas20@gmail.com>
parents:
1700
diff
changeset
|
143 |
end |
2491
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
144 |
for _, item in ipairs(disco_items) do |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
145 |
reply:tag("item", {jid=item[1], name=item[2]}):up(); |
4be6810914eb
mod_disco: Added option 'disco_items' to allow appending items to a host's disco#items result.
Waqas Hussain <waqas20@gmail.com>
parents:
2383
diff
changeset
|
146 |
end |
1701
ceab61010f87
mod_disco: Handle disco#items queries using new APIs
Waqas Hussain <waqas20@gmail.com>
parents:
1700
diff
changeset
|
147 |
origin.send(reply); |
ceab61010f87
mod_disco: Handle disco#items queries using new APIs
Waqas Hussain <waqas20@gmail.com>
parents:
1700
diff
changeset
|
148 |
return true; |
ceab61010f87
mod_disco: Handle disco#items queries using new APIs
Waqas Hussain <waqas20@gmail.com>
parents:
1700
diff
changeset
|
149 |
end); |
3343
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
150 |
|
3347
99f56bed5228
mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.
Waqas Hussain <waqas20@gmail.com>
parents:
3343
diff
changeset
|
151 |
-- Handle caps stream feature |
3343
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
152 |
module:hook("stream-features", function (event) |
8191
8c524b7c9017
mod_disco: Advertise in stream-features after auth (probably what was meant in 200f1f6306a7) (fixes #957)
Kim Alvefur <zash@zash.se>
parents:
8159
diff
changeset
|
153 |
if event.origin.type == "c2s" or event.origin.type == "c2s_unbound" then |
3695
d2c4856c7ed5
mod_disco: Don't add caps hash to stream features on unauthenticated connections.
Waqas Hussain <waqas20@gmail.com>
parents:
3665
diff
changeset
|
154 |
event.features:add_child(get_server_caps_feature()); |
d2c4856c7ed5
mod_disco: Don't add caps hash to stream features on unauthenticated connections.
Waqas Hussain <waqas20@gmail.com>
parents:
3665
diff
changeset
|
155 |
end |
3343
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
156 |
end); |
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
157 |
|
11741
59cf555b4698
mod_disco: Send XEP-0115 caps in s2s stream features
Kim Alvefur <zash@zash.se>
parents:
11208
diff
changeset
|
158 |
module:hook("s2s-stream-features", function (event) |
59cf555b4698
mod_disco: Send XEP-0115 caps in s2s stream features
Kim Alvefur <zash@zash.se>
parents:
11208
diff
changeset
|
159 |
if event.origin.type == "s2sin" then |
59cf555b4698
mod_disco: Send XEP-0115 caps in s2s stream features
Kim Alvefur <zash@zash.se>
parents:
11208
diff
changeset
|
160 |
event.features:add_child(get_server_caps_feature()); |
59cf555b4698
mod_disco: Send XEP-0115 caps in s2s stream features
Kim Alvefur <zash@zash.se>
parents:
11208
diff
changeset
|
161 |
end |
59cf555b4698
mod_disco: Send XEP-0115 caps in s2s stream features
Kim Alvefur <zash@zash.se>
parents:
11208
diff
changeset
|
162 |
end); |
59cf555b4698
mod_disco: Send XEP-0115 caps in s2s stream features
Kim Alvefur <zash@zash.se>
parents:
11208
diff
changeset
|
163 |
|
12646
9061f9621330
Switch to a new role-based authorization framework, removing is_admin()
Matthew Wild <mwild1@gmail.com>
parents:
12392
diff
changeset
|
164 |
module:default_permission("prosody:admin", ":be-discovered-admin"); |
9061f9621330
Switch to a new role-based authorization framework, removing is_admin()
Matthew Wild <mwild1@gmail.com>
parents:
12392
diff
changeset
|
165 |
|
3343
c70c6d5bf270
mod_disco: Support for putting the server's caps hash in stream:features to allow the client to cache disco#info for the server instead of requesting it at each login.
Matthew Wild <mwild1@gmail.com>
parents:
2925
diff
changeset
|
166 |
-- Handle disco requests to user accounts |
8837
b0093d3b2d04
mod_disco: Skip code specific to disco on user accounts (avoids invoking usermanager, fixes #1150)
Kim Alvefur <zash@zash.se>
parents:
8191
diff
changeset
|
167 |
if module:get_host_type() ~= "local" then return end -- skip for components |
9226
80dbb60d81e4
mod_disco: Simplify iq handling by hooking on iq-get/ instead of iq/.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
8837
diff
changeset
|
168 |
module:hook("iq-get/bare/http://jabber.org/protocol/disco#info:query", function(event) |
2383
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
169 |
local origin, stanza = event.origin, event.stanza; |
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
170 |
local node = stanza.tags[1].attr.node; |
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
171 |
local username = jid_split(stanza.attr.to) or origin.username; |
12646
9061f9621330
Switch to a new role-based authorization framework, removing is_admin()
Matthew Wild <mwild1@gmail.com>
parents:
12392
diff
changeset
|
172 |
local target_is_admin = module:may(":be-discovered-admin", stanza.attr.to or origin.full_jid); |
9061f9621330
Switch to a new role-based authorization framework, removing is_admin()
Matthew Wild <mwild1@gmail.com>
parents:
12392
diff
changeset
|
173 |
if not stanza.attr.to or (expose_admins and target_is_admin) or is_contact_subscribed(username, module.host, jid_bare(stanza.attr.from)) then |
5627
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
174 |
if node and node ~= "" then |
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
175 |
local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#info', node=node}); |
13412
d7857ef7843a
mod_disco: Advertise disco#info and #items on bare JIDs to fix #1664
Kim Alvefur <zash@zash.se>
parents:
12392
diff
changeset
|
176 |
reply:tag("feature", { var = "http://jabber.org/protocol/disco#info" }):up(); |
d7857ef7843a
mod_disco: Advertise disco#info and #items on bare JIDs to fix #1664
Kim Alvefur <zash@zash.se>
parents:
12392
diff
changeset
|
177 |
reply:tag("feature", { var = "http://jabber.org/protocol/disco#items" }):up(); |
5627
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
178 |
if not reply.attr.from then reply.attr.from = origin.username.."@"..origin.host; end -- COMPAT To satisfy Psi when querying own account |
8044
3b2cc22e9b5b
mod_disco: Rename variables to avoid name clash [luacheck]
Kim Alvefur <zash@zash.se>
parents:
8006
diff
changeset
|
179 |
local node_event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false}; |
3b2cc22e9b5b
mod_disco: Rename variables to avoid name clash [luacheck]
Kim Alvefur <zash@zash.se>
parents:
8006
diff
changeset
|
180 |
local ret = module:fire_event("account-disco-info-node", node_event); |
5689
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
181 |
if ret ~= nil then return ret; end |
8044
3b2cc22e9b5b
mod_disco: Rename variables to avoid name clash [luacheck]
Kim Alvefur <zash@zash.se>
parents:
8006
diff
changeset
|
182 |
if node_event.exists then |
5627
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
183 |
origin.send(reply); |
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
184 |
else |
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
185 |
origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Node does not exist")); |
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
186 |
end |
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
187 |
return true; |
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
188 |
end |
2383
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
189 |
local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#info'}); |
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
190 |
if not reply.attr.from then reply.attr.from = origin.username.."@"..origin.host; end -- COMPAT To satisfy Psi when querying own account |
12646
9061f9621330
Switch to a new role-based authorization framework, removing is_admin()
Matthew Wild <mwild1@gmail.com>
parents:
12392
diff
changeset
|
191 |
if target_is_admin then |
12019
b4db17aeff01
mod_disco: Advertise admin accounts as such via disco identity
Kim Alvefur <zash@zash.se>
parents:
11741
diff
changeset
|
192 |
reply:tag('identity', {category='account', type='admin'}):up(); |
12020
b7e15abde27f
mod_disco: Advertise anonymous users
Kim Alvefur <zash@zash.se>
parents:
12019
diff
changeset
|
193 |
elseif prosody.hosts[module.host].users.name == "anonymous" then |
b7e15abde27f
mod_disco: Advertise anonymous users
Kim Alvefur <zash@zash.se>
parents:
12019
diff
changeset
|
194 |
reply:tag('identity', {category='account', type='anonymous'}):up(); |
12019
b4db17aeff01
mod_disco: Advertise admin accounts as such via disco identity
Kim Alvefur <zash@zash.se>
parents:
11741
diff
changeset
|
195 |
else |
b4db17aeff01
mod_disco: Advertise admin accounts as such via disco identity
Kim Alvefur <zash@zash.se>
parents:
11741
diff
changeset
|
196 |
reply:tag('identity', {category='account', type='registered'}):up(); |
b4db17aeff01
mod_disco: Advertise admin accounts as such via disco identity
Kim Alvefur <zash@zash.se>
parents:
11741
diff
changeset
|
197 |
end |
13412
d7857ef7843a
mod_disco: Advertise disco#info and #items on bare JIDs to fix #1664
Kim Alvefur <zash@zash.se>
parents:
12392
diff
changeset
|
198 |
reply:tag("feature", { var = "http://jabber.org/protocol/disco#info" }):up(); |
d7857ef7843a
mod_disco: Advertise disco#info and #items on bare JIDs to fix #1664
Kim Alvefur <zash@zash.se>
parents:
12392
diff
changeset
|
199 |
reply:tag("feature", { var = "http://jabber.org/protocol/disco#items" }):up(); |
5627
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
200 |
module:fire_event("account-disco-info", { origin = origin, reply = reply }); |
2383
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
201 |
origin.send(reply); |
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
202 |
return true; |
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
203 |
end |
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
204 |
end); |
11208
ae2a11066001
mod_disco: Add some spacing to improve readability and code navigation
Kim Alvefur <zash@zash.se>
parents:
9226
diff
changeset
|
205 |
|
9226
80dbb60d81e4
mod_disco: Simplify iq handling by hooking on iq-get/ instead of iq/.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
8837
diff
changeset
|
206 |
module:hook("iq-get/bare/http://jabber.org/protocol/disco#items:query", function(event) |
2383
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
207 |
local origin, stanza = event.origin, event.stanza; |
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
208 |
local node = stanza.tags[1].attr.node; |
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
209 |
local username = jid_split(stanza.attr.to) or origin.username; |
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
210 |
if not stanza.attr.to or is_contact_subscribed(username, module.host, jid_bare(stanza.attr.from)) then |
5627
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
211 |
if node and node ~= "" then |
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
212 |
local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#items', node=node}); |
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
213 |
if not reply.attr.from then reply.attr.from = origin.username.."@"..origin.host; end -- COMPAT To satisfy Psi when querying own account |
8044
3b2cc22e9b5b
mod_disco: Rename variables to avoid name clash [luacheck]
Kim Alvefur <zash@zash.se>
parents:
8006
diff
changeset
|
214 |
local node_event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false}; |
3b2cc22e9b5b
mod_disco: Rename variables to avoid name clash [luacheck]
Kim Alvefur <zash@zash.se>
parents:
8006
diff
changeset
|
215 |
local ret = module:fire_event("account-disco-items-node", node_event); |
5689
832ea1e9ac9e
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
Florian Zeitz <florob@babelmonkeys.de>
parents:
5627
diff
changeset
|
216 |
if ret ~= nil then return ret; end |
8044
3b2cc22e9b5b
mod_disco: Rename variables to avoid name clash [luacheck]
Kim Alvefur <zash@zash.se>
parents:
8006
diff
changeset
|
217 |
if node_event.exists then |
5627
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
218 |
origin.send(reply); |
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
219 |
else |
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
220 |
origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Node does not exist")); |
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
221 |
end |
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
222 |
return true; |
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
223 |
end |
2383
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
224 |
local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#items'}); |
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
225 |
if not reply.attr.from then reply.attr.from = origin.username.."@"..origin.host; end -- COMPAT To satisfy Psi when querying own account |
5627
0439d1349dc1
mod_disco: Emit events for disco requests, which contain a node, on user accounts
Florian Zeitz <florob@babelmonkeys.de>
parents:
5081
diff
changeset
|
226 |
module:fire_event("account-disco-items", { origin = origin, stanza = stanza, reply = reply }); |
2383
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
227 |
origin.send(reply); |
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
228 |
return true; |
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
229 |
end |
29a30884aadd
mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).
Waqas Hussain <waqas20@gmail.com>
parents:
1704
diff
changeset
|
230 |
end); |
11208
ae2a11066001
mod_disco: Add some spacing to improve readability and code navigation
Kim Alvefur <zash@zash.se>
parents:
9226
diff
changeset
|
231 |