util.ip: Fix protocol detection of IPv6 addresses beginning with : [Backported from...

[prosody.git] / util / datamanager.lua

diff --git a/util/datamanager.lua b/util/datamanager.lua
index 383e738fa1d93c1b104e284cf9a044d5ef0f6fcc..a107d95c26904a697a949157f8caa706ca46a696 100644 (file)
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -163,7 +163,7 @@ local function atomic_store(filename, data)
        return nil, msg;
 end
 
-if prosody.platform ~= "posix" then
+if prosody and prosody.platform ~= "posix" then
        -- os.rename does not overwrite existing files on Windows
        -- TODO We could use Transactional NTFS on Vista and above
        function atomic_store(filename, data)
@@ -187,17 +187,25 @@ function store(username, host, datastore, data)
 
        -- save the datastore
        local d = "return " .. serialize(data) .. ";\n";
-       local ok, msg = atomic_store(getpath(username, host, datastore, nil, true), d);
-       if not ok then
-               log("error", "Unable to write to %s storage ('%s') for user: %s@%s", datastore, msg, username or "nil", host or "nil");
-               return nil, "Error saving to storage";
-       end
-       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
-       -- platform independent way of checking for non-exisitng files
+       local mkdir_cache_cleared;
+       repeat
+               local ok, msg = atomic_store(getpath(username, host, datastore, nil, true), d);
+               if not ok then
+                       if not mkdir_cache_cleared then -- We may need to recreate a removed directory
+                               _mkdir = {};
+                               mkdir_cache_cleared = true;
+                       else
+                               log("error", "Unable to write to %s storage ('%s') for user: %s@%s", datastore, msg, username or "nil", host or "nil");
+                               return nil, "Error saving to storage";
+                       end
+               end
+               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
+               -- platform independent way of checking for non-exisitng files
+       until ok;
        return true;
 end
 
@@ -285,7 +293,7 @@ function users(host, store, typ)
 
        local mode, err = lfs.attributes(store_dir, "mode");
        if not mode then
-               return function() log("debug", err or (store_dir .. " does not exist")) end
+               return function() log("debug", "%s", err or (store_dir .. " does not exist")) end
        end
        local next, state = lfs.dir(store_dir);
        return function(state)
@@ -340,8 +348,12 @@ end
 
 function purge(username, host)
        local host_dir = format("%s/%s/", data_path, encode(host));
+       local ok, iter, state, var = pcall(lfs.dir, host_dir);
+       if not ok then
+               return ok, iter;
+       end
        local errs = {};
-       for file in lfs.dir(host_dir) do
+       for file in iter, state, var do
                if lfs.attributes(host_dir..file, "mode") == "directory" then
                        local store = decode(file);
                        local ok, err = do_remove(getpath(username, host, store));
@@ -354,4 +366,6 @@ function purge(username, host)
        return #errs == 0, t_concat(errs, ", ");
 end
 
+_M.path_decode = decode;
+_M.path_encode = encode;
 return _M;