prosody-modules: mod_pubsub_serverinfo/mod_pubsub

annotate mod_pubsub_serverinfo/mod_pubsub_serverinfo.lua @ 5919:99ecfe44910b

mod_pubsub_serverinfo: Explicitly depend on mod_server_info Otherwise the pubsub node will not be advertised unless the admin explicitly loads that module, or another module that depends on it.

author	Matthew Wild <mwild1@gmail.com>
date	Fri, 07 Jun 2024 15:53:30 +0100
parents	d4a8644a1cc5
children

rev	line source
5817 7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	1 local http = require "net.http";
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	2 local json = require "util.json";
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	3 local st = require "util.stanza";
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	4 local new_id = require"util.id".medium;
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	5
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	6 local local_domain = module:get_host();
5884 49b0873932ca mod_pubsub_serverinfo: Don't default to non-local pubsub servers (thanks roughnecks) Matthew Wild <mwild1@gmail.com> parents: 5843 diff changeset	7 local service = module:get_option_string(module.name .. "_service");
5886 2c85397d7241 mod_pubsub_serverinfo: node is a string, not a number Matthew Wild <mwild1@gmail.com> parents: 5885 diff changeset	8 local node = module:get_option_string(module.name .. "_node", "serverinfo");
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	9 local actor = module.host .. "/modules/" .. module.name;
5885 54b451c3790c mod_pubsub_serverinfo: Fix for compatibility with 0.12 option getters Matthew Wild <mwild1@gmail.com> parents: 5884 diff changeset	10 local publication_interval = module:get_option_number(module.name .. "_publication_interval", 300);
54b451c3790c mod_pubsub_serverinfo: Fix for compatibility with 0.12 option getters Matthew Wild <mwild1@gmail.com> parents: 5884 diff changeset	11 local cache_ttl = module:get_option_number(module.name .. "_cache_ttl", 3600);
5817 7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	12 local public_providers_url = module:get_option_string(module.name.."_public_providers_url", "https://data.xmpp.net/providers/v2/providers-Ds.json");
5816 45d0802d0787 mod_pubsub_serverinfo: Allow configuration of node persistence/deletion Matthew Wild <mwild1@gmail.com> parents: 5815 diff changeset	13 local delete_node_on_unload = module:get_option_boolean(module.name.."_delete_node_on_unload", false);
45d0802d0787 mod_pubsub_serverinfo: Allow configuration of node persistence/deletion Matthew Wild <mwild1@gmail.com> parents: 5815 diff changeset	14 local persist_items = module:get_option_boolean(module.name.."_persist_items", true);
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	15
5884 49b0873932ca mod_pubsub_serverinfo: Don't default to non-local pubsub servers (thanks roughnecks) Matthew Wild <mwild1@gmail.com> parents: 5843 diff changeset	16 if not service and prosody.hosts["pubsub."..module.host] then
49b0873932ca mod_pubsub_serverinfo: Don't default to non-local pubsub servers (thanks roughnecks) Matthew Wild <mwild1@gmail.com> parents: 5843 diff changeset	17 service = "pubsub."..module.host;
5917 5c4e102e2563 mod_pubsub_serverinfo: fix bool logic when reading config Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5886 diff changeset	18 end
5918 d4a8644a1cc5 mod_pubsub_serverinfo: fix syntax error Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5917 diff changeset	19 if not service then
5884 49b0873932ca mod_pubsub_serverinfo: Don't default to non-local pubsub servers (thanks roughnecks) Matthew Wild <mwild1@gmail.com> parents: 5843 diff changeset	20 module:log_status("warn", "No pubsub service specified - module not activated");
49b0873932ca mod_pubsub_serverinfo: Don't default to non-local pubsub servers (thanks roughnecks) Matthew Wild <mwild1@gmail.com> parents: 5843 diff changeset	21 return;
49b0873932ca mod_pubsub_serverinfo: Don't default to non-local pubsub servers (thanks roughnecks) Matthew Wild <mwild1@gmail.com> parents: 5843 diff changeset	22 end
49b0873932ca mod_pubsub_serverinfo: Don't default to non-local pubsub servers (thanks roughnecks) Matthew Wild <mwild1@gmail.com> parents: 5843 diff changeset	23
5815 77c5709bd57a mod_pubsub_serverinfo: Add explicit xmlns to all pubsub tags Matthew Wild <mwild1@gmail.com> parents: 5814 diff changeset	24 local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	25
5919 99ecfe44910b mod_pubsub_serverinfo: Explicitly depend on mod_server_info Matthew Wild <mwild1@gmail.com> parents: 5918 diff changeset	26 -- Needed to publish server-info-fields
99ecfe44910b mod_pubsub_serverinfo: Explicitly depend on mod_server_info Matthew Wild <mwild1@gmail.com> parents: 5918 diff changeset	27 module:depends("server_info");
99ecfe44910b mod_pubsub_serverinfo: Explicitly depend on mod_server_info Matthew Wild <mwild1@gmail.com> parents: 5918 diff changeset	28
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	29 function module.load()
5804 c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	30 discover_node():next(
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	31 function(exists)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	32 if not exists then create_node() end
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	33 end
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	34 ):catch(
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	35 function(error)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	36 module:log("warn", "Error prevented discovery or creation of pub/sub node at %s: %s", service, error)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	37 end
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	38 )
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	39
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	40 module:add_feature("urn:xmpp:serverinfo:0");
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	41
5843 79ae71f52c81 mod_pubsub_serverinfo: Update to use mod_server_info (fixes #1841) Matthew Wild <mwild1@gmail.com> parents: 5817 diff changeset	42 module:add_item("server-info-fields", {
79ae71f52c81 mod_pubsub_serverinfo: Update to use mod_server_info (fixes #1841) Matthew Wild <mwild1@gmail.com> parents: 5817 diff changeset	43 { name = "serverinfo-pubsub-node", type = "text-single", value = ("xmpp:%s?;node=%s"):format(service, node) };
79ae71f52c81 mod_pubsub_serverinfo: Update to use mod_server_info (fixes #1841) Matthew Wild <mwild1@gmail.com> parents: 5817 diff changeset	44 });
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	45
5813 d38772479891 mod_pubsub_serverinfo: Some logging improvements Matthew Wild <mwild1@gmail.com> parents: 5812 diff changeset	46 if cache_ttl < publication_interval then
d38772479891 mod_pubsub_serverinfo: Some logging improvements Matthew Wild <mwild1@gmail.com> parents: 5812 diff changeset	47 module:log("warn", "It is recommended to have a cache interval higher than the publication interval");
d38772479891 mod_pubsub_serverinfo: Some logging improvements Matthew Wild <mwild1@gmail.com> parents: 5812 diff changeset	48 end
d38772479891 mod_pubsub_serverinfo: Some logging improvements Matthew Wild <mwild1@gmail.com> parents: 5812 diff changeset	49
5810 76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	50 cache_warm_up()
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	51 module:add_timer(10, publish_serverinfo);
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	52 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	53
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	54 function module.unload()
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	55 -- This removes all subscribers, which may or may not be desirable, depending on the reason for the unload.
5816 45d0802d0787 mod_pubsub_serverinfo: Allow configuration of node persistence/deletion Matthew Wild <mwild1@gmail.com> parents: 5815 diff changeset	56 if delete_node_on_unload then
45d0802d0787 mod_pubsub_serverinfo: Allow configuration of node persistence/deletion Matthew Wild <mwild1@gmail.com> parents: 5815 diff changeset	57 delete_node();
45d0802d0787 mod_pubsub_serverinfo: Allow configuration of node persistence/deletion Matthew Wild <mwild1@gmail.com> parents: 5815 diff changeset	58 end
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	59 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	60
5804 c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	61 -- Returns a promise of a boolean
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	62 function discover_node()
5810 76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	63 local request = st.iq({ type = "get", to = service, from = actor, id = new_id() })
76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	64 :tag("query", { xmlns = "http://jabber.org/protocol/disco#items" })
5804 c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	65
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	66 module:log("debug", "Sending request to discover existence of pub/sub node '%s' at %s", node, service)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	67 return module:send_iq(request):next(
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	68 function(response)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	69 if response.stanza == nil or response.stanza.attr.type ~= "result" then
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	70 module:log("warn", "Unexpected response to service discovery items request at %s: %s", service, response.stanza)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	71 return false
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	72 end
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	73
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	74 local query = response.stanza:get_child("query", "http://jabber.org/protocol/disco#items")
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	75 if query ~= nil then
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	76 for item in query:childtags("item") do
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	77 if item.attr.jid == service and item.attr.node == node then
5813 d38772479891 mod_pubsub_serverinfo: Some logging improvements Matthew Wild <mwild1@gmail.com> parents: 5812 diff changeset	78 module:log("debug", "pub/sub node '%s' at %s does exist.", node, service)
5804 c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	79 return true
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	80 end
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	81 end
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	82 end
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	83 module:log("debug", "pub/sub node '%s' at %s does not exist.", node, service)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	84 return false;
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	85 end
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	86 );
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	87 end
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	88
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	89 -- Returns a promise of a boolean
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	90 function create_node()
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	91 local request = st.iq({ type = "set", to = service, from = actor, id = new_id() })
5815 77c5709bd57a mod_pubsub_serverinfo: Add explicit xmlns to all pubsub tags Matthew Wild <mwild1@gmail.com> parents: 5814 diff changeset	92 :tag("pubsub", { xmlns = xmlns_pubsub })
77c5709bd57a mod_pubsub_serverinfo: Add explicit xmlns to all pubsub tags Matthew Wild <mwild1@gmail.com> parents: 5814 diff changeset	93 :tag("create", { node = node, xmlns = xmlns_pubsub }):up()
77c5709bd57a mod_pubsub_serverinfo: Add explicit xmlns to all pubsub tags Matthew Wild <mwild1@gmail.com> parents: 5814 diff changeset	94 :tag("configure", { xmlns = xmlns_pubsub })
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	95 :tag("x", { xmlns = "jabber:x:data", type = "submit" })
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	96 :tag("field", { var = "FORM_TYPE", type = "hidden"})
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	97 :text_tag("value", "http://jabber.org/protocol/pubsub#node_config")
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	98 :up()
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	99 :tag("field", { var = "pubsub#max_items" })
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	100 :text_tag("value", "1")
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	101 :up()
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	102 :tag("field", { var = "pubsub#persist_items" })
5816 45d0802d0787 mod_pubsub_serverinfo: Allow configuration of node persistence/deletion Matthew Wild <mwild1@gmail.com> parents: 5815 diff changeset	103 :text_tag("value", persist_items and "1" or "0")
5804 c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	104
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	105 module:log("debug", "Sending request to create pub/sub node '%s' at %s", node, service)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	106 return module:send_iq(request):next(
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	107 function(response)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	108 if response.stanza == nil or response.stanza.attr.type ~= "result" then
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	109 module:log("warn", "Unexpected response to pub/sub node '%s' creation request at %s: %s", node, service, response.stanza)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	110 return false
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	111 else
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	112 module:log("debug", "Successfully created pub/sub node '%s' at %s", node, service)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	113 return true
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	114 end
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	115 end
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	116 )
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	117 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	118
5804 c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	119 -- Returns a promise of a boolean
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	120 function delete_node()
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	121 local request = st.iq({ type = "set", to = service, from = actor, id = new_id() })
5815 77c5709bd57a mod_pubsub_serverinfo: Add explicit xmlns to all pubsub tags Matthew Wild <mwild1@gmail.com> parents: 5814 diff changeset	122 :tag("pubsub", { xmlns = xmlns_pubsub })
77c5709bd57a mod_pubsub_serverinfo: Add explicit xmlns to all pubsub tags Matthew Wild <mwild1@gmail.com> parents: 5814 diff changeset	123 :tag("delete", { node = node, xmlns = xmlns_pubsub });
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	124
5804 c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	125 module:log("debug", "Sending request to delete pub/sub node '%s' at %s", node, service)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	126 return module:send_iq(request):next(
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	127 function(response)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	128 if response.stanza == nil or response.stanza.attr.type ~= "result" then
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	129 module:log("warn", "Unexpected response to pub/sub node '%s' deletion request at %s: %s", node, service, response.stanza)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	130 return false
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	131 else
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	132 module:log("debug", "Successfully deleted pub/sub node '%s' at %s", node, service)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	133 return true
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	134 end
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	135 end
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	136 )
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	137 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	138
5810 76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	139 function get_remote_domain_names()
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	140 -- Iterate over s2s sessions, adding them to a multimap, where the key is the local domain name,
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	141 -- mapped to a collection of remote domain names. De-duplicate all remote domain names by using
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	142 -- them as an index in a table.
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	143 local domains_by_host = {}
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	144 for session, _ in pairs(prosody.incoming_s2s) do
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	145 if session ~= nil and session.from_host ~= nil and local_domain == session.to_host then
5808 2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	146 module:log("debug", "Local host '%s' has remote '%s' (inbound)", session.to_host, session.from_host);
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	147 local sessions = domains_by_host[session.to_host]
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	148 if sessions == nil then sessions = {} end; -- instantiate a new entry if none existed
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	149 sessions[session.from_host] = true
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	150 domains_by_host[session.to_host] = sessions
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	151 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	152 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	153
5808 2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	154 -- At an earlier stage, the code iterated over all prosody.hosts, trying to generate one pubsub item for all local hosts. That turned out to be
2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	155 -- to noisy. Instead, this code now creates an item that includes the local vhost only. It is assumed that this module will also be loaded for
2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	156 -- other vhosts. Their data should then be published to distinct pub/sub services and nodes.
2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	157
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	158 -- for host, data in pairs(prosody.hosts) do
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	159 local host = local_domain
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	160 local data = prosody.hosts[host]
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	161 if data ~= nil then
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	162 local sessions = domains_by_host[host]
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	163 if sessions == nil then sessions = {} end; -- instantiate a new entry if none existed
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	164 if data.s2sout ~= nil then
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	165 for _, session in pairs(data.s2sout) do
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	166 if session.to_host ~= nil then
5808 2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	167 module:log("debug", "Local host '%s' has remote '%s' (outbound)", host, session.to_host);
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	168 sessions[session.to_host] = true
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	169 domains_by_host[host] = sessions
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	170 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	171 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	172 end
5808 2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	173
2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	174 -- When the instance of Prosody hosts more than one host, the other hosts can be thought of as having a 'permanent' s2s connection.
2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	175 for host_name, host_info in pairs(prosody.hosts) do
2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	176 if host ~= host_name and host_info.type ~= "component" then
2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	177 module:log("debug", "Local host '%s' has remote '%s' (vhost)", host, host_name);
2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	178 sessions[host_name] = true;
2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	179 domains_by_host[host] = sessions
2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	180 end
2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	181 end
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	182 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	183
5810 76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	184 return domains_by_host
76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	185 end
76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	186
76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	187 function publish_serverinfo()
5813 d38772479891 mod_pubsub_serverinfo: Some logging improvements Matthew Wild <mwild1@gmail.com> parents: 5812 diff changeset	188 module:log("debug", "Publishing server info...");
5810 76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	189 local domains_by_host = get_remote_domain_names()
76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	190
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	191 -- Build the publication stanza.
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	192 local request = st.iq({ type = "set", to = service, from = actor, id = new_id() })
5815 77c5709bd57a mod_pubsub_serverinfo: Add explicit xmlns to all pubsub tags Matthew Wild <mwild1@gmail.com> parents: 5814 diff changeset	193 :tag("pubsub", { xmlns = xmlns_pubsub })
77c5709bd57a mod_pubsub_serverinfo: Add explicit xmlns to all pubsub tags Matthew Wild <mwild1@gmail.com> parents: 5814 diff changeset	194 :tag("publish", { node = node, xmlns = xmlns_pubsub })
77c5709bd57a mod_pubsub_serverinfo: Add explicit xmlns to all pubsub tags Matthew Wild <mwild1@gmail.com> parents: 5814 diff changeset	195 :tag("item", { id = "current", xmlns = xmlns_pubsub })
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	196 :tag("serverinfo", { xmlns = "urn:xmpp:serverinfo:0" })
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	197
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	198 request:tag("domain", { name = local_domain })
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	199 :tag("federation")
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	200
5810 76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	201 local remotes = domains_by_host[local_domain]
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	202
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	203 if remotes ~= nil then
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	204 for remote, _ in pairs(remotes) do
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	205 -- include a domain name for remote domains, but only if they advertise support.
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	206 if does_opt_in(remote) then
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	207 request:tag("remote-domain", { name = remote }):up()
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	208 else
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	209 request:tag("remote-domain"):up()
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	210 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	211 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	212 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	213
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	214 request:up():up()
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	215
5804 c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	216 module:send_iq(request):next(
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	217 function(response)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	218 if response.stanza == nil or response.stanza.attr.type ~= "result" then
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	219 module:log("warn", "Unexpected response to item publication at pub/sub node '%s' on %s: %s", node, service, response.stanza)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	220 return false
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	221 else
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	222 module:log("debug", "Successfully published item on pub/sub node '%s' at %s", node, service)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	223 return true
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	224 end
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	225 end,
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	226 function(error)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	227 module:log("warn", "Error prevented publication of item on pub/sub node at %s: %s", service, error)
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	228 end
c3eeeb968403 mod_pubsub_serverinfo: Detect existence of pub/sub node Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5803 diff changeset	229 )
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	230
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	231 return publication_interval;
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	232 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	233
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	234 local opt_in_cache = {}
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	235
5817 7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	236 -- Public providers are already public, so we fetch the list of providers
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	237 -- registered on providers.xmpp.net so we don't have to disco them individually
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	238 local function update_public_providers()
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	239 return http.request(public_providers_url)
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	240 :next(function (response)
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	241 assert(
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	242 response.headers["content-type"] == "application/json",
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	243 "invalid mimetype: "..tostring(response.headers["content-type"])
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	244 );
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	245 return json.decode(response.body);
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	246 end)
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	247 :next(function (public_server_domains)
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	248 module:log("debug", "Retrieved list of %d public providers", #public_server_domains);
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	249 for _, domain in ipairs(public_server_domains) do
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	250 opt_in_cache[domain] = {
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	251 opt_in = true;
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	252 expires = os.time() + (86400 * 1.5);
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	253 };
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	254 end
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	255 end, function (err)
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	256 module:log("warn", "Failed to fetch/decode provider list: %s", err);
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	257 end);
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	258 end
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	259
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	260 module:daily("update public provider list", update_public_providers);
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	261
5810 76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	262 function cache_warm_up()
76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	263 module:log("debug", "Warming up opt-in cache")
5817 7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	264
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	265 update_public_providers():finally(function ()
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	266 module:log("debug", "Querying known domains for opt-in cache...");
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	267 local domains_by_host = get_remote_domain_names()
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	268 local remotes = domains_by_host[local_domain]
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	269 if remotes ~= nil then
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	270 for remote in pairs(remotes) do
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	271 does_opt_in(remote)
7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	272 end
5810 76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	273 end
5817 7905766d01f6 mod_pubsub_serverinfo: Treat public providers as public Matthew Wild <mwild1@gmail.com> parents: 5816 diff changeset	274 end);
5810 76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	275 end
76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	276
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	277 function does_opt_in(remoteDomain)
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	278
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	279 -- try to read answer from cache.
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	280 local cached_value = opt_in_cache[remoteDomain]
5812 cf5f77491323 mod_pubsub_serverinfo: Refresh cache entries if they will expire before next run Matthew Wild <mwild1@gmail.com> parents: 5810 diff changeset	281 local ttl = cached_value and os.difftime(cached_value.expires, os.time());
cf5f77491323 mod_pubsub_serverinfo: Refresh cache entries if they will expire before next run Matthew Wild <mwild1@gmail.com> parents: 5810 diff changeset	282 if cached_value and ttl > (publication_interval + 60) then
5808 2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	283 module:log("debug", "Opt-in status (from cache) for '%s': %s", remoteDomain, cached_value.opt_in)
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	284 return cached_value.opt_in;
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	285 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	286
5812 cf5f77491323 mod_pubsub_serverinfo: Refresh cache entries if they will expire before next run Matthew Wild <mwild1@gmail.com> parents: 5810 diff changeset	287 -- We don't have a cached value, or it is nearing expiration - refresh it now
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	288 -- TODO worry about not having multiple requests in flight to the same domain.cached_value
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	289
5813 d38772479891 mod_pubsub_serverinfo: Some logging improvements Matthew Wild <mwild1@gmail.com> parents: 5812 diff changeset	290 module:log("debug", "%s: performing disco/info to determine opt-in", remoteDomain)
5810 76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	291 local discoRequest = st.iq({ type = "get", to = remoteDomain, from = actor, id = new_id() })
76b57bcfe1b2 mod_pubsub_serverinfo: Warm-up opt-in cache Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5809 diff changeset	292 :tag("query", { xmlns = "http://jabber.org/protocol/disco#info" })
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	293
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	294 module:send_iq(discoRequest):next(
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	295 function(response)
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	296 if response.stanza ~= nil and response.stanza.attr.type == "result" then
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	297 local query = response.stanza:get_child("query", "http://jabber.org/protocol/disco#info")
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	298 if query ~= nil then
5809 a8cae8322b7c mod_pubsub_serverinfo: Fix namespace parsing issue with disco/info Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5808 diff changeset	299 for feature in query:childtags("feature") do
5813 d38772479891 mod_pubsub_serverinfo: Some logging improvements Matthew Wild <mwild1@gmail.com> parents: 5812 diff changeset	300 --module:log("debug", "Disco/info feature for '%s': %s", remoteDomain, feature)
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	301 if feature.attr.var == 'urn:xmpp:serverinfo:0' then
5808 2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	302 module:log("debug", "Disco/info response included opt-in for '%s'", remoteDomain)
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	303 opt_in_cache[remoteDomain] = {
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	304 opt_in = true;
5805 55b99f593c3a mod_pubsub_serverinfo: Disco/info cache TTL should be configurable Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5804 diff changeset	305 expires = os.time() + cache_ttl;
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	306 }
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	307 return; -- prevent 'false' to be cached, down below.
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	308 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	309 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	310 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	311 end
5808 2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	312 module:log("debug", "Disco/info response did not include opt-in for '%s'", remoteDomain)
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	313 opt_in_cache[remoteDomain] = {
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	314 opt_in = false;
5805 55b99f593c3a mod_pubsub_serverinfo: Disco/info cache TTL should be configurable Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5804 diff changeset	315 expires = os.time() + cache_ttl;
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	316 }
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	317 end,
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	318 function(response)
5808 2465d5191ae9 mod_pubsub_serverinfo: Consider sibling vhosts 'connected' Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5805 diff changeset	319 module:log("debug", "An error occurred while performing a disco/info request to determine opt-in for '%s'", remoteDomain, response)
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	320 opt_in_cache[remoteDomain] = {
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	321 opt_in = false;
5805 55b99f593c3a mod_pubsub_serverinfo: Disco/info cache TTL should be configurable Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5804 diff changeset	322 expires = os.time() + cache_ttl;
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	323 }
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	324 end
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	325 );
f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	326
5812 cf5f77491323 mod_pubsub_serverinfo: Refresh cache entries if they will expire before next run Matthew Wild <mwild1@gmail.com> parents: 5810 diff changeset	327 if ttl and ttl <= 0 then
cf5f77491323 mod_pubsub_serverinfo: Refresh cache entries if they will expire before next run Matthew Wild <mwild1@gmail.com> parents: 5810 diff changeset	328 -- Cache entry expired, remove it and assume not opted in
cf5f77491323 mod_pubsub_serverinfo: Refresh cache entries if they will expire before next run Matthew Wild <mwild1@gmail.com> parents: 5810 diff changeset	329 opt_in_cache[remoteDomain] = nil;
cf5f77491323 mod_pubsub_serverinfo: Refresh cache entries if they will expire before next run Matthew Wild <mwild1@gmail.com> parents: 5810 diff changeset	330 return false;
cf5f77491323 mod_pubsub_serverinfo: Refresh cache entries if they will expire before next run Matthew Wild <mwild1@gmail.com> parents: 5810 diff changeset	331 end
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	332
5812 cf5f77491323 mod_pubsub_serverinfo: Refresh cache entries if they will expire before next run Matthew Wild <mwild1@gmail.com> parents: 5810 diff changeset	333 return cached_value and cached_value.opt_in;
5803 f55e65315ba0 mod_pubsub_serverinfo: implemented all basic features Guus der Kinderen <guus.der.kinderen@gmail.com> parents: 5801 diff changeset	334 end

Mercurial > prosody-modules

annotate mod_pubsub_serverinfo/mod_pubsub_serverinfo.lua @ 5919:99ecfe44910b