X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_pubsub.lua;h=40b119ccb234bca979761a9bcd18ea01cc6e591c;hb=99b003b1917a8ab0b561f7fb98d28d1fad8f8dc8;hp=b7c04163a6552b4db887da88c367feea844a2317;hpb=bc3d372a6845e378c0fc6de664abd76301540c87;p=prosody.git diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua index b7c04163..40b119cc 100644 --- a/plugins/mod_pubsub.lua +++ b/plugins/mod_pubsub.lua @@ -3,12 +3,15 @@ local st = require "util.stanza"; local jid_bare = require "util.jid".bare; local uuid_generate = require "util.uuid".generate; -require "core.modulemanager".load(module.host, "iq"); - local xmlns_pubsub = "http://jabber.org/protocol/pubsub"; local xmlns_pubsub_errors = "http://jabber.org/protocol/pubsub#errors"; local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event"; +local autocreate_on_publish = module:get_option_boolean("autocreate_on_publish", false); +local autocreate_on_subscribe = module:get_option_boolean("autocreate_on_subscribe", false); +local pubsub_disco_name = module:get_option("name"); +if type(pubsub_disco_name) ~= "string" then pubsub_disco_name = "Prosody PubSub Service"; end + local service; local handlers = {}; @@ -54,6 +57,7 @@ function handlers.get_items(origin, stanza, items) for _, entry in pairs(results) do data:add_child(entry); end + local reply; if data then reply = st.reply(stanza) :tag("pubsub", { xmlns = xmlns_pubsub }) @@ -64,6 +68,21 @@ function handlers.get_items(origin, stanza, items) return origin.send(reply); end +function handlers.get_subscriptions(origin, stanza, subscriptions) + local node = subscriptions.attr.node; + local ok, ret = service:get_subscriptions(node, stanza.attr.from, stanza.attr.from); + if not ok then + return origin.send(pubsub_error_reply(stanza, ret)); + end + local reply = st.reply(stanza) + :tag("pubsub", { xmlns = xmlns_pubsub }) + :tag("subscriptions"); + for _, sub in ipairs(ret) do + reply:tag("subscription", { node = sub.node, jid = sub.jid, subscription = 'subscribed' }):up(); + end + return origin.send(reply); +end + function handlers.set_create(origin, stanza, create) local node = create.attr.node; local ok, ret, reply; @@ -92,10 +111,11 @@ end function handlers.set_subscribe(origin, stanza, subscribe) local node, jid = subscribe.attr.node, subscribe.attr.jid; - if jid_bare(jid) ~= jid_bare(stanza.attr.from) then - return origin.send(pubsub_error_reply(stanza, "invalid-jid")); + local options_tag, options = stanza.tags[1]:get_child("options"), nil; + if options_tag then + options = options_form:data(options_tag.tags[1]); end - local ok, ret = service:add_subscription(node, stanza.attr.from, jid); + local ok, ret = service:add_subscription(node, stanza.attr.from, jid, options); local reply; if ok then reply = st.reply(stanza) @@ -104,18 +124,28 @@ function handlers.set_subscribe(origin, stanza, subscribe) node = node, jid = jid, subscription = "subscribed" - }); + }):up(); + if options_tag then + reply:add_child(options_tag); + end else reply = pubsub_error_reply(stanza, ret); end - return origin.send(reply); + origin.send(reply); + if ok then + -- Send all current items + local ok, items = service:get_items(node, stanza.attr.from); + if items then + local jids = { [jid] = options or true }; + for id, item in pairs(items) do + service.config.broadcaster(node, jids, item); + end + end + end end function handlers.set_unsubscribe(origin, stanza, unsubscribe) local node, jid = unsubscribe.attr.node, unsubscribe.attr.jid; - if jid_bare(jid) ~= jid_bare(stanza.attr.from) then - return origin.send(pubsub_error_reply(stanza, "invalid-jid")); - end local ok, ret = service:remove_subscription(node, stanza.attr.from, jid); local reply; if ok then @@ -171,22 +201,92 @@ function simple_broadcast(node, jids, item) for jid in pairs(jids) do module:log("debug", "Sending notification to %s", jid); message.attr.to = jid; - core_post_stanza(hosts[module.host], message); + module:send(message); end end module:hook("iq/host/http://jabber.org/protocol/pubsub:pubsub", handle_pubsub_iq); -local disco_info = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info" }) - :tag("identity", { category = "pubsub", type = "service" }):up() - :tag("feature", { var = "http://jabber.org/protocol/pubsub" }):up(); +local disco_info; + +local feature_map = { + create = { "create-nodes", autocreate_on_publish and "instant-nodes", "item-ids" }; + retract = { "delete-items", "retract-items" }; + publish = { "publish" }; + get_items = { "retrieve-items" }; + add_subscription = { "subscribe" }; + get_subscriptions = { "retrieve-subscriptions" }; +}; + +local function add_disco_features_from_service(disco, service) + for method, features in pairs(feature_map) do + if service[method] then + for _, feature in ipairs(features) do + if feature then + disco:tag("feature", { var = xmlns_pubsub.."#"..feature }):up(); + end + end + end + end + for affiliation in pairs(service.config.capabilities) do + if affiliation ~= "none" and affiliation ~= "owner" then + disco:tag("feature", { var = xmlns_pubsub.."#"..affiliation.."-affiliation" }):up(); + end + end +end + +local function build_disco_info(service) + local disco_info = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info" }) + :tag("identity", { category = "pubsub", type = "service", name = pubsub_disco_name }):up() + :tag("feature", { var = "http://jabber.org/protocol/pubsub" }):up(); + add_disco_features_from_service(disco_info, service); + return disco_info; +end module:hook("iq-get/host/http://jabber.org/protocol/disco#info:query", function (event) - event.origin.send(st.reply(event.stanza):add_child(disco_info)); - return true; + local origin, stanza = event.origin, event.stanza; + local node = stanza.tags[1].attr.node; + if not node then + return origin.send(st.reply(stanza):add_child(disco_info)); + else + local ok, ret = service:get_nodes(stanza.attr.from); + if ok and not ret[node] then + ok, ret = false, "item-not-found"; + end + if not ok then + return origin.send(pubsub_error_reply(stanza, ret)); + end + local reply = st.reply(stanza) + :tag("query", { xmlns = "http://jabber.org/protocol/disco#info", node = node }) + :tag("identity", { category = "pubsub", type = "leaf" }); + return origin.send(reply); + end end); +local function handle_disco_items_on_node(event) + local stanza, origin = event.stanza, event.origin; + local query = stanza.tags[1]; + local node = query.attr.node; + local ok, ret = service:get_items(node, stanza.attr.from); + if not ok then + return origin.send(pubsub_error_reply(stanza, ret)); + end + + local reply = st.reply(stanza) + :tag("query", { xmlns = "http://jabber.org/protocol/disco#items", node = node }); + + for id, item in pairs(ret) do + reply:tag("item", { jid = module.host, name = id }):up(); + end + + return origin.send(reply); +end + + module:hook("iq-get/host/http://jabber.org/protocol/disco#items:query", function (event) + if event.stanza.tags[1].attr.node then + return handle_disco_items_on_node(event); + end local ok, ret = service:get_nodes(event.stanza.attr.from); if not ok then event.origin.send(pubsub_error_reply(stanza, ret)); @@ -203,12 +303,27 @@ end); local admin_aff = module:get_option_string("default_admin_affiliation", "owner"); local function get_affiliation(jid) - if usermanager.is_admin(jid, module.host) then + local bare_jid = jid_bare(jid); + if bare_jid == module.host or usermanager.is_admin(bare_jid, module.host) then return admin_aff; end end -service = pubsub.new({ +function set_service(new_service) + service = new_service; + module.environment.service = service; + disco_info = build_disco_info(service); +end + +function module.save() + return { service = service }; +end + +function module.restore(data) + set_service(data.service); +end + +set_service(pubsub.new({ capabilities = { none = { create = false; @@ -219,11 +334,35 @@ service = pubsub.new({ subscribe = true; unsubscribe = true; get_subscription = true; - --get_items = true; + get_subscriptions = true; + get_items = true; subscribe_other = false; unsubscribe_other = false; get_subscription_other = false; + get_subscriptions_other = false; + + be_subscribed = true; + be_unsubscribed = true; + + set_affiliation = false; + }; + publisher = { + create = false; + publish = true; + retract = true; + get_nodes = true; + + subscribe = true; + unsubscribe = true; + get_subscription = true; + get_subscriptions = true; + get_items = true; + + subscribe_other = false; + unsubscribe_other = false; + get_subscription_other = false; + get_subscriptions_other = false; be_subscribed = true; be_unsubscribed = true; @@ -239,37 +378,27 @@ service = pubsub.new({ subscribe = true; unsubscribe = true; get_subscription = true; - --get_items = true; + get_subscriptions = true; + get_items = true; subscribe_other = true; unsubscribe_other = true; get_subscription_other = true; + get_subscriptions_other = true; be_subscribed = true; be_unsubscribed = true; set_affiliation = true; }; - admin = { get_items = true }; }; - autocreate_on_publish = module:get_option_boolean("autocreate_on_publish"); - autocreate_on_subscribe = module:get_option_boolean("autocreate_on_subscribe"); + autocreate_on_publish = autocreate_on_publish; + autocreate_on_subscribe = autocreate_on_subscribe; broadcaster = simple_broadcast; get_affiliation = get_affiliation; - jids_equal = function (jid1, jid2) - return jid_bare(jid1) == jid_bare(jid2); - end; -}); -module.environment.service = service; - -function module.save() - return { service = service }; -end - -function module.restore(data) - service = data.service; - module.environment.service = service; -end + + normalize_jid = jid_bare; +}));