diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-02-13 16:12:53 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-02-13 16:12:53 +0000 |
| commit | bb996f5317b1df04976ee5927826ce20ced9a4f0 (patch) | |
| tree | 9c366d3d68222aa25542ed0092ec1631cef977e9 | |
| parent | 9d36af9159bff39bf5d76f2347914d0fd7479cb2 (diff) | |
| parent | f6063e31eba234344afe0c2c2d81578ce726ff3c (diff) | |
| download | prosody-bb996f5317b1df04976ee5927826ce20ced9a4f0.tar.gz prosody-bb996f5317b1df04976ee5927826ce20ced9a4f0.zip | |
Merge with 0.7
| -rw-r--r-- | core/certmanager.lua | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index 64644be9..5794ba6e 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -1,4 +1,5 @@ local configmanager = require "core.configmanager"; +local log = require "util.logger".init("certmanager"); local ssl = ssl; local ssl_newcontext = ssl and ssl.newcontext; @@ -21,7 +22,33 @@ local default_ssl_config = configmanager.get("*", "core", "ssl"); 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."; + else + reason = "Reason: "..tostring(reason or "unknown"):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 + ssl = false + end + return ctx, err; end return nil; end |