mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

core.certmanager: Catch error from lfs

Browse source 
lfs.dir() throws a hard error if there's a problem, e.g. no such
directory or permission issues. This also gets called early enough that
the main loop error protection hasn't been brought up yet, causing a
proper crash.
This commit is contained in:
Kim Alvefur 2021-05-07 16:47:58 +02:00
parent 2c902f163f
commit 37ad3b8fb2
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/certmanager.lua
View file

@ -35,6 +35,7 @@ local io_open = io.open;
local select = select;
local now = os.time;
local next = next;
local pcall = pcall;
local prosody = prosody;
local pathutil = require"util.paths";
@ -112,7 +113,16 @@ local function index_certs(dir, files_by_name, depth_limit)
depth_limit = depth_limit or 3;
if depth_limit <= 0 then return files_by_name; end
for file in lfs.dir(dir) do
local ok, iter, v, i = pcall(lfs.dir, dir);
if not ok then
log("error", "Error indexing certificate directory %s: %s", dir, iter);
-- Return an empty index, otherwise this just triggers a nil indexing
-- error, plus this function would get called again.
-- Reloading the config after correcting the problem calls this again so
-- that's what should be done.
return {}, iter;
end
for file in iter, v, i do
local full = pathutil.join(dir, file);
if lfs.attributes(full, "mode") == "directory" then
if file:sub(1,1) ~= "." then