Merge 13.0->trunk

2 files changed, 55 insertions, 1 deletions

diff --git a/core/certmanager.lua b/core/certmanager.lua
index 3acddf73..c08bcc84 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -116,11 +116,15 @@ local function index_certs(dir, files_by_name, depth_limit)
 					else
 						log("debug", "Skipping expired certificate: %s", full);
 					end
+				else
+					log("debug", "Skipping non-certificate (based on contents): %s", full);
 				end
 				f:close();
 			elseif err then
-				log("debug", "Failed to open file for indexing: %s", full);
+				log("debug", "Skipping file due to error:  %s", err);
 			end
+		else
+			log("debug", "Skipping non-certificate (based on filename): %s", full);
 		end
 	end
 	log("debug", "Certificate index in %s: %q", dir, files_by_name);
diff --git a/plugins/mod_admin_shell.lua b/plugins/mod_admin_shell.lua
index c2b921b4..56bc3cc9 100644
--- a/plugins/mod_admin_shell.lua
+++ b/plugins/mod_admin_shell.lua
@@ -2401,6 +2401,56 @@ function def_env.debug:async(runner_id)
 	return true, ("%d runners pending"):format(c);
 end
 
+describe_command [[debug:cert_index([path]) - Show Prosody's view of a directory of certs]]
+function def_env.debug:cert_index(path)
+	local print = self.session.print;
+	local cm = require "core.certmanager";
+
+	path = path or module:get_option("certificates", "certs");
+
+	local sink = logger.add_simple_sink(function (source, level, message)
+		if source == "certmanager" then
+			self.session.print(source, level, message);
+		end
+	end);
+
+	local index = {};
+	cm.index_certs(path, index)
+
+	if not logger.remove_sink(sink) then
+		module:log("warn", "Unable to remove log sink");
+	end
+
+	local c, max_domain = 0, 8;
+	for domain in pairs(index) do
+		if #domain > max_domain then
+			max_domain = #domain;
+		end
+	end
+
+	print("");
+
+	local row = format_table({
+		{ title = "Domain", width = max_domain };
+		{ title = "Certificate", width = "100%" };
+		{ title = "Service", width = 5 };
+	}, self.session.width);
+	print(row());
+
+	for domain, certs in it.sorted_pairs(index) do
+		for cert_file, services in it.sorted_pairs(certs) do
+			for service in it.sorted_pairs(services) do
+				c = c + 1;
+				print(row({ domain, cert_file, service }));
+			end
+		end
+	end
+
+	print("");
+
+	return true, ("Showing %d certificates in %s"):format(c, path);
+end
+
 def_env.stats = new_section("Commands to show internal statistics");
 
 local short_units = {