X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fdatamanager.lua;h=d5e9c88ca7ad0130b879060950d579420edb65d1;hb=e0ff05b0a50b767960b60561018da50d5416211e;hp=a5e478c8fedc40aeffe3212999f3ca85e2f71a9a;hpb=06edec9c84a201fc7235ee77b2629850da560f39;p=prosody.git

diff --git a/util/datamanager.lua b/util/datamanager.lua
index a5e478c8..d5e9c88c 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -1,20 +1,9 @@
--- 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.
 --
 
 
@@ -31,12 +20,22 @@ local error = error;
 local next = next;
 local t_insert = table.insert;
 local append = require "util.serialization".append;
+local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end
+local lfs = require "lfs";
+local prosody = prosody;
+local raw_mkdir;
+
+if prosody.platform == "posix" then
+	raw_mkdir = require "util.pposix".mkdir; -- Doesn't trample on umask
+else
+	raw_mkdir = lfs.mkdir;
+end
 
 module "datamanager"
 
 ---- utils -----
 local encode, decode;
-do 
+do
 	local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end });
 
 	decode = function (s)
@@ -44,25 +43,69 @@ do
 	end
 
 	encode = function (s)
-		return s and (s:gsub("%W", function (c) return format("%%%x", c:byte()); end));
+		return s and (s:gsub("%W", function (c) return format("%%%02x", c:byte()); end));
+	end
+end
+
+local _mkdir = {};
+local function mkdir(path)
+	path = path:gsub("/", path_separator); -- TODO as an optimization, do this during path creation rather than here
+	if not _mkdir[path] then
+		raw_mkdir(path);
+		_mkdir[path] = true;
 	end
+	return path;
 end
 
+local data_path = (prosody and prosody.paths and prosody.paths.data) or ".";
+local callbacks = {};
+
 ------- API -------------
 
-local data_path = "data";
 function set_data_path(path)
-	log("info", "Setting data path to %s", path);
+	log("debug", "Setting data path to: %s", path);
 	data_path = path;
 end
 
-function getpath(username, host, datastore, ext)
+local function callback(username, host, datastore, data)
+	for _, f in ipairs(callbacks) do
+		username, host, datastore, data = f(username, host, datastore, data);
+		if username == false then break; end
+	end
+	
+	return username, host, datastore, data;
+end
+function add_callback(func)
+	if not callbacks[func] then -- Would you really want to set the same callback more than once?
+		callbacks[func] = true;
+		callbacks[#callbacks+1] = func;
+		return true;
+	end
+end
+function remove_callback(func)
+	if callbacks[func] then
+		for i, f in ipairs(callbacks) do
+			if f == func then
+				callbacks[i] = nil;
+				callbacks[f] = nil;
+				return true;
+			end
+		end
+	end
+end
+
+function getpath(username, host, datastore, ext, create)
 	ext = ext or "dat";
+	host = (host and encode(host)) or "_global";
+	username = username and encode(username);
 	if username then
-		return format("%s/%s/%s/%s.%s", data_path, encode(host), datastore, encode(username), ext);
+		if create then mkdir(mkdir(mkdir(data_path).."/"..host).."/"..datastore); end
+		return format("%s/%s/%s/%s.%s", data_path, host, datastore, username, ext);
 	elseif host then
-		return format("%s/%s/%s.%s", data_path, encode(host), datastore, ext);
+		if create then mkdir(mkdir(data_path).."/"..host); end
+		return format("%s/%s/%s.%s", data_path, host, datastore, ext);
 	else
+		if create then mkdir(data_path); end
 		return format("%s/%s.%s", data_path, datastore, ext);
 	end
 end
@@ -70,14 +113,21 @@ end
 function load(username, host, datastore)
 	local data, ret = loadfile(getpath(username, host, datastore));
 	if not data then
-		log("warn", "Failed to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil"));
-		return nil;
+		local mode = lfs.attributes(getpath(username, host, datastore), "mode");
+		if not mode then
+			log("debug", "Assuming empty "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil"));
+			return nil;
+		else -- file exists, but can't be read
+			-- TODO more detailed error checking and logging?
+			log("error", "Failed to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil"));
+			return nil, "Error reading storage";
+		end
 	end
 	setfenv(data, {});
 	local success, ret = pcall(data);
 	if not success then
 		log("error", "Unable to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil"));
-		return nil;
+		return nil, "Error reading storage";
 	end
 	return ret;
 end
@@ -86,16 +136,23 @@ function store(username, host, datastore, data)
 	if not data then
 		data = {};
 	end
+
+	username, host, datastore, data = callback(username, host, datastore, data);
+	if username == false then
+		return true; -- Don't save this data at all
+	end
+
 	-- save the datastore
-	local f, msg = io_open(getpath(username, host, datastore), "w+");
+	local f, msg = io_open(getpath(username, host, datastore, nil, true), "w+");
 	if not f then
 		log("error", "Unable to write to "..datastore.." storage ('"..msg.."') for user: "..(username or "nil").."@"..(host or "nil"));
-		return;
+		return nil, "Error saving to storage";
 	end
 	f:write("return ");
 	append(f, data);
 	f:close();
-	if not next(data) then -- try to delete empty datastore
+	if next(data) == nil then -- try to delete empty datastore
+		log("debug", "Removing empty %s datastore for user %s@%s", datastore, username or "nil", host or "nil");
 		os_remove(getpath(username, host, datastore));
 	end
 	-- we write data even when we are deleting because lua doesn't have a
@@ -105,8 +162,9 @@ end
 
 function list_append(username, host, datastore, data)
 	if not data then return; end
+	if callback(username, host, datastore) == false then return true; end
 	-- save the datastore
-	local f, msg = io_open(getpath(username, host, datastore, "list"), "a+");
+	local f, msg = io_open(getpath(username, host, datastore, "list", true), "a+");
 	if not f then
 		log("error", "Unable to write to "..datastore.." storage ('"..msg.."') for user: "..(username or "nil").."@"..(host or "nil"));
 		return;
@@ -122,8 +180,9 @@ function list_store(username, host, datastore, data)
 	if not data then
 		data = {};
 	end
+	if callback(username, host, datastore) == false then return true; end
 	-- save the datastore
-	local f, msg = io_open(getpath(username, host, datastore, "list"), "w+");
+	local f, msg = io_open(getpath(username, host, datastore, "list", true), "w+");
 	if not f then
 		log("error", "Unable to write to "..datastore.." storage ('"..msg.."') for user: "..(username or "nil").."@"..(host or "nil"));
 		return;
@@ -134,7 +193,8 @@ function list_store(username, host, datastore, data)
 		f:write(");\n");
 	end
 	f:close();
-	if not next(data) then -- try to delete empty datastore
+	if next(data) == nil then -- try to delete empty datastore
+		log("debug", "Removing empty %s datastore for user %s@%s", datastore, username or "nil", host or "nil");
 		os_remove(getpath(username, host, datastore, "list"));
 	end
 	-- we write data even when we are deleting because lua doesn't have a
@@ -145,15 +205,22 @@ end
 function list_load(username, host, datastore)
 	local data, ret = loadfile(getpath(username, host, datastore, "list"));
 	if not data then
-		log("warn", "Failed to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil"));
-		return nil;
+		local mode = lfs.attributes(getpath(username, host, datastore, "list"), "mode");
+		if not mode then
+			log("debug", "Assuming empty "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil"));
+			return nil;
+		else -- file exists, but can't be read
+			-- TODO more detailed error checking and logging?
+			log("error", "Failed to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil"));
+			return nil, "Error reading storage";
+		end
 	end
 	local items = {};
 	setfenv(data, {item = function(i) t_insert(items, i); end});
 	local success, ret = pcall(data);
 	if not success then
 		log("error", "Unable to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil"));
-		return nil;
+		return nil, "Error reading storage";
 	end
 	return items;
 end