Merge 0.6->0.7

[prosody.git] / core / certmanager.lua

diff --git a/core/certmanager.lua b/core/certmanager.lua
index dfda3fd8d30a0c2bd96916baece16a21c653f7a0..3dd06585fa667e3cd2d96f8dc17eb43938861d30 100644 (file)
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -1,8 +1,9 @@
 local configmanager = require "core.configmanager";
+local log = require "util.logger".init("certmanager");
 local ssl = ssl;
-local ssl_newcontext = ssl.newcontext;
+local ssl_newcontext = ssl and ssl.newcontext;
 
-local setmetatable = setmetatable;
+local setmetatable, tostring = setmetatable, tostring;
 
 local prosody = prosody;
 
@@ -18,16 +19,45 @@ local default_ssl_ctx_in_mt = { __index = default_ssl_ctx_in };
 -- Global SSL options if not overridden per-host
 local default_ssl_config = configmanager.get("*", "core", "ssl");
 
-function get_context(host, mode, config)
+function create_context(host, mode, config)
        local ssl_config = config and config.core.ssl or default_ssl_config;
        if ssl and ssl_config then
-               return ssl_newcontext(setmetatable(ssl_config, mode == "client" and default_ssl_ctx_mt or default_ssl_ctx_in_mt));
+               local ctx, err = ssl_newcontext(setmetatable(ssl_config, mode == "client" and default_ssl_ctx_mt or default_ssl_ctx_in_mt));
+               if not ctx then
+                       err = err or "invalid ssl config"
+                       local file = err:match("^error loading (.-) %(");
+                       if file then
+                               if file == "private key" then
+                                       file = ssl_config.key or "your private key";
+                               elseif file == "certificate" then
+                                       file = ssl_config.certificate or "your certificate file";
+                               end
+                               local reason = err:match("%((.+)%)$") or "some reason";
+                               if reason == "Permission denied" then
+                                       reason = "Check that the permissions allow Prosody to read this file.";
+                               elseif reason == "No such file or directory" then
+                                       reason = "Check that the path is correct, and the file exists.";
+                               elseif reason == "system lib" then
+                                       reason = "Previous error (see logs), or other system error.";
+                               elseif reason == "(null)" or not reason then
+                                       reason = "Check that the file exists and the permissions are correct";
+                               else
+                                       reason = "Reason: "..tostring(reason):lower();
+                               end
+                               log("error", "SSL/TLS: Failed to load %s: %s", file, reason);
+                       else
+                               log("error", "SSL/TLS: Error initialising for host %s: %s", host, err );
+                       end
+               end
+               return ctx, err;
+       elseif not ssl then
+               return nil, "LuaSec (required for encryption) was not found";
        end
-       return nil;
+       return nil, "No SSL/TLS configuration present for "..host;
 end
 
 function reload_ssl_config()
-       default_ssl_config = config.get("*", "core", "ssl");
+       default_ssl_config = configmanager.get("*", "core", "ssl");
 end
 
 prosody.events.add_handler("config-reloaded", reload_ssl_config);