mod_bosh: pcall() core_process_stanza per stanza, to bring in line with other listene...

[prosody.git] / plugins / mod_private.lua

diff --git a/plugins/mod_private.lua b/plugins/mod_private.lua
index f1eee55ec3a0d771fc68425c6f5434c6ca8c522a..365a997c8d99abce4755d7d7841760c5581ff1f8 100644 (file)
--- a/plugins/mod_private.lua
+++ b/plugins/mod_private.lua
@@ -1,68 +1,52 @@
--- Prosody IM v0.1
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
 
-
 local st = require "util.stanza"
 
-local jid_split = require "util.jid".split;
-local datamanager = require "util.datamanager"
+local private_storage = module:open_store();
 
-require "core.discomanager".set("private", "jabber:iq:private");
+module:add_feature("jabber:iq:private");
 
-module:add_iq_handler("c2s", "jabber:iq:private",
-       function (session, stanza)
-               local type = stanza.attr.type;
-               local query = stanza.tags[1];
-               if (type == "get" or type == "set") and query.name == "query" then
-                       local node, host = jid_split(stanza.attr.to);
-                       if not(node or host) or (node == session.username and host == session.host) then
-                               node, host = session.username, session.host;
-                               if #query.tags == 1 then
-                                       local tag = query.tags[1];
-                                       local key = tag.name..":"..tag.attr.xmlns;
-                                       local data = datamanager.load(node, host, "private");
-                                       if stanza.attr.type == "get" then
-                                               if data and data[key] then
-                                                       session.send(st.reply(stanza):tag("query", {xmlns = "jabber:iq:private"}):add_child(st.deserialize(data[key])));
-                                               else
-                                                       session.send(st.reply(stanza):add_child(stanza.tags[1]));
-                                               end
-                                       else -- set
-                                               if not data then data = {}; end;
-                                               if #tag == 0 then
-                                                       data[key] = nil;
-                                               else
-                                                       data[key] = st.preserialize(tag);
-                                               end
-                                               -- TODO delete datastore if empty
-                                               if datamanager.store(node, host, "private", data) then
-                                                       session.send(st.reply(stanza));
-                                               else
-                                                       session.send(st.error_reply(stanza, "wait", "internal-server-error"));
-                                               end
-                                       end
-                               else
-                                       session.send(st.error_reply(stanza, "modify", "bad-format"));
-                               end
+module:hook("iq/self/jabber:iq:private:query", function(event)
+       local origin, stanza = event.origin, event.stanza;
+       local type = stanza.attr.type;
+       local query = stanza.tags[1];
+       if #query.tags == 1 then
+               local tag = query.tags[1];
+               local key = tag.name..":"..tag.attr.xmlns;
+               local data, err = private_storage:get(origin.username);
+               if err then
+                       origin.send(st.error_reply(stanza, "wait", "internal-server-error"));
+                       return true;
+               end
+               if stanza.attr.type == "get" then
+                       if data and data[key] then
+                               origin.send(st.reply(stanza):tag("query", {xmlns = "jabber:iq:private"}):add_child(st.deserialize(data[key])));
+                       else
+                               origin.send(st.reply(stanza):add_child(stanza.tags[1]));
+                       end
+               else -- set
+                       if not data then data = {}; end;
+                       if #tag == 0 then
+                               data[key] = nil;
+                       else
+                               data[key] = st.preserialize(tag);
+                       end
+                       -- TODO delete datastore if empty
+                       if private_storage:set(origin.username, data) then
+                               origin.send(st.reply(stanza));
                        else
-                               session.send(st.error_reply(stanza, "cancel", "forbidden"));
+                               origin.send(st.error_reply(stanza, "wait", "internal-server-error"));
                        end
                end
-       end);
+       else
+               origin.send(st.error_reply(stanza, "modify", "bad-format"));
+       end
+       return true;
+end);