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

Merge 13.0->trunk

Browse source
This commit is contained in:
Matthew Wild 2025-02-24 17:49:55 +00:00
commit 7bf3a56ec6
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/certmanager.lua
View file

@ -91,7 +91,7 @@ local function index_certs(dir, files_by_name, depth_limit)
index_certs(full, files_by_name, depth_limit-1); index_certs(full, files_by_name, depth_limit-1);
end end
elseif file:find("%.crt$") or file:find("fullchain") then -- This should catch most fullchain files elseif file:find("%.crt$") or file:find("fullchain") then -- This should catch most fullchain files
local f = io_open(full); local f, err = io_open(full);
if f then if f then
-- TODO look for chained certificates -- TODO look for chained certificates
local firstline = f:read(); local firstline = f:read();
@ -113,13 +113,17 @@ local function index_certs(dir, files_by_name, depth_limit)
files_by_name[name] = { [full] = services; }; files_by_name[name] = { [full] = services; };
end end
end end
else
log("debug", "Skipping expired certificate: %s", full);
end end
end end
f:close(); f:close();
elseif err then
log("debug", "Failed to open file for indexing: %s", full);
end end
end end
end end
log("debug", "Certificate index: %q", files_by_name); log("debug", "Certificate index in %s: %q", dir, files_by_name);
-- | hostname | filename | service | -- | hostname | filename | service |
return files_by_name; return files_by_name;
end end