X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fconfigmanager.lua;h=51b9f5fe8e6b54a479dbb0eb75fbab4001157859;hb=04d289ba4504cdbcf8a9ee7a2cb153f0a2038e2c;hp=edd1366aa0887b22de83751fc6f8eb1405068ce1;hpb=b4cbbfc80ba799c54dfeff37c44e2673a3322ace;p=prosody.git

diff --git a/core/configmanager.lua b/core/configmanager.lua
index edd1366a..51b9f5fe 100644
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -7,12 +7,14 @@
 --
 
 local _G = _G;
-local 	setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table, format =
-		setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table, string.format;
-
+local setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table =
+      setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table;
+local format, math_max = string.format, math.max;
 
 local fire_event = prosody and prosody.events.fire_event or function () end;
 
+local envload = require"util.envload".envload;
+local lfs = require "lfs";
 local path_sep = package.config:sub(1,1);
 
 module "configmanager"
@@ -40,12 +42,24 @@ function getconfig()
 end
 
 function get(host, section, key)
+	if not key then
+		section, key = "core", section;
+	end
 	local sec = config[host][section];
 	if sec then
 		return sec[key];
 	end
 	return nil;
 end
+function _M.rawget(host, section, key)
+	local hostconfig = rawget(config, host);
+	if hostconfig then
+		local sectionconfig = rawget(hostconfig, section);
+		if sectionconfig then
+			return rawget(sectionconfig, key);
+		end
+	end
+end
 
 local function set(config, host, section, key, value)
 	if host and section and key then
@@ -71,10 +85,14 @@ do
 	local rel_path_start = ".."..path_sep;
 	function resolve_relative_path(parent_path, path)
 		if path then
+			-- Some normalization
+			parent_path = parent_path:gsub("%"..path_sep.."+$", "");
+			path = path:gsub("^%.%"..path_sep.."+", "");
+			
 			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
+			elseif path_sep == "\\" and (path:sub(1,1) ~= "/" and (path:sub(2,3) ~= ":\\" or path:sub(2,3) ~= ":/")) then
 				is_relative = true;
 			end
 			if is_relative then
@@ -85,16 +103,29 @@ do
 	end	
 end
 
+-- Helper function to convert a glob to a Lua pattern
+local function glob_to_pattern(glob)
+	return "^"..glob:gsub("[%p*?]", function (c)
+		if c == "*" then
+			return ".*";
+		elseif c == "?" then
+			return ".";
+		else
+			return "%"..c;
+		end
+	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,
@@ -102,7 +133,7 @@ function load(filename, format)
 					config = config
 				});
 			end
-			return not not new_config, "parser", err;
+			return ok, "parser", err;
 		end
 		return f, "file", err;
 	end
@@ -134,12 +165,10 @@ end
 
 -- Built-in Lua parser
 do
-	local loadstring, pcall, setmetatable = _G.loadstring, _G.pcall, _G.setmetatable;
-	local setfenv, rawget, tostring = _G.setfenv, _G.rawget, _G.tostring;
+	local pcall, setmetatable = _G.pcall, _G.setmetatable;
+	local rawget, tostring = _G.rawget, _G.tostring;
 	parsers.lua = {};
-	function parsers.lua.load(data, filename)
-		local config = { ["*"] = { core = {} } };
-	
+	function parsers.lua.load(data, config_file, config)
 		local env;
 		-- The ' = true' are needed so as not to set off __newindex when we assign the functions below
 		env = setmetatable({
@@ -201,38 +230,52 @@ do
 		end
 		env.component = env.Component;
 		
-		function env.Include(file)
-			local f, err = io.open(file);
-			if f then
-				local data = f:read("*a");
-				local file = resolve_relative_path(filename:gsub("[^"..path_sep.."]+$", ""), file);
-				local ok, err = parsers.lua.load(data, file);
-				if not ok then error(err:gsub("%[string.-%]", file), 0); end
+		function env.Include(file, wildcard)
+			if file:match("[*?]") then
+				local path_pos, glob = file:match("()([^"..path_sep.."]+)$");
+				local path = file:sub(1, math_max(path_pos-2,0));
+				local config_path = config_file:gsub("[^"..path_sep.."]+$", "");
+				if #path > 0 then
+					path = resolve_relative_path(config_path, path);
+				else
+					path = config_path;
+				end
+				local patt = glob_to_pattern(glob);
+				for f in lfs.dir(path) do
+					if f:sub(1,1) ~= "." and f:match(patt) then
+						env.Include(path..path_sep..f);
+					end
+				end
+			else
+				local file = resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file);
+				local f, err = io.open(file);
+				if f then
+					local ret, err = parsers.lua.load(f:read("*a"), 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
-			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));
+			return dofile(resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file));
 		end
 		
-		local chunk, err = loadstring(data, "@"..filename);
+		local chunk, err = envload(data, "@"..config_file, env);
 		
 		if not chunk then
 			return nil, err;
 		end
 		
-		setfenv(chunk, env);
-		
 		local ok, err = pcall(chunk);
 		
 		if not ok then
 			return nil, err;
 		end
 		
-		return config;
+		return true;
 	end
 	
 end