From f6b0d630fc55870e910f8ff286e55bea6e451e38 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 18 May 2015 20:50:50 +0200 Subject: hostmanager: Metatable with __tostring on hosts --- core/hostmanager.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/core/hostmanager.lua b/core/hostmanager.lua index d7329cd2..046722b1 100644 --- a/core/hostmanager.lua +++ b/core/hostmanager.lua @@ -26,9 +26,23 @@ local core_route_stanza = _G.prosody.core_route_stanza; local pairs, select, rawget = pairs, select, rawget; local tostring, type = tostring, type; +local setmetatable = setmetatable; module "hostmanager" +local host_mt = { } +function host_mt:__tostring() + if self.type == "component" then + local typ = configmanager.get(self.host, "component_module"); + if typ == "component" then + return ("Component %q"):format(self.host); + end + return ("Component %q %q"):format(self.host, typ); + elseif self.type == "local" then + return ("VirtualHost %q"):format(self.host); + end +end + local hosts_loaded_once; local function load_enabled_hosts(config) @@ -76,6 +90,7 @@ function activate(host, host_config) send = host_send; modules = {}; }; + setmetatable(host_session, host_mt); if not host_config.component_module then -- host host_session.type = "local"; host_session.sessions = {}; -- cgit v1.2.3 From 938380caccccf565f11dbb8ff326788e5a2a857b Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 18 May 2015 21:00:41 +0200 Subject: mod_auth_internal_hashed: Use util.hex --- plugins/mod_auth_internal_hashed.lua | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/plugins/mod_auth_internal_hashed.lua b/plugins/mod_auth_internal_hashed.lua index 954392c9..78abe50d 100644 --- a/plugins/mod_auth_internal_hashed.lua +++ b/plugins/mod_auth_internal_hashed.lua @@ -13,31 +13,14 @@ local getAuthenticationDatabaseSHA1 = require "util.sasl.scram".getAuthenticatio local usermanager = require "core.usermanager"; local generate_uuid = require "util.uuid".generate; local new_sasl = require "util.sasl".new; +local hex = require"util.hex"; +local to_hex, from_hex = hex.to, hex.from; local log = module._log; local host = module.host; local accounts = module:open_store("accounts"); -local to_hex; -do - local function replace_byte_with_hex(byte) - return ("%02x"):format(byte:byte()); - end - function to_hex(binary_string) - return binary_string:gsub(".", replace_byte_with_hex); - end -end - -local from_hex; -do - local function replace_hex_with_byte(hex) - return string.char(tonumber(hex, 16)); - end - function from_hex(hex_string) - return hex_string:gsub("..", replace_hex_with_byte); - end -end -- Default; can be set per-user -- cgit v1.2.3 From bac4a10b348e1420fecaff6481ab585838cf306f Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 18 May 2015 21:32:05 +0200 Subject: util.x509: Tell LuaSec we want UTF-8 data --- util/x509.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/x509.lua b/util/x509.lua index 5e1b49e5..bf8d3906 100644 --- a/util/x509.lua +++ b/util/x509.lua @@ -148,6 +148,9 @@ local function compare_srvname(host, service, asserted_names) end function verify_identity(host, service, cert) + if cert.setencode then + cert:setencode("utf8"); + end local ext = cert:extensions() if ext[oid_subjectaltname] then local sans = ext[oid_subjectaltname]; -- cgit v1.2.3 From 3f9b6834573752a09e06196792bcce7774fd6f1e Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 18 May 2015 21:43:24 +0200 Subject: mod_tls: Build as a stanza instead of with string concatenation --- plugins/mod_tls.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index f9d2cee9..85fa172a 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -21,6 +21,7 @@ end local xmlns_starttls = 'urn:ietf:params:xml:ns:xmpp-tls'; local starttls_attr = { xmlns = xmlns_starttls }; +local starttls_initiate= st.stanza("starttls", starttls_attr); local starttls_proceed = st.stanza("proceed", starttls_attr); local starttls_failure = st.stanza("failure", starttls_attr); local c2s_feature = st.stanza("starttls", starttls_attr); @@ -116,7 +117,7 @@ module:hook_stanza("http://etherx.jabber.org/streams", "features", function (ses module:log("debug", "Received features element"); if can_do_tls(session) and stanza:get_child("starttls", xmlns_starttls) then module:log("debug", "%s is offering TLS, taking up the offer...", session.to_host); - session.sends2s(""); + session.sends2s(starttls_initiate); return true; end end, 500); -- cgit v1.2.3 From 72dde1c231c9d71c5ae5fe1d2d5fafc029e32c17 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 18 May 2015 21:48:58 +0200 Subject: mod_tls: Treat session.ssl_ctx being false as a signal that TLS is disabled --- plugins/mod_tls.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index 85fa172a..d1138e1c 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -61,7 +61,7 @@ do end local function can_do_tls(session) - if not session.conn.starttls then + if session.ssl_ctx == false or not session.conn.starttls then return false; elseif session.ssl_ctx then return true; -- cgit v1.2.3 From e1aa25912f064363e531029ef05b5a62b47361c1 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 18 May 2015 22:04:12 +0200 Subject: prosodyctl: Soft-require LuaSec and LuaEvent so they show up in the module version listing --- prosodyctl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/prosodyctl b/prosodyctl index ef436106..6c4b148a 100755 --- a/prosodyctl +++ b/prosodyctl @@ -578,6 +578,8 @@ function commands.about(arg) print(""); print("# Lua module versions"); local module_versions, longest_name = {}, 8; + local luaevent =dependencies.softreq"luaevent"; + local ssl = dependencies.softreq"ssl"; for name, module in pairs(package.loaded) do if type(module) == "table" and rawget(module, "_VERSION") and name ~= "_G" and not name:match("%.") then -- cgit v1.2.3 From 7523668ad017bc468e2946b7744b92de90006fac Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 18 May 2015 19:03:07 +0100 Subject: configmanager: Rename variable to avoid name conflict [luacheck] --- core/configmanager.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/configmanager.lua b/core/configmanager.lua index 48f039ea..5891c59a 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -54,11 +54,11 @@ function _M.rawget(host, key, _oldkey) end end -local function set(config, host, key, value) +local function set(config_table, host, key, value) if host and key then - local hostconfig = rawget(config, host); + local hostconfig = rawget(config_table, host); if not hostconfig then - hostconfig = rawset(config, host, setmetatable({}, host_mt))[host]; + hostconfig = rawset(config_table, host, setmetatable({}, host_mt))[host]; end hostconfig[key] = value; return true; -- cgit v1.2.3 From c9c311b940c4d17cf3d2794323d0788cfd1e07da Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 18 May 2015 19:04:37 +0100 Subject: configmanager: Rename variable to avoid name conflict [luacheck] --- core/configmanager.lua | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/core/configmanager.lua b/core/configmanager.lua index 5891c59a..91e7b22c 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -73,20 +73,20 @@ function _M.set(host, key, value, _oldvalue) return set(config, host, key, value); end -function load(filename, format) - format = format or filename:match("%w+$"); +function load(filename, config_format) + config_format = config_format or filename:match("%w+$"); - if parsers[format] and parsers[format].load then + if parsers[config_format] and parsers[config_format].load then local f, err = io.open(filename); if f then local new_config = setmetatable({ ["*"] = { } }, config_mt); - local ok, err = parsers[format].load(f:read("*a"), filename, new_config); + local ok, err = parsers[config_format].load(f:read("*a"), filename, new_config); f:close(); if ok then config = new_config; fire_event("config-reloaded", { filename = filename, - format = format, + format = config_format, config = config }); end @@ -95,27 +95,24 @@ function load(filename, format) return f, "file", err; end - if not format then + if not config_format then return nil, "file", "no parser specified"; else - return nil, "file", "no parser for "..(format); + return nil, "file", "no parser for "..(config_format); end end -function save(filename, format) -end - -function addparser(format, parser) - if format and parser then - parsers[format] = parser; +function addparser(config_format, parser) + if config_format and parser then + parsers[config_format] = parser; end end -- _M needed to avoid name clash with local 'parsers' function _M.parsers() local p = {}; - for format in pairs(parsers) do - table.insert(p, format); + for config_format in pairs(parsers) do + table.insert(p, config_format); end return p; end -- cgit v1.2.3 From 9dcab343823a51f6a4bd56eb3d69de21f79a9aae Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 18 May 2015 19:05:08 +0100 Subject: configmanager: Remove unnecessary function localizations [luacheck] --- core/configmanager.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/configmanager.lua b/core/configmanager.lua index 91e7b22c..4d772f67 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -119,8 +119,7 @@ end -- Built-in Lua parser do - local pcall, setmetatable = _G.pcall, _G.setmetatable; - local rawget = _G.rawget; + local pcall = _G.pcall; parsers.lua = {}; function parsers.lua.load(data, config_file, config) local env; -- cgit v1.2.3 From 0558bfbcb73769eb66b2e5514eb90b4afd5347b2 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 18 May 2015 19:05:26 +0100 Subject: configmanager: Rename unused function argument [luacheck] --- core/configmanager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/configmanager.lua b/core/configmanager.lua index 4d772f67..2feffa6c 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -28,7 +28,7 @@ _M.resolve_relative_path = resolve_relative_path; -- COMPAT local parsers = {}; -local config_mt = { __index = function (t, k) return rawget(t, "*"); end}; +local config_mt = { __index = function (t, _) return rawget(t, "*"); end}; local config = setmetatable({ ["*"] = { } }, config_mt); -- When host not found, use global -- cgit v1.2.3 From 55f7842f8a5f9e27d37de392233db6e6f19ce800 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 18 May 2015 19:06:34 +0100 Subject: configmanager: Rename variable to avoid name conflicts [luacheck] --- core/configmanager.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/configmanager.lua b/core/configmanager.lua index 2feffa6c..db23009e 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -121,7 +121,7 @@ end do local pcall = _G.pcall; parsers.lua = {}; - function parsers.lua.load(data, config_file, config) + function parsers.lua.load(data, config_file, config_table) local env; -- The ' = true' are needed so as not to set off __newindex when we assign the functions below env = setmetatable({ @@ -139,17 +139,17 @@ 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 + 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[name].component_module:gsub("^%a+$", { component = "external", muc = "MUC"}), name, name), 0); + name, config_table[name].component_module:gsub("^%a+$", { component = "external", muc = "MUC"}), name, name), 0); end rawset(env, "__currenthost", name); -- Needs at least one setting to logically exist :) - set(config, name or "*", "defined", true); + set(config_table, name or "*", "defined", true); return function (config_options) rawset(env, "__currenthost", "*"); -- Return to global scope for option_name, option_value in pairs(config_options) do - set(config, name or "*", option_name, option_value); + set(config_table, name or "*", option_name, option_value); end end; end @@ -157,24 +157,24 @@ do function env.Component(name) name = nameprep(name); - if rawget(config, name) and rawget(config[name], "defined") and not rawget(config[name], "component_module") then + 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", name, name, name), 0); end - set(config, name, "component_module", "component"); + set(config_table, name, "component_module", "component"); -- Don't load the global modules by default - set(config, name, "load_global_modules", false); + set(config_table, name, "load_global_modules", false); rawset(env, "__currenthost", name); local function handle_config_options(config_options) rawset(env, "__currenthost", "*"); -- Return to global scope for option_name, option_value in pairs(config_options) do - set(config, name or "*", option_name, option_value); + set(config_table, name or "*", option_name, option_value); end end return function (module) if type(module) == "string" then - set(config, name, "component_module", module); + set(config_table, name, "component_module", module); return handle_config_options; end return handle_config_options(module); -- cgit v1.2.3 From 3de0d3e0496ecfac8c6fa3f85596646124a87343 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 18 May 2015 19:07:06 +0100 Subject: configmanager: Rename unused function arguments [luacheck] --- core/configmanager.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/configmanager.lua b/core/configmanager.lua index db23009e..a85f950c 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -128,11 +128,11 @@ do Host = true, host = true, VirtualHost = true, Component = true, component = true, Include = true, include = true, RunScript = true }, { - __index = function (t, k) + __index = function (_, k) return rawget(_G, k); end, - __newindex = function (t, k, v) - set(config, env.__currenthost or "*", k, v); + __newindex = function (_, k, v) + set(config_table, env.__currenthost or "*", k, v); end }); -- cgit v1.2.3 From f96b8f343a63b71078fe6f42496484f8a5d5fb33 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 18 May 2015 19:07:31 +0100 Subject: configmanager: Refactor function to avoid re-declaring local variable [luacheck] --- core/configmanager.lua | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/core/configmanager.lua b/core/configmanager.lua index a85f950c..5ee131ad 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -183,6 +183,7 @@ do env.component = env.Component; function env.Include(file) + -- Check whether this is a wildcard Include if file:match("[*?]") then local lfs = deps.softreq "lfs"; if not lfs then @@ -202,16 +203,17 @@ do 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; + return; + end + -- Not a wildcard, so resolve (potentially) relative path and run through config parser + 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_table); + 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 env.include = env.Include; -- cgit v1.2.3 From bb08d35ca72865e4ba3432a30a6df7e4d9e77c62 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 18 May 2015 19:09:07 +0100 Subject: loggingmanager: Rename function arguments to avoid name conflict [luacheck] (core/ is now luacheck-clean!) --- core/loggingmanager.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index f348dbdf..57ed8687 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -177,8 +177,8 @@ end -- Column width for "source" (used by stdout and console) local sourcewidth = 20; -function log_sink_types.stdout(config) - local timestamps = config.timestamps; +function log_sink_types.stdout(sink_config) + local timestamps = sink_config.timestamps; if timestamps == true then timestamps = default_timestamp; -- Default format @@ -207,13 +207,13 @@ do logstyles["warn"] = getstyle("bold", "yellow"); logstyles["error"] = getstyle("bold", "red"); end - function log_sink_types.console(config) + function log_sink_types.console(sink_config) -- Really if we don't want pretty colours then just use plain stdout if not do_pretty_printing then - return log_sink_types.stdout(config); + return log_sink_types.stdout(sink_config); end - local timestamps = config.timestamps; + local timestamps = sink_config.timestamps; if timestamps == true then timestamps = default_timestamp; -- Default format @@ -240,15 +240,15 @@ do end local empty_function = function () end; -function log_sink_types.file(config) - local log = config.filename; +function log_sink_types.file(sink_config) + local log = sink_config.filename; local logfile = io_open(log, "a+"); if not logfile then return empty_function; end local write, flush = logfile.write, logfile.flush; - local timestamps = config.timestamps; + local timestamps = sink_config.timestamps; if timestamps == nil or timestamps == true then timestamps = default_timestamp; -- Default format -- cgit v1.2.3