Merge 0.9->0.10

diff --combined core/certmanager.lua
index d6784a968f68d16c2f7f840576df0fcfc7b63913,c88f7a270fb77c964a39f5fcc3fd763704d67346..9dfb8f3a3297d365f775c7ae43e64ef1c158d2bf
--- 1/core/certmanager.lua
--- 2/core/certmanager.lua
+++ b/core/certmanager.lua
@@@ -1,7 -1,7 +1,7 @@@
  -- Prosody IM
  -- Copyright (C) 2008-2010 Matthew Wild
  -- Copyright (C) 2008-2010 Waqas Hussain
- -- 
+ --
  -- This project is MIT/X11 licensed. Please see the
  -- COPYING file in the source package for more information.
  --
@@@ -12,6 -12,7 +12,7 @@@ local ssl = ssl
  local ssl_newcontext = ssl and ssl.newcontext;
  
  local tostring = tostring;
+ local pairs = pairs;
  local type = type;
  local io_open = io.open;
  
@@@ -30,68 -31,82 +31,82 @@@ en
  module "certmanager"
  
  -- Global SSL options if not overridden per-host
- local default_ssl_config = configmanager.get("*", "ssl");
- local default_capath = "/etc/ssl/certs";
- local default_verify = (ssl and ssl.x509 and { "peer", "client_once", }) or "none";
- local default_options = { "no_sslv2", "cipher_server_preference", luasec_has_noticket and "no_ticket" or nil };
- local default_verifyext = { "lsec_continue", "lsec_ignore_purpose" };
+ local global_ssl_config = configmanager.get("*", "ssl");
+ 
+ local core_defaults = {
+       capath = "/etc/ssl/certs";
+       protocol = "sslv23";
+       verify = (ssl and ssl.x509 and { "peer", "client_once", }) or "none";
+       options = { "no_sslv2", "no_sslv3", "cipher_server_preference", luasec_has_noticket and "no_ticket" or nil };
+       verifyext = { "lsec_continue", "lsec_ignore_purpose" };
+       curve = "secp384r1";
 -      ciphers = "HIGH+kEDH:HIGH+kEECDH:HIGH+kRSA:!DSS:!3DES:!aNULL";
++      ciphers = "HIGH+kEDH:HIGH+kEECDH:HIGH:!PSK:!SRP:!3DES:!aNULL";
+ }
+ local path_options = { -- These we pass through resolve_path()
+       key = true, certificate = true, cafile = true, capath = true, dhparam = true
+ }
  
  if ssl and not luasec_has_verifyext and ssl.x509 then
        -- COMPAT mw/luasec-hg
-       for i=1,#default_verifyext do -- Remove lsec_ prefix
-               default_verify[#default_verify+1] = default_verifyext[i]:sub(6);
+       for i=1,#core_defaults.verifyext do -- Remove lsec_ prefix
+               core_defaults.verify[#core_defaults.verify+1] = core_defaults.verifyext[i]:sub(6);
        end
  end
- if luasec_has_no_compression and configmanager.get("*", "ssl_compression") ~= true then
-       default_options[#default_options+1] = "no_compression";
- end
  
  if luasec_has_no_compression then -- Has no_compression? Then it has these too...
-       default_options[#default_options+1] = "single_dh_use";
-       default_options[#default_options+1] = "single_ecdh_use";
+       core_defaults.options[#core_defaults.options+1] = "single_dh_use";
+       core_defaults.options[#core_defaults.options+1] = "single_ecdh_use";
+       if configmanager.get("*", "ssl_compression") ~= true then
+               core_defaults.options[#core_defaults.options+1] = "no_compression";
+       end
  end
  
  function create_context(host, mode, user_ssl_config)
-       user_ssl_config = user_ssl_config or default_ssl_config;
+       user_ssl_config = user_ssl_config or {}
+       user_ssl_config.mode = mode;
  
        if not ssl then return nil, "LuaSec (required for encryption) was not found"; end
-       if not user_ssl_config then return nil, "No SSL/TLS configuration present for "..host; end
-       
-       local ssl_config = {
-               mode = mode;
-               protocol = user_ssl_config.protocol or "sslv23";
-               key = resolve_path(config_path, user_ssl_config.key);
-               password = user_ssl_config.password or function() log("error", "Encrypted certificate for %s requires 'ssl' 'password' to be set in config", host); end;
-               certificate = resolve_path(config_path, user_ssl_config.certificate);
-               capath = resolve_path(config_path, user_ssl_config.capath or default_capath);
-               cafile = resolve_path(config_path, user_ssl_config.cafile);
-               verify = user_ssl_config.verify or default_verify;
-               verifyext = user_ssl_config.verifyext or default_verifyext;
-               options = user_ssl_config.options or default_options;
-               depth = user_ssl_config.depth;
-               curve = user_ssl_config.curve or "secp384r1";
-               ciphers = user_ssl_config.ciphers or "HIGH+kEDH:HIGH+kEECDH:HIGH:!PSK:!SRP:!3DES:!aNULL";
-               dhparam = user_ssl_config.dhparam;
-       };
+ 
+       if global_ssl_config then
+               for option,default_value in pairs(global_ssl_config) do
+                       if not user_ssl_config[option] then
+                               user_ssl_config[option] = default_value;
+                       end
+               end
+       end
+       for option,default_value in pairs(core_defaults) do
+               if not user_ssl_config[option] then
+                       user_ssl_config[option] = default_value;
+               end
+       end
+       user_ssl_config.password = user_ssl_config.password or function() log("error", "Encrypted certificate for %s requires 'ssl' 'password' to be set in config", host); end;
+       for option in pairs(path_options) do
+               if type(user_ssl_config[option]) == "string" then
+                       user_ssl_config[option] = resolve_path(config_path, user_ssl_config[option]);
+               end
+       end
+ 
+       if not user_ssl_config.key then return nil, "No key present in SSL/TLS configuration for "..host; end
+       if not user_ssl_config.certificate then return nil, "No certificate present in SSL/TLS configuration for "..host; end
  
        -- LuaSec expects dhparam to be a callback that takes two arguments.
        -- We ignore those because it is mostly used for having a separate
        -- set of params for EXPORT ciphers, which we don't have by default.
-       if type(ssl_config.dhparam) == "string" then
-               local f, err = io_open(resolve_path(config_path, ssl_config.dhparam));
+       if type(user_ssl_config.dhparam) == "string" then
+               local f, err = io_open(user_ssl_config.dhparam);
                if not f then return nil, "Could not open DH parameters: "..err end
                local dhparam = f:read("*a");
                f:close();
-               ssl_config.dhparam = function() return dhparam; end
+               user_ssl_config.dhparam = function() return dhparam; end
        end
  
-       local ctx, err = ssl_newcontext(ssl_config);
+       local ctx, err = ssl_newcontext(user_ssl_config);
  
-       -- COMPAT: LuaSec 0.4.1 ignores the cipher list from the config, so we have to take
-       -- care of it ourselves...
-       if ctx and ssl_config.ciphers then
+       -- COMPAT Older LuaSec ignores the cipher list from the config, so we have to take care
+       -- of it ourselves (W/A for #x)
+       if ctx and user_ssl_config.ciphers then
                local success;
-               success, err = ssl.context.setcipher(ctx, ssl_config.ciphers);
+               success, err = ssl.context.setcipher(ctx, user_ssl_config.ciphers);
                if not success then ctx = nil; end
        end
  
@@@ -100,9 -115,9 +115,9 @@@
                local file = err:match("^error loading (.-) %(");
                if file then
                        if file == "private key" then
-                               file = ssl_config.key or "your private key";
+                               file = user_ssl_config.key or "your private key";
                        elseif file == "certificate" then
-                               file = ssl_config.certificate or "your certificate file";
+                               file = user_ssl_config.certificate or "your certificate file";
                        end
                        local reason = err:match("%((.+)%)$") or "some reason";
                        if reason == "Permission denied" then
@@@ -125,7 -140,7 +140,7 @@@
  end
  
  function reload_ssl_config()
-       default_ssl_config = configmanager.get("*", "ssl");
+       global_ssl_config = configmanager.get("*", "ssl");
  end
  
  prosody.events.add_handler("config-reloaded", reload_ssl_config);