Merge with Maranda

diff --git a/core/portmanager.lua b/core/portmanager.lua
index 68c7617a14ecaa82a4f47a6f14f3517b279ba36f..1b3740cf91f444e1172c3ebd32a230d99f8245bd 100644 (file)
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -70,6 +70,16 @@ 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)
@@ -114,9 +124,24 @@ function activate(service_name)
                                local err;
                                -- Create SSL context for this service/port
                                if service_info.encryption == "ssl" then
-                                       local ssl_config = config.get("*", config_prefix.."ssl");
-                                       ssl, err = certmanager.create_context(service_info.name.." port "..port, "server", ssl_config and (ssl_config[port_number]
-                                               or (ssl_config.certificate and ssl_config)));
+                                       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);
                                        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

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index f14bb435950788dbba2b3114a91209164298a9e6..5e06e3f7a4203ec5c82971f638f4b81322c9e74a 100644 (file)
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -18,6 +18,7 @@ local hosts = hosts;
 local bare_sessions = bare_sessions;
 
 local datamanager = require "util.datamanager"
+local um_user_exists = require "core.usermanager".user_exists;
 local st = require "util.stanza";
 
 module "rostermanager"
@@ -105,6 +106,11 @@ function load_roster(username, host)
 end
 
 function save_roster(username, host, roster)
+       if not um_user_exists(username, host) then
+               log("debug", "not saving roster for %s@%s: the user doesn't exist", username, host);
+               return nil;
+       end
+
        log("debug", "save_roster: saving roster for %s@%s", username, host);
        if not roster then
                roster = hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster;

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 2fa874215003efa217a87f4422b36613344e0519..0689634ec704a0f08848b75d95fed076f852c96b 100644 (file)
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -139,6 +139,7 @@ module:provides("net", {
        listener = server.listener;
        default_port = 5281;
        encryption = "ssl";
+       ssl_config = { verify = "none" };
        multiplex = {
                pattern = "^[A-Z]";
        };

diff --git a/prosody b/prosody
index 875140deafedd65a9fb31d22932cf4bfbd9c12be..9a88eac0b227e65406608276a3f4e861fe78ef94 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -290,12 +290,12 @@ function load_secondary_libraries()
        --- Load and initialise core modules
        require "util.import"
        require "util.xmppstream"
-       require "core.rostermanager"
        require "core.stanza_router"
        require "core.hostmanager"
        require "core.portmanager"
        require "core.modulemanager"
        require "core.usermanager"
+       require "core.rostermanager"
        require "core.sessionmanager"
        package.loaded['core.componentmanager'] = setmetatable({},{__index=function()
                log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[ \t]*([^\n]*)"));