mod_posix: Some (perhaps temporary) changes to re-lock the pidfile after truncating...
[prosody.git] / plugins / mod_pep.lua
index 842f1fcec04af2609b2513b28f25eaef64957edf..103e3e73e149edd09402d5a2c4d654bb8725c616 100644 (file)
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -16,7 +16,6 @@ local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed
 local pairs, ipairs = pairs, ipairs;
 local next = next;
 local type = type;
-local load_roster = require "core.rostermanager".load_roster;
 local sha1 = require "util.hashes".sha1;
 local base64 = require "util.encodings".base64.encode;
 
@@ -25,11 +24,28 @@ local data = {};
 local recipients = {};
 local hash_map = {};
 
+module.save = function()
+       return { data = data, recipients = recipients, hash_map = hash_map };
+end
+module.restore = function(state)
+       data = state.data or {};
+       recipients = state.recipients or {};
+       hash_map = state.hash_map or {};
+end
+
 module:add_identity("pubsub", "pep", "Prosody");
 module:add_feature("http://jabber.org/protocol/pubsub#publish");
 
-local function publish(session, node, item)
-       local disable = #item.tags ~= 1 or #item.tags[1].tags == 0;
+local function subscription_presence(user_bare, recipient)
+       local recipient_bare = jid_bare(recipient);
+       if (recipient_bare == user_bare) then return true end
+       local username, host = jid_split(user_bare);
+       return is_contact_subscribed(username, host, recipient_bare);
+end
+
+local function publish(session, node, id, item)
+       item.attr.xmlns = nil;
+       local disable = #item.tags ~= 1 or #item.tags[1] == 0;
        if #item.tags == 0 then item.name = "retract"; end
        local bare = session.username..'@'..session.host;
        local stanza = st.message({from=bare, type='headline'})
@@ -48,9 +64,9 @@ local function publish(session, node, item)
                end
        else
                if not user_data then user_data = {}; data[bare] = user_data; end
-               user_data[node] = stanza;
+               user_data[node] = {id or "1", item};
        end
-       
+
        -- broadcast
        for recipient, notify in pairs(recipients[bare] or NULL) do
                if notify[node] then
@@ -64,10 +80,14 @@ local function publish_all(user, recipient, session)
        local notify = recipients[user] and recipients[user][recipient];
        if d and notify then
                for node in pairs(notify) do
-                       local message = d[node];
-                       if message then
-                               message.attr.to = recipient;
-                               session.send(message);
+                       if d[node] then
+                               local id, item = unpack(d[node]);
+                               session.send(st.message({from=user, to=recipient, type='headline'})
+                                       :tag('event', {xmlns='http://jabber.org/protocol/pubsub#event'})
+                                               :tag('items', {node=node})
+                                                       :add_child(item)
+                                               :up()
+                                       :up());
                        end
                end
        end
@@ -96,48 +116,95 @@ end
 module:hook("presence/bare", function(event)
        -- inbound presence to bare JID recieved
        local origin, stanza = event.origin, event.stanza;
-       
        local user = stanza.attr.to or (origin.username..'@'..origin.host);
-       local bare = jid_bare(stanza.attr.from);
-       local item = load_roster(jid_split(user))[bare];
-       if not stanza.attr.to or (item and (item.subscription == 'from' or item.subscription == 'both')) then
-               local recipient = stanza.attr.from;
-               local current = recipients[user] and recipients[user][recipient];
-               local hash = get_caps_hash_from_presence(stanza, current);
-               if current == hash then return; end
-               if not hash then
-                       if recipients[user] then recipients[user][recipient] = nil; end
-               else
-                       recipients[user] = recipients[user] or {};
-                       if hash_map[hash] then
-                               recipients[user][recipient] = hash_map[hash];
-                               publish_all(user, recipient, origin);
+       local t = stanza.attr.type;
+
+       if not t then -- available presence
+               if not stanza.attr.to or subscription_presence(user, stanza.attr.from) then
+                       local recipient = stanza.attr.from;
+                       local current = recipients[user] and recipients[user][recipient];
+                       local hash = get_caps_hash_from_presence(stanza, current);
+                       if current == hash then return; end
+                       if not hash then
+                               if recipients[user] then recipients[user][recipient] = nil; end
                        else
-                               recipients[user][recipient] = hash;
-                               origin.send(
-                                       st.stanza("iq", {from=stanza.attr.to, to=stanza.attr.from, id="disco", type="get"})
-                                               :query("http://jabber.org/protocol/disco#info")
-                               );
+                               recipients[user] = recipients[user] or {};
+                               if hash_map[hash] then
+                                       recipients[user][recipient] = hash_map[hash];
+                                       publish_all(user, recipient, origin);
+                               else
+                                       recipients[user][recipient] = hash;
+                                       origin.send(
+                                               st.stanza("iq", {from=stanza.attr.to, to=stanza.attr.from, id="disco", type="get"})
+                                                       :query("http://jabber.org/protocol/disco#info")
+                                       );
+                               end
                        end
                end
+       elseif t == "unavailable" then
+               if recipients[user] then recipients[user][stanza.attr.from] = nil; end
        end
 end, 10);
 
 module:hook("iq/bare/http://jabber.org/protocol/pubsub:pubsub", function(event)
        local session, stanza = event.origin, event.stanza;
+       local payload = stanza.tags[1];
+
        if stanza.attr.type == 'set' and (not stanza.attr.to or jid_bare(stanza.attr.from) == stanza.attr.to) then
-               local payload = stanza.tags[1];
-               if payload.name == 'pubsub' then -- <pubsub xmlns='http://jabber.org/protocol/pubsub'>
+               payload = payload.tags[1];
+               if payload and (payload.name == 'publish' or payload.name == 'retract') and payload.attr.node then -- <publish node='http://jabber.org/protocol/tune'>
+                       local node = payload.attr.node;
+                       payload = payload.tags[1];
+                       if payload and payload.name == "item" then -- <item>
+                               local id = payload.attr.id;
+                               session.send(st.reply(stanza));
+                               publish(session, node, id, st.clone(payload));
+                               return true;
+                       end
+               end
+       elseif stanza.attr.type == 'get' then
+               local user = stanza.attr.to and jid_bare(stanza.attr.to) or session.username..'@'..session.host;
+               if subscription_presence(user, stanza.attr.from) then
+                       local user_data = data[user];
+                       local node, requested_id;
                        payload = payload.tags[1];
-                       if payload and (payload.name == 'publish' or payload.name == 'retract') and payload.attr.node then -- <publish node='http://jabber.org/protocol/tune'>
-                               local node = payload.attr.node;
-                               payload = payload.tags[1];
-                               if payload then -- <item>
-                                       publish(session, node, payload);
-                                       session.send(st.reply(stanza));
+                       if payload and payload.name == 'items' then
+                               node = payload.attr.node;
+                               local item = payload.tags[1];
+                               if item and item.name == "item" then
+                                       requested_id = item.attr.id;
+                               end
+                       end
+                       if node and user_data and user_data[node] then -- Send the last item
+                               local id, item = unpack(user_data[node]);
+                               if not requested_id or id == requested_id then
+                                       local stanza = st.reply(stanza)
+                                               :tag('pubsub', {xmlns='http://jabber.org/protocol/pubsub'})
+                                                       :tag('items', {node=node})
+                                                               :add_child(item)
+                                                       :up()
+                                               :up();
+                                       session.send(stanza);
+                                       return true;
+                               else -- requested item doesn't exist
+                                       local stanza = st.reply(stanza)
+                                               :tag('pubsub', {xmlns='http://jabber.org/protocol/pubsub'})
+                                                       :tag('items', {node=node})
+                                               :up();
+                                       session.send(stanza);
                                        return true;
                                end
+                       elseif node then -- node doesn't exist
+                               session.send(st.error_reply(stanza, 'cancel', 'item-not-found'));
+                               return true;
+                       else --invalid request
+                               session.send(st.error_reply(stanza, 'modify', 'bad-request'));
+                               return true;
                        end
+               else --no presence subscription
+                       session.send(st.error_reply(stanza, 'auth', 'not-authorized')
+                               :tag('presence-subscription-required', {xmlns='http://jabber.org/protocol/pubsub#errors'}));
+                       return true;
                end
        end
 end);
@@ -214,3 +281,21 @@ module:hook("iq/bare/disco", function(event)
                end
        end
 end);
+
+module:hook("account-disco-info", function(event)
+       local stanza = event.stanza;
+       stanza:tag('identity', {category='pubsub', type='pep'}):up();
+       stanza:tag('feature', {var='http://jabber.org/protocol/pubsub#publish'}):up();
+end);
+
+module:hook("account-disco-items", function(event)
+       local stanza = event.stanza;
+       local bare = stanza.attr.to;
+       local user_data = data[bare];
+
+       if user_data then
+               for node, _ in pairs(user_data) do
+                       stanza:tag('item', {jid=bare, node=node}):up(); -- TODO we need to handle queries to these nodes
+               end
+       end
+end);