portmanager, s2smanager, sessionmanager, stanza_router, storagemanager, usermanager...

[prosody.git] / core / portmanager.lua

diff --git a/core/portmanager.lua b/core/portmanager.lua
index 1b3740cf91f444e1172c3ebd32a230d99f8245bd..bbb7c215ff92bcaa2c3477d45e4908b7d668a444 100644 (file)
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -29,6 +29,8 @@ if socket.tcp6 and config.get("*", "use_ipv6") ~= false then
        table.insert(default_local_interfaces, "::1");
 end
 
+local default_mode = config.get("*", "network_default_read_size") or 4096;
+
 --- Private state
 
 -- service_name -> { service_info, ... }
@@ -39,7 +41,7 @@ local active_services = multitable.new();
 
 --- Private helpers
 
-local function error_to_friendly_message(service_name, port, err)
+local function error_to_friendly_message(service_name, port, err) --luacheck: ignore 212/service_name
        local friendly_message = err;
        if err:match(" in use") then
                -- FIXME: Use service_name here
@@ -70,16 +72,6 @@ prosody.events.add_handler("item-removed/net-provider", function (event)
        unregister_service(item.name, item);
 end);
 
-local function duplicate_ssl_config(ssl_config)
-       local ssl_config = type(ssl_config) == "table" and ssl_config or {};
-
-       local _config = {};
-       for k, v in pairs(ssl_config) do
-               _config[k] = v;
-       end
-       return _config;
-end
-
 --- Public API
 
 function activate(service_name)
@@ -87,7 +79,7 @@ function activate(service_name)
        if not service_info then
                return nil, "Unknown service: "..service_name;
        end
-       
+
        local listener = service_info.listener;
 
        local config_prefix = (service_info.config_prefix or service_name).."_";
@@ -103,7 +95,7 @@ function activate(service_name)
                or listener.default_interface -- COMPAT w/pre0.9
                or default_interfaces
        bind_interfaces = set.new(type(bind_interfaces)~="table" and {bind_interfaces} or bind_interfaces);
-       
+
        local bind_ports = config.get("*", config_prefix.."ports")
                or service_info.default_ports
                or {service_info.default_port
@@ -111,8 +103,9 @@ function activate(service_name)
                   }
        bind_ports = set.new(type(bind_ports) ~= "table" and { bind_ports } or bind_ports );
 
-       local mode, ssl = listener.default_mode or "*a";
-       
+       local mode, ssl = listener.default_mode or default_mode;
+       local hooked_ports = {};
+
        for interface in bind_interfaces do
                for port in bind_ports do
                        local port_number = tonumber(port);
@@ -124,24 +117,15 @@ function activate(service_name)
                                local err;
                                -- Create SSL context for this service/port
                                if service_info.encryption == "ssl" then
-                                       local ssl_config = duplicate_ssl_config((config.get("*", config_prefix.."ssl") and config.get("*", config_prefix.."ssl")[interface])
-                                                               or (config.get("*", config_prefix.."ssl") and config.get("*", config_prefix.."ssl")[port])
-                                                               or config.get("*", config_prefix.."ssl")
-                                                               or (config.get("*", "ssl") and config.get("*", "ssl")[interface])
-                                                               or (config.get("*", "ssl") and config.get("*", "ssl")[port])
-                                                               or config.get("*", "ssl"));
-                                       -- add default entries for, or override ssl configuration
-                                       if ssl_config and service_info.ssl_config then
-                                               for key, value in pairs(service_info.ssl_config) do
-                                                       if not service_info.ssl_config_override and not ssl_config[key] then
-                                                               ssl_config[key] = value;
-                                                       elseif service_info.ssl_config_override then
-                                                               ssl_config[key] = value;
-                                                       end
-                                               end
-                                       end
-
-                                       ssl, err = certmanager.create_context(service_info.name.." port "..port, "server", ssl_config);
+                                       local global_ssl_config = config.get("*", "ssl") or {};
+                                       local prefix_ssl_config = config.get("*", config_prefix.."ssl") or global_ssl_config;
+                                       ssl, err = certmanager.create_context(service_info.name.." port "..port, "server",
+                                               service_info.ssl_config or {},
+                                               prefix_ssl_config[interface],
+                                               prefix_ssl_config[port],
+                                               prefix_ssl_config,
+                                               global_ssl_config[interface],
+                                               global_ssl_config[port]);
                                        if not ssl then
                                                log("error", "Error binding encrypted port for %s: %s", service_info.name, error_to_friendly_message(service_name, port_number, err) or "unknown error");
                                        end
@@ -152,6 +136,7 @@ function activate(service_name)
                                        if not handler then
                                                log("error", "Failed to open server port %d on %s, %s", port_number, interface, error_to_friendly_message(service_name, port_number, err));
                                        else
+                                               table.insert(hooked_ports, "["..interface.."]:"..port_number);
                                                log("debug", "Added listening service %s to [%s]:%d", service_name, interface, port_number);
                                                active_services:add(service_name, interface, port_number, {
                                                        server = handler;
@@ -162,7 +147,7 @@ function activate(service_name)
                        end
                end
        end
-       log("info", "Activated service '%s'", service_name);
+       log("info", "Activated service '%s' on %s", service_name, #hooked_ports == 0 and "no ports" or table.concat(hooked_ports, ", "));
        return true;
 end
 
@@ -186,7 +171,7 @@ function register_service(service_name, service_info)
                        log("error", "Failed to activate service '%s': %s", service_name, err or "unknown error");
                end
        end
-       
+
        fire_event("service-added", { name = service_name, service = service_info });
        return true;
 end