mod_console: Don't allow bang bang as the first command in a session, or when the...

[prosody.git] / core / configmanager.lua

diff --git a/core/configmanager.lua b/core/configmanager.lua
index ca23b136e26ee409230dee171cbb98ad63a93bbf..03679531b1b20b8a3847ec27c4ed6d962a281ed6 100644 (file)
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -13,6 +13,8 @@ local         setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, p
 
 local fire_event = prosody and prosody.events.fire_event or function () end;
 
+local path_sep = package.config:sub(1,1);
+
 module "configmanager"
 
 local parsers = {};
@@ -64,16 +66,35 @@ function _M.set(host, section, key, value)
        return set(config, host, section, key, value);
 end
 
+-- Helper function to resolve relative paths (needed by config)
+do
+       local rel_path_start = ".."..path_sep;
+       function resolve_relative_path(parent_path, path)
+               if path then
+                       local is_relative;
+                       if path_sep == "/" and path:sub(1,1) ~= "/" then
+                               is_relative = true;
+                       elseif path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\") then
+                               is_relative = true;
+                       end
+                       if is_relative then
+                               return parent_path..path_sep..path;
+                       end
+               end
+               return path;
+       end     
+end
+
 function load(filename, format)
        format = format or filename:match("%w+$");
 
        if parsers[format] and parsers[format].load then
                local f, err = io.open(filename);
                if f then
-                       local new_config, err = parsers[format].load(f:read("*a"), filename);
+                       local new_config = setmetatable({ ["*"] = { core = {} } }, config_mt);
+                       local ok, err = parsers[format].load(f:read("*a"), filename, new_config);
                        f:close();
-                       if new_config then
-                               setmetatable(new_config, config_mt);
+                       if ok then
                                config = new_config;
                                fire_event("config-reloaded", {
                                        filename = filename,
@@ -116,15 +137,13 @@ do
        local loadstring, pcall, setmetatable = _G.loadstring, _G.pcall, _G.setmetatable;
        local setfenv, rawget, tostring = _G.setfenv, _G.rawget, _G.tostring;
        parsers.lua = {};
-       function parsers.lua.load(data, filename)
-               local config = { ["*"] = { core = {} } };
-       
+       function parsers.lua.load(data, filename, config)
                local env;
                -- The ' = true' are needed so as not to set off __newindex when we assign the functions below
                env = setmetatable({
                        Host = true, host = true, VirtualHost = true,
                        Component = true, component = true,
-                       Include = true, include = true, RunScript = dofile }, {
+                       Include = true, include = true, RunScript = true }, {
                                __index = function (t, k)
                                        return rawget(_G, k) or
                                                function (settings_table)
@@ -184,14 +203,19 @@ do
                        local f, err = io.open(file);
                        if f then
                                local data = f:read("*a");
-                               local ok, err = parsers.lua.load(data, file);
-                               if not ok then error(err:gsub("%[string.-%]", file), 0); end
+                               local file = resolve_relative_path(filename:gsub("[^"..path_sep.."]+$", ""), file);
+                               local ret, err = parsers.lua.load(data, file, config);
+                               if not ret then error(err:gsub("%[string.-%]", file), 0); end
                        end
                        if not f then error("Error loading included "..file..": "..err, 0); end
                        return f, err;
                end
                env.include = env.Include;
                
+               function env.RunScript(file)
+                       return dofile(resolve_relative_path(filename:gsub("[^"..path_sep.."]+$", ""), file));
+               end
+               
                local chunk, err = loadstring(data, "@"..filename);
                
                if not chunk then
@@ -206,7 +230,7 @@ do
                        return nil, err;
                end
                
-               return config;
+               return true;
        end
        
 end