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

core.configmanager: Handle nameprep validation errors

Browse source
This commit is contained in:
Kim Alvefur 2019-11-02 13:56:13 +01:00
parent 20226a9804
commit 00cf4fcf14
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/configmanager.lua
View file

@ -141,7 +141,11 @@ do
if not name then
error("Host must have a name", 2);
end
name = nameprep(name);
local prepped_name = nameprep(name);
if not prepped_name then
error(format("Name of Host %q contains forbidden characters", name), 0);
end
name = prepped_name;
if rawget(config_table, name) and rawget(config_table[name], "component_module") then
error(format("Host %q clashes with previously defined %s Component %q, for services use a sub-domain like conference.%s",
name, config_table[name].component_module:gsub("^%a+$", { component = "external", muc = "MUC"}), name, name), 0);
@ -162,7 +166,11 @@ do
if not name then
error("Component must have a name", 2);
end
name = nameprep(name);
local prepped_name = nameprep(name);
if not prepped_name then
error(format("Name of Component %q contains forbidden characters", name), 0);
end
name = prepped_name;
if rawget(config_table, name) and rawget(config_table[name], "defined")
and not rawget(config_table[name], "component_module") then
error(format("Component %q clashes with previously defined Host %q, for services use a sub-domain like conference.%s",