mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 05:07:42 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

core.configmanager: Fix reporting delayed warnings from global section

Browse source 
A Credential in the global section would be stored at
delayed_warnings["*/secret"], but get("example.com","secret") would look
for delayed_warnings["example.com/secret"]

Storing the warnings in the config itself has the unfortunate
side-effect that the config now contains util.error objects, which may
be awkward if something bypasses get(). Should rawget() also do this
filtering? getconfig() too?

Currently this only affects prosodyctl, so maybe it won't be much of a
problem.
This commit is contained in:
Kim Alvefur 2025-02-22 00:08:18 +01:00
parent 9eedb15c6f
commit 5e41daac79
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
core/configmanager.lua
View file

@ -34,7 +34,6 @@ local parser = nil;
local config_mt = { __index = function (t, _) return rawget(t, "*"); end}; local config_mt = { __index = function (t, _) return rawget(t, "*"); end};
local config = setmetatable({ ["*"] = { } }, config_mt); local config = setmetatable({ ["*"] = { } }, config_mt);
local delayed_warnings = {};
local files = {}; local files = {};
local credentials_directory = nil; local credentials_directory = nil;
local credential_fallback_fatal = true; local credential_fallback_fatal = true;
@ -47,11 +46,12 @@ function _M.getconfig()
end end
function _M.get(host, key) function _M.get(host, key)
if host and key and delayed_warnings[host.."/"..key] then local v = config[host][key];
local warning = delayed_warnings[host.."/"..key]; if v and errors.is_error(v) then
log("warn", "%s", warning.text); log("warn", "%s", v.text);
return nil;
end end
return config[host][key]; return v;
end end
function _M.rawget(host, key) function _M.rawget(host, key)
local hostconfig = rawget(config, host); local hostconfig = rawget(config, host);
@ -252,10 +252,6 @@ do
t_insert(warnings, ("%s:%d: Duplicate option '%s'"):format(config_file, get_line_number(config_file), k)); t_insert(warnings, ("%s:%d: Duplicate option '%s'"):format(config_file, get_line_number(config_file), k));
end end
set_options[option_path] = true; set_options[option_path] = true;
if errors.is_error(v) then
delayed_warnings[option_path] = v;
return;
end
set(config_table, env.__currenthost or "*", k, v); set(config_table, env.__currenthost or "*", k, v);
end end
}); });
@ -385,7 +381,6 @@ do
:format(config_file, get_line_number(config_file)); :format(config_file, get_line_number(config_file));
}); });
end end
end end
local chunk, err = envload(data, "@"..config_file, env); local chunk, err = envload(data, "@"..config_file, env);