Software / code / prosody
Changeset
10709:fcf7f50ccdd0 0.11
core.certmanager: Look for privkey.pem to go with fullchain.pem (fix #1526)
This makes
`prosodyctl cert import example.com /path/to/example.com/fullchain.pem`
work. This was never intended to, yet users commonly tried this and got
problems.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 10 Apr 2020 16:11:09 +0200 |
| parents | 10707:c4b49939b471 |
| children | 10710:549e408bab14 10720:6e46fefe956c |
| files | core/certmanager.lua |
| diffstat | 1 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/core/certmanager.lua Fri Apr 03 22:35:47 2020 +0200 +++ b/core/certmanager.lua Fri Apr 10 16:11:09 2020 +0200 @@ -73,13 +73,15 @@ local key_path = certs .. key_try[i]:format(name); if stat(crt_path, "mode") == "file" then - if key_path:sub(-4) == ".crt" then - key_path = key_path:sub(1, -4) .. "key"; - if stat(key_path, "mode") == "file" then - log("debug", "Selecting certificate %s with key %s for %s", crt_path, key_path, name); - return { certificate = crt_path, key = key_path }; + if crt_path == key_path then + if key_path:sub(-4) == ".crt" then + key_path = key_path:sub(1, -4) .. "key"; + elseif key_path:sub(-13) == "fullchain.pem" then + key_path = key_path:sub(1, -14) .. "privkey.pem"; end - elseif stat(key_path, "mode") == "file" then + end + + if stat(key_path, "mode") == "file" then log("debug", "Selecting certificate %s with key %s for %s", crt_path, key_path, name); return { certificate = crt_path, key = key_path }; end
