Software `/` code `/` prosody

Annotate

core/configmanager.lua @ 8791:8da11142fabf

muc: Allow clients to change multiple affiliations or roles at once (#345) According to XEP-0045 sections 9.2, 9.5 and 9.8 affiliation lists and role lists should allow mass-modification. Prosody however would just use the first entry of the list and ignore the rest. This is fixed by introducing a `for` loop to `set` stanzas of the respective `muc#admin` namespace. In order for this loop to work, the error handling was changed a little. Prosody no longer returns after the first error. Instead, an error reply is sent for each malformed or otherwise wrong entry, but the loop keeps going over the other entries. This may lead to multiple error messages being sent for one client request. A notable exception from this is when the XML Schema for `muc#admin` requests is violated. In that case the loop is aborted with an error message to the client. The change is a bit bigger than that in order to have the loop only for `set` stanzas without changing the behaviour of the `get` stanzas. This is now more in line with trunk, where there are separate methods for each stanza type. References: #345

author	Lennart Sauerbeck <devel@lennart.sauerbeck.org>
date	Sat, 18 Mar 2017 18:47:28 +0100
parent	7947:24170d74b00b
child	8153:c22d5680ca68

rev	line source
1523 841d61be198f Remove version number from copyright headers Matthew Wild <mwild1@gmail.com> parents: 1504 diff changeset	1 -- Prosody IM
2923 b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2862 diff changeset	2 -- Copyright (C) 2008-2010 Matthew Wild
b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2862 diff changeset	3 -- Copyright (C) 2008-2010 Waqas Hussain
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5413 diff changeset	4 --
758 b1885732e979 GPL->MIT! Matthew Wild <mwild1@gmail.com> parents: 750 diff changeset	5 -- This project is MIT/X11 licensed. Please see the
b1885732e979 GPL->MIT! Matthew Wild <mwild1@gmail.com> parents: 750 diff changeset	6 -- COPYING file in the source package for more information.
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	7 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 466 diff changeset	8
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	9 local _G = _G;
5413 0bf5e90be086 configmanager: Some cleanup, remove unused variables and imports Matthew Wild <mwild1@gmail.com> parents: 5380 diff changeset	10 local setmetatable, rawget, rawset, io, error, dofile, type, pairs, table =
0bf5e90be086 configmanager: Some cleanup, remove unused variables and imports Matthew Wild <mwild1@gmail.com> parents: 5380 diff changeset	11 setmetatable, rawget, rawset, io, error, dofile, type, pairs, table;
3905 9222dad9e1e8 configmanager: Support for wildcards in Include directives Matthew Wild <mwild1@gmail.com> parents: 3780 diff changeset	12 local format, math_max = string.format, math.max;
2861 1402615b66f8 configmanager: Error when a component and host clash hostnames Matthew Wild <mwild1@gmail.com> parents: 1777 diff changeset	13
3384 b7600dd7cd42 configmanager: Remove dependency on eventmanager, and global 'prosody' object Matthew Wild <mwild1@gmail.com> parents: 3012 diff changeset	14 local fire_event = prosody and prosody.events.fire_event or function () end;
1000 a73715a9267f core.configmanager: Fire event when (re)loading config file Matthew Wild <mwild1@gmail.com> parents: 913 diff changeset	15
5021 85b2689dbcfe Eliminate direct setfenv usage Florian Zeitz <florob@babelmonkeys.de> parents: 4530 diff changeset	16 local envload = require"util.envload".envload;
6166 46cb87d531a7 configmanager: Delay importing LuaFileSystem until needed by an Include line Kim Alvefur <zash@zash.se> parents: 5811 diff changeset	17 local deps = require"util.dependencies";
6164 ef4024f6bc40 core.configmanager: Move path utility functions into util.paths Kim Alvefur <zash@zash.se> parents: 5814 diff changeset	18 local resolve_relative_path = require"util.paths".resolve_relative_path;
ef4024f6bc40 core.configmanager: Move path utility functions into util.paths Kim Alvefur <zash@zash.se> parents: 5814 diff changeset	19 local glob_to_pattern = require"util.paths".glob_to_pattern;
3609 954b1159f2f3 prosody, configmanager, certmanager: Relocate prosody.resolve_relative_path() to configmanager, and update certmanager (the only user of this function) Matthew Wild <mwild1@gmail.com> parents: 3573 diff changeset	20 local path_sep = package.config:sub(1,1);
954b1159f2f3 prosody, configmanager, certmanager: Relocate prosody.resolve_relative_path() to configmanager, and update certmanager (the only user of this function) Matthew Wild <mwild1@gmail.com> parents: 3573 diff changeset	21
6779 6236668da30a core.: Remove use of module() function Kim Alvefur <zash@zash.se>* parents: 6718 diff changeset	22 local encodings = deps.softreq"util.encodings";
6236668da30a core.: Remove use of module() function Kim Alvefur <zash@zash.se>* parents: 6718 diff changeset	23 local nameprep = encodings and encodings.stringprep.nameprep or function (host) return host:lower(); end
6323 5926f01e5cd2 configmanager: nameprep VirtualHost and Component names Matthew Wild <mwild1@gmail.com> parents: 6166 diff changeset	24
6779 6236668da30a core.: Remove use of module() function Kim Alvefur <zash@zash.se>* parents: 6718 diff changeset	25 local _M = {};
6236668da30a core.: Remove use of module() function Kim Alvefur <zash@zash.se>* parents: 6718 diff changeset	26 local _ENV = nil;
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	27
6164 ef4024f6bc40 core.configmanager: Move path utility functions into util.paths Kim Alvefur <zash@zash.se> parents: 5814 diff changeset	28 _M.resolve_relative_path = resolve_relative_path; -- COMPAT
ef4024f6bc40 core.configmanager: Move path utility functions into util.paths Kim Alvefur <zash@zash.se> parents: 5814 diff changeset	29
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	30 local parsers = {};
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	31
6715 03a283aa679e configmanager: Rename unused function argument [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6714 diff changeset	32 local config_mt = { __index = function (t, _) return rawget(t, "*"); end};
5357 ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	33 local config = setmetatable({ ["*"] = { } }, config_mt);
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	34
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	35 -- When host not found, use global
5380 e119e378b1d9 configmanager: Fix so unset variables are searched for in the global section Kim Alvefur <zash@zash.se> parents: 5357 diff changeset	36 local host_mt = { __index = function(_, k) return config["*"][k] end }
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	37
6779 6236668da30a core.: Remove use of module() function Kim Alvefur <zash@zash.se>* parents: 6718 diff changeset	38 function _M.getconfig()
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	39 return config;
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	40 end
6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	41
6779 6236668da30a core.: Remove use of module() function Kim Alvefur <zash@zash.se>* parents: 6718 diff changeset	42 function _M.get(host, key, _oldkey)
5357 ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	43 if key == "core" then
ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	44 key = _oldkey; -- COMPAT with code that still uses "core"
4530 40905e7bf680 configmanager: get(): Make section (core) optional (hurrah) Matthew Wild <mwild1@gmail.com> parents: 4358 diff changeset	45 end
5357 ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	46 return config[host][key];
ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	47 end
ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	48 function _M.rawget(host, key, _oldkey)
ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	49 if key == "core" then
ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	50 key = _oldkey; -- COMPAT with code that still uses "core"
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	51 end
4001 2e8411f6cb14 configmanager: Added rawget(). Waqas Hussain <waqas20@gmail.com> parents: 3929 diff changeset	52 local hostconfig = rawget(config, host);
2e8411f6cb14 configmanager: Added rawget(). Waqas Hussain <waqas20@gmail.com> parents: 3929 diff changeset	53 if hostconfig then
5357 ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	54 return rawget(hostconfig, key);
4001 2e8411f6cb14 configmanager: Added rawget(). Waqas Hussain <waqas20@gmail.com> parents: 3929 diff changeset	55 end
2e8411f6cb14 configmanager: Added rawget(). Waqas Hussain <waqas20@gmail.com> parents: 3929 diff changeset	56 end
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	57
6712 29d5875ae38d configmanager: Rename variable to avoid name conflict [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6326 diff changeset	58 local function set(config_table, host, key, value)
5357 ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	59 if host and key then
6712 29d5875ae38d configmanager: Rename variable to avoid name conflict [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6326 diff changeset	60 local hostconfig = rawget(config_table, host);
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	61 if not hostconfig then
6712 29d5875ae38d configmanager: Rename variable to avoid name conflict [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6326 diff changeset	62 hostconfig = rawset(config_table, host, setmetatable({}, host_mt))[host];
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	63 end
5357 ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	64 hostconfig[key] = value;
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	65 return true;
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	66 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	67 return false;
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	68 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	69
5357 ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	70 function _M.set(host, key, value, _oldvalue)
ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	71 if key == "core" then
ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	72 key, value = value, _oldvalue; --COMPAT with code that still uses "core"
ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	73 end
ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	74 return set(config, host, key, value);
3573 f31fa6520a4b configmanager: Atomic reloads, and some other internal changes to achieve this Matthew Wild <mwild1@gmail.com> parents: 3515 diff changeset	75 end
f31fa6520a4b configmanager: Atomic reloads, and some other internal changes to achieve this Matthew Wild <mwild1@gmail.com> parents: 3515 diff changeset	76
6779 6236668da30a core.: Remove use of module() function Kim Alvefur <zash@zash.se>* parents: 6718 diff changeset	77 function _M.load(filename, config_format)
6713 b628870b1bd6 configmanager: Rename variable to avoid name conflict [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6712 diff changeset	78 config_format = config_format or filename:match("%w+$");
466 0ecfd89c2cc0 Fix for configmanager when config file can't be found Matthew Wild <mwild1@gmail.com> parents: 376 diff changeset	79
6713 b628870b1bd6 configmanager: Rename variable to avoid name conflict [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6712 diff changeset	80 if parsers[config_format] and parsers[config_format].load then
466 0ecfd89c2cc0 Fix for configmanager when config file can't be found Matthew Wild <mwild1@gmail.com> parents: 376 diff changeset	81 local f, err = io.open(filename);
2552 8dda55217e83 configmanager: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2427 diff changeset	82 if f then
5357 ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	83 local new_config = setmetatable({ ["*"] = { } }, config_mt);
6713 b628870b1bd6 configmanager: Rename variable to avoid name conflict [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6712 diff changeset	84 local ok, err = parsers[config_format].load(f:read("*a"), filename, new_config);
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	85 f:close();
3613 f617718d2221 configmanager: Change parser API again to pass a config table to insert settings to. Fixes Include(). (Thanks Zash/answerman) Matthew Wild <mwild1@gmail.com> parents: 3610 diff changeset	86 if ok then
3573 f31fa6520a4b configmanager: Atomic reloads, and some other internal changes to achieve this Matthew Wild <mwild1@gmail.com> parents: 3515 diff changeset	87 config = new_config;
f31fa6520a4b configmanager: Atomic reloads, and some other internal changes to achieve this Matthew Wild <mwild1@gmail.com> parents: 3515 diff changeset	88 fire_event("config-reloaded", {
f31fa6520a4b configmanager: Atomic reloads, and some other internal changes to achieve this Matthew Wild <mwild1@gmail.com> parents: 3515 diff changeset	89 filename = filename,
6713 b628870b1bd6 configmanager: Rename variable to avoid name conflict [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6712 diff changeset	90 format = config_format,
3573 f31fa6520a4b configmanager: Atomic reloads, and some other internal changes to achieve this Matthew Wild <mwild1@gmail.com> parents: 3515 diff changeset	91 config = config
f31fa6520a4b configmanager: Atomic reloads, and some other internal changes to achieve this Matthew Wild <mwild1@gmail.com> parents: 3515 diff changeset	92 });
1000 a73715a9267f core.configmanager: Fire event when (re)loading config file Matthew Wild <mwild1@gmail.com> parents: 913 diff changeset	93 end
3780 791aede977da configmanager: Switch back to returning 'ok' to signal config load success - fixes config errors not being displayed Matthew Wild <mwild1@gmail.com> parents: 3613 diff changeset	94 return ok, "parser", err;
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	95 end
793 55add3b87c01 Report errors in the config file to the user Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	96 return f, "file", err;
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	97 end
466 0ecfd89c2cc0 Fix for configmanager when config file can't be found Matthew Wild <mwild1@gmail.com> parents: 376 diff changeset	98
6713 b628870b1bd6 configmanager: Rename variable to avoid name conflict [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6712 diff changeset	99 if not config_format then
793 55add3b87c01 Report errors in the config file to the user Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	100 return nil, "file", "no parser specified";
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	101 else
6713 b628870b1bd6 configmanager: Rename variable to avoid name conflict [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6712 diff changeset	102 return nil, "file", "no parser for "..(config_format);
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	103 end
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	104 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	105
6779 6236668da30a core.: Remove use of module() function Kim Alvefur <zash@zash.se>* parents: 6718 diff changeset	106 function _M.addparser(config_format, parser)
6713 b628870b1bd6 configmanager: Rename variable to avoid name conflict [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6712 diff changeset	107 if config_format and parser then
b628870b1bd6 configmanager: Rename variable to avoid name conflict [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6712 diff changeset	108 parsers[config_format] = parser;
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	109 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	110 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	111
2427 343a9eb7540e configmanager: Add parsers() method to return an array of supported config formats Matthew Wild <mwild1@gmail.com> parents: 1777 diff changeset	112 -- _M needed to avoid name clash with local 'parsers'
343a9eb7540e configmanager: Add parsers() method to return an array of supported config formats Matthew Wild <mwild1@gmail.com> parents: 1777 diff changeset	113 function _M.parsers()
343a9eb7540e configmanager: Add parsers() method to return an array of supported config formats Matthew Wild <mwild1@gmail.com> parents: 1777 diff changeset	114 local p = {};
6713 b628870b1bd6 configmanager: Rename variable to avoid name conflict [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6712 diff changeset	115 for config_format in pairs(parsers) do
b628870b1bd6 configmanager: Rename variable to avoid name conflict [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6712 diff changeset	116 table.insert(p, config_format);
2427 343a9eb7540e configmanager: Add parsers() method to return an array of supported config formats Matthew Wild <mwild1@gmail.com> parents: 1777 diff changeset	117 end
343a9eb7540e configmanager: Add parsers() method to return an array of supported config formats Matthew Wild <mwild1@gmail.com> parents: 1777 diff changeset	118 return p;
343a9eb7540e configmanager: Add parsers() method to return an array of supported config formats Matthew Wild <mwild1@gmail.com> parents: 1777 diff changeset	119 end
343a9eb7540e configmanager: Add parsers() method to return an array of supported config formats Matthew Wild <mwild1@gmail.com> parents: 1777 diff changeset	120
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	121 -- Built-in Lua parser
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	122 do
6714 429068c24ea0 configmanager: Remove unnecessary function localizations [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6713 diff changeset	123 local pcall = _G.pcall;
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	124 parsers.lua = {};
6716 2b78754b0f1c configmanager: Rename variable to avoid name conflicts [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6715 diff changeset	125 function parsers.lua.load(data, config_file, config_table)
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	126 local env;
750 fbfcf8c1c830 configmanager: Add support for defining components Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	127 -- The ' = true' are needed so as not to set off __newindex when we assign the functions below
2975 c1a2e210f47e configmanager: Fix very wacky indentation Matthew Wild <mwild1@gmail.com> parents: 2974 diff changeset	128 env = setmetatable({
3012 6d86e26f0923 Merge configmanager->trunk Matthew Wild <mwild1@gmail.com> parents: 2985 3011 diff changeset	129 Host = true, host = true, VirtualHost = true,
6d86e26f0923 Merge configmanager->trunk Matthew Wild <mwild1@gmail.com> parents: 2985 3011 diff changeset	130 Component = true, component = true,
3610 2084959d4096 configmanager: Update Include and RunScript directives to support paths relative to the (current!) config file Matthew Wild <mwild1@gmail.com> parents: 3609 diff changeset	131 Include = true, include = true, RunScript = true }, {
6717 4fecfc81dac1 configmanager: Rename unused function arguments [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6716 diff changeset	132 __index = function (_, k)
5357 ac530c44772e configmanager, hostmanager, prosody: Almost complete removal of section-related code, and the infamous 'core' section. Still backwards-compatible with API users. Matthew Wild <mwild1@gmail.com> parents: 5124 diff changeset	133 return rawget(_G, k);
2975 c1a2e210f47e configmanager: Fix very wacky indentation Matthew Wild <mwild1@gmail.com> parents: 2974 diff changeset	134 end,
6717 4fecfc81dac1 configmanager: Rename unused function arguments [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6716 diff changeset	135 __newindex = function (_, k, v)
4fecfc81dac1 configmanager: Rename unused function arguments [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6716 diff changeset	136 set(config_table, env.__currenthost or "*", k, v);
2975 c1a2e210f47e configmanager: Fix very wacky indentation Matthew Wild <mwild1@gmail.com> parents: 2974 diff changeset	137 end
c1a2e210f47e configmanager: Fix very wacky indentation Matthew Wild <mwild1@gmail.com> parents: 2974 diff changeset	138 });
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5413 diff changeset	139
1615 0e3eacf135f2 configmanager: Default options appearing before Host "" to global (fixes potential traceback) Matthew Wild <mwild1@gmail.com>* parents: 1523 diff changeset	140 rawset(env, "__currenthost", "*") -- Default is global
3011 1189a29cd846 configmanager: Add VirtualHost as an alias for Host (re-applied in trunk due to previous bad merge with 0.7) Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	141 function env.VirtualHost(name)
6323 5926f01e5cd2 configmanager: nameprep VirtualHost and Component names Matthew Wild <mwild1@gmail.com> parents: 6166 diff changeset	142 name = nameprep(name);
6716 2b78754b0f1c configmanager: Rename variable to avoid name conflicts [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6715 diff changeset	143 if rawget(config_table, name) and rawget(config_table[name], "component_module") then
2861 1402615b66f8 configmanager: Error when a component and host clash hostnames Matthew Wild <mwild1@gmail.com> parents: 1777 diff changeset	144 error(format("Host %q clashes with previously defined %s Component %q, for services use a sub-domain like conference.%s",
6716 2b78754b0f1c configmanager: Rename variable to avoid name conflicts [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6715 diff changeset	145 name, config_table[name].component_module:gsub("^%a+$", { component = "external", muc = "MUC"}), name, name), 0);
2861 1402615b66f8 configmanager: Error when a component and host clash hostnames Matthew Wild <mwild1@gmail.com> parents: 1777 diff changeset	146 end
376 6d87944df37c New configmanager. Old-style config files still work, but will print a warning Matthew Wild <mwild1@gmail.com> parents: 371 diff changeset	147 rawset(env, "__currenthost", name);
750 fbfcf8c1c830 configmanager: Add support for defining components Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	148 -- Needs at least one setting to logically exist :)
6716 2b78754b0f1c configmanager: Rename variable to avoid name conflicts [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6715 diff changeset	149 set(config_table, name or "*", "defined", true);
3515 bb494c3aa364 configmanager: Allow VirtualHost/Component definitions to be followed by a table of config options Matthew Wild <mwild1@gmail.com> parents: 3384 diff changeset	150 return function (config_options)
bb494c3aa364 configmanager: Allow VirtualHost/Component definitions to be followed by a table of config options Matthew Wild <mwild1@gmail.com> parents: 3384 diff changeset	151 rawset(env, "__currenthost", "*"); -- Return to global scope
bb494c3aa364 configmanager: Allow VirtualHost/Component definitions to be followed by a table of config options Matthew Wild <mwild1@gmail.com> parents: 3384 diff changeset	152 for option_name, option_value in pairs(config_options) do
6716 2b78754b0f1c configmanager: Rename variable to avoid name conflicts [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6715 diff changeset	153 set(config_table, name or "*", option_name, option_value);
3515 bb494c3aa364 configmanager: Allow VirtualHost/Component definitions to be followed by a table of config options Matthew Wild <mwild1@gmail.com> parents: 3384 diff changeset	154 end
bb494c3aa364 configmanager: Allow VirtualHost/Component definitions to be followed by a table of config options Matthew Wild <mwild1@gmail.com> parents: 3384 diff changeset	155 end;
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	156 end
3011 1189a29cd846 configmanager: Add VirtualHost as an alias for Host (re-applied in trunk due to previous bad merge with 0.7) Matthew Wild <mwild1@gmail.com> parents: 2925 diff changeset	157 env.Host, env.host = env.VirtualHost, env.VirtualHost;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5413 diff changeset	158
750 fbfcf8c1c830 configmanager: Add support for defining components Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	159 function env.Component(name)
6323 5926f01e5cd2 configmanager: nameprep VirtualHost and Component names Matthew Wild <mwild1@gmail.com> parents: 6166 diff changeset	160 name = nameprep(name);
7947 24170d74b00b core: Split some very long lines [luacheck] Kim Alvefur <zash@zash.se> parents: 6779 diff changeset	161 if rawget(config_table, name) and rawget(config_table[name], "defined")
24170d74b00b core: Split some very long lines [luacheck] Kim Alvefur <zash@zash.se> parents: 6779 diff changeset	162 and not rawget(config_table[name], "component_module") then
2861 1402615b66f8 configmanager: Error when a component and host clash hostnames Matthew Wild <mwild1@gmail.com> parents: 1777 diff changeset	163 error(format("Component %q clashes with previously defined Host %q, for services use a sub-domain like conference.%s",
1402615b66f8 configmanager: Error when a component and host clash hostnames Matthew Wild <mwild1@gmail.com> parents: 1777 diff changeset	164 name, name, name), 0);
1402615b66f8 configmanager: Error when a component and host clash hostnames Matthew Wild <mwild1@gmail.com> parents: 1777 diff changeset	165 end
6716 2b78754b0f1c configmanager: Rename variable to avoid name conflicts [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6715 diff changeset	166 set(config_table, name, "component_module", "component");
913 3e2dac84017d core.configmanager: Make components use 'component' module by default if none specified Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	167 -- Don't load the global modules by default
6716 2b78754b0f1c configmanager: Rename variable to avoid name conflicts [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6715 diff changeset	168 set(config_table, name, "load_global_modules", false);
913 3e2dac84017d core.configmanager: Make components use 'component' module by default if none specified Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	169 rawset(env, "__currenthost", name);
3515 bb494c3aa364 configmanager: Allow VirtualHost/Component definitions to be followed by a table of config options Matthew Wild <mwild1@gmail.com> parents: 3384 diff changeset	170 local function handle_config_options(config_options)
bb494c3aa364 configmanager: Allow VirtualHost/Component definitions to be followed by a table of config options Matthew Wild <mwild1@gmail.com> parents: 3384 diff changeset	171 rawset(env, "__currenthost", "*"); -- Return to global scope
bb494c3aa364 configmanager: Allow VirtualHost/Component definitions to be followed by a table of config options Matthew Wild <mwild1@gmail.com> parents: 3384 diff changeset	172 for option_name, option_value in pairs(config_options) do
6716 2b78754b0f1c configmanager: Rename variable to avoid name conflicts [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6715 diff changeset	173 set(config_table, name or "*", option_name, option_value);
3515 bb494c3aa364 configmanager: Allow VirtualHost/Component definitions to be followed by a table of config options Matthew Wild <mwild1@gmail.com> parents: 3384 diff changeset	174 end
bb494c3aa364 configmanager: Allow VirtualHost/Component definitions to be followed by a table of config options Matthew Wild <mwild1@gmail.com> parents: 3384 diff changeset	175 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5413 diff changeset	176
750 fbfcf8c1c830 configmanager: Add support for defining components Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	177 return function (module)
857 49298263f241 core.configmanager: Small fix to check validity of Component definitions Matthew Wild <mwild1@gmail.com> parents: 795 diff changeset	178 if type(module) == "string" then
6716 2b78754b0f1c configmanager: Rename variable to avoid name conflicts [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6715 diff changeset	179 set(config_table, name, "component_module", module);
3515 bb494c3aa364 configmanager: Allow VirtualHost/Component definitions to be followed by a table of config options Matthew Wild <mwild1@gmail.com> parents: 3384 diff changeset	180 return handle_config_options;
857 49298263f241 core.configmanager: Small fix to check validity of Component definitions Matthew Wild <mwild1@gmail.com> parents: 795 diff changeset	181 end
3515 bb494c3aa364 configmanager: Allow VirtualHost/Component definitions to be followed by a table of config options Matthew Wild <mwild1@gmail.com> parents: 3384 diff changeset	182 return handle_config_options(module);
750 fbfcf8c1c830 configmanager: Add support for defining components Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	183 end
fbfcf8c1c830 configmanager: Add support for defining components Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	184 end
fbfcf8c1c830 configmanager: Add support for defining components Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	185 env.component = env.Component;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5413 diff changeset	186
5413 0bf5e90be086 configmanager: Some cleanup, remove unused variables and imports Matthew Wild <mwild1@gmail.com> parents: 5380 diff changeset	187 function env.Include(file)
6718 be98ebe87eef configmanager: Refactor function to avoid re-declaring local variable [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6717 diff changeset	188 -- Check whether this is a wildcard Include
3905 9222dad9e1e8 configmanager: Support for wildcards in Include directives Matthew Wild <mwild1@gmail.com> parents: 3780 diff changeset	189 if file:match("[*?]") then
6166 46cb87d531a7 configmanager: Delay importing LuaFileSystem until needed by an Include line Kim Alvefur <zash@zash.se> parents: 5811 diff changeset	190 local lfs = deps.softreq "lfs";
46cb87d531a7 configmanager: Delay importing LuaFileSystem until needed by an Include line Kim Alvefur <zash@zash.se> parents: 5811 diff changeset	191 if not lfs then
46cb87d531a7 configmanager: Delay importing LuaFileSystem until needed by an Include line Kim Alvefur <zash@zash.se> parents: 5811 diff changeset	192 error(format("Error expanding wildcard pattern in Include %q - LuaFileSystem not available", file));
46cb87d531a7 configmanager: Delay importing LuaFileSystem until needed by an Include line Kim Alvefur <zash@zash.se> parents: 5811 diff changeset	193 end
3905 9222dad9e1e8 configmanager: Support for wildcards in Include directives Matthew Wild <mwild1@gmail.com> parents: 3780 diff changeset	194 local path_pos, glob = file:match("()([^"..path_sep.."]+)$");
9222dad9e1e8 configmanager: Support for wildcards in Include directives Matthew Wild <mwild1@gmail.com> parents: 3780 diff changeset	195 local path = file:sub(1, math_max(path_pos-2,0));
3929 7cb03d67101b configmanager: Filenames without a path are also relative to the config file path, not the current working directory Matthew Wild <mwild1@gmail.com> parents: 3905 diff changeset	196 local config_path = config_file:gsub("[^"..path_sep.."]+$", "");
3905 9222dad9e1e8 configmanager: Support for wildcards in Include directives Matthew Wild <mwild1@gmail.com> parents: 3780 diff changeset	197 if #path > 0 then
3929 7cb03d67101b configmanager: Filenames without a path are also relative to the config file path, not the current working directory Matthew Wild <mwild1@gmail.com> parents: 3905 diff changeset	198 path = resolve_relative_path(config_path, path);
3905 9222dad9e1e8 configmanager: Support for wildcards in Include directives Matthew Wild <mwild1@gmail.com> parents: 3780 diff changeset	199 else
3929 7cb03d67101b configmanager: Filenames without a path are also relative to the config file path, not the current working directory Matthew Wild <mwild1@gmail.com> parents: 3905 diff changeset	200 path = config_path;
3905 9222dad9e1e8 configmanager: Support for wildcards in Include directives Matthew Wild <mwild1@gmail.com> parents: 3780 diff changeset	201 end
9222dad9e1e8 configmanager: Support for wildcards in Include directives Matthew Wild <mwild1@gmail.com> parents: 3780 diff changeset	202 local patt = glob_to_pattern(glob);
9222dad9e1e8 configmanager: Support for wildcards in Include directives Matthew Wild <mwild1@gmail.com> parents: 3780 diff changeset	203 for f in lfs.dir(path) do
9222dad9e1e8 configmanager: Support for wildcards in Include directives Matthew Wild <mwild1@gmail.com> parents: 3780 diff changeset	204 if f:sub(1,1) ~= "." and f:match(patt) then
9222dad9e1e8 configmanager: Support for wildcards in Include directives Matthew Wild <mwild1@gmail.com> parents: 3780 diff changeset	205 env.Include(path..path_sep..f);
9222dad9e1e8 configmanager: Support for wildcards in Include directives Matthew Wild <mwild1@gmail.com> parents: 3780 diff changeset	206 end
9222dad9e1e8 configmanager: Support for wildcards in Include directives Matthew Wild <mwild1@gmail.com> parents: 3780 diff changeset	207 end
6718 be98ebe87eef configmanager: Refactor function to avoid re-declaring local variable [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6717 diff changeset	208 return;
794 912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	209 end
6718 be98ebe87eef configmanager: Refactor function to avoid re-declaring local variable [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6717 diff changeset	210 -- Not a wildcard, so resolve (potentially) relative path and run through config parser
be98ebe87eef configmanager: Refactor function to avoid re-declaring local variable [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6717 diff changeset	211 file = resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file);
be98ebe87eef configmanager: Refactor function to avoid re-declaring local variable [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6717 diff changeset	212 local f, err = io.open(file);
be98ebe87eef configmanager: Refactor function to avoid re-declaring local variable [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6717 diff changeset	213 if f then
be98ebe87eef configmanager: Refactor function to avoid re-declaring local variable [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6717 diff changeset	214 local ret, err = parsers.lua.load(f:read("*a"), file, config_table);
be98ebe87eef configmanager: Refactor function to avoid re-declaring local variable [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6717 diff changeset	215 if not ret then error(err:gsub("%[string.-%]", file), 0); end
be98ebe87eef configmanager: Refactor function to avoid re-declaring local variable [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6717 diff changeset	216 end
be98ebe87eef configmanager: Refactor function to avoid re-declaring local variable [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6717 diff changeset	217 if not f then error("Error loading included "..file..": "..err, 0); end
be98ebe87eef configmanager: Refactor function to avoid re-declaring local variable [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6717 diff changeset	218 return f, err;
794 912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	219 end
912dc389935a Add Include command to include extra configuration files from the main one Matthew Wild <mwild1@gmail.com> parents: 793 diff changeset	220 env.include = env.Include;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5413 diff changeset	221
3610 2084959d4096 configmanager: Update Include and RunScript directives to support paths relative to the (current!) config file Matthew Wild <mwild1@gmail.com> parents: 3609 diff changeset	222 function env.RunScript(file)
3905 9222dad9e1e8 configmanager: Support for wildcards in Include directives Matthew Wild <mwild1@gmail.com> parents: 3780 diff changeset	223 return dofile(resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file));
3610 2084959d4096 configmanager: Update Include and RunScript directives to support paths relative to the (current!) config file Matthew Wild <mwild1@gmail.com> parents: 3609 diff changeset	224 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5413 diff changeset	225
5021 85b2689dbcfe Eliminate direct setfenv usage Florian Zeitz <florob@babelmonkeys.de> parents: 4530 diff changeset	226 local chunk, err = envload(data, "@"..config_file, env);
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5413 diff changeset	227
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	228 if not chunk then
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	229 return nil, err;
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	230 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5413 diff changeset	231
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	232 local ok, err = pcall(chunk);
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5413 diff changeset	233
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	234 if not ok then
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	235 return nil, err;
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	236 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5413 diff changeset	237
3613 f617718d2221 configmanager: Change parser API again to pass a config table to insert settings to. Fixes Include(). (Thanks Zash/answerman) Matthew Wild <mwild1@gmail.com> parents: 3610 diff changeset	238 return true;
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	239 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5413 diff changeset	240
371 0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	241 end
0dc5819660e8 Import initial configmanager, not sure if it works yet, but it does pass the unit tests ;) Matthew Wild <mwild1@gmail.com> parents: diff changeset	242
466 0ecfd89c2cc0 Fix for configmanager when config file can't be found Matthew Wild <mwild1@gmail.com> parents: 376 diff changeset	243 return _M;

prosody

8da11142fabf

core/configmanager.lua

Software / code / prosody

Annotate

core/configmanager.lua @ 8791:8da11142fabf

Software `/` code `/` prosody