aboutsummaryrefslogtreecommitdiffstats
path: root/core/configmanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-07-31 06:56:21 +0100
committerMatthew Wild <mwild1@gmail.com>2014-07-31 06:56:21 +0100
commit2990b9027915b38cb82d9e811218b6b8c483798c (patch)
treeaad7a8932b8bd03d895bd2713ee81c0cb7ef3f80 /core/configmanager.lua
parent575404af1c8ddad0a6bb9894d74f7a61a0e8f3d1 (diff)
downloadprosody-2990b9027915b38cb82d9e811218b6b8c483798c.tar.gz
prosody-2990b9027915b38cb82d9e811218b6b8c483798c.zip
configmanager: nameprep VirtualHost and Component names
Diffstat (limited to 'core/configmanager.lua')
-rw-r--r--core/configmanager.lua5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua
index d175b54b..c8aa7b9a 100644
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -17,6 +17,9 @@ local envload = require"util.envload".envload;
local deps = require"util.dependencies";
local path_sep = package.config:sub(1,1);
+local have_encodings, encodings = pcall(require, "util.encodings");
+local nameprep = have_encodings and encodings.stringprep.nameprep or function (host) return host:lower(); end
+
module "configmanager"
local parsers = {};
@@ -170,6 +173,7 @@ do
rawset(env, "__currenthost", "*") -- Default is global
function env.VirtualHost(name)
+ name = nameprep(name);
if rawget(config, name) and rawget(config[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[name].component_module:gsub("^%a+$", { component = "external", muc = "MUC"}), name, name), 0);
@@ -187,6 +191,7 @@ do
env.Host, env.host = env.VirtualHost, env.VirtualHost;
function env.Component(name)
+ name = nameprep(name);
if rawget(config, name) and rawget(config[name], "defined") and not rawget(config[name], "component_module") then
error(format("Component %q clashes with previously defined Host %q, for services use a sub-domain like conference.%s",
name, name, name), 0);