prosody
12eaa2fdd75b
util/prosodyctl/cert.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

util/prosodyctl/cert.lua @ 12199:12eaa2fdd75b

util.prosodyctl.cert: Pass variables via formatting instead of concatenation Prevents potential weirdness in case there's any %s or such in a host, file or directory name, since show_warning() is printf().
author Kim Alvefur <zash@zash.se>
date Wed, 19 Jan 2022 10:26:43 +0100
parent 12169:866d06644956
child 12200:2bb4ee5f42be
line wrap: on
line diff
--- a/util/prosodyctl/cert.lua	Tue Jan 18 15:43:17 2022 +0100
+++ b/util/prosodyctl/cert.lua	Wed Jan 19 10:26:43 2022 +0100
@@ -80,7 +80,7 @@
 		local conf_file, err = io.open(conf_filename, "w");
 		if not conf_file then
 			pctl.show_warning("Could not open OpenSSL config file for writing");
-			pctl.show_warning(err);
+			pctl.show_warning("%s", err);
 			os.exit(1);
 		end
 		conf_file:write(conf:serialize());
@@ -233,7 +233,7 @@
 			imported[paths.certificate] = true;
 		else
 			-- TODO Say where we looked
-			pctl.show_warning("No certificate for host "..host.." found :(");
+			pctl.show_warning("No certificate for host %s found :(", host);
 		end
 		-- TODO Additional checks
 		-- Certificate names matches the hostname
@@ -257,18 +257,18 @@
 		lfs = require "lfs";
 		local cert_dir_attrs = lfs.attributes(cert_basedir);
 		if not cert_dir_attrs then
-			pctl.show_warning("The directory "..cert_basedir.." does not exist");
+			pctl.show_warning("The directory %s does not exist", cert_basedir);
 			return 1; -- TODO Should we create it?
 		end
 		local uid = pposix.getuid();
 		if uid ~= 0 and uid ~= cert_dir_attrs.uid then
-			pctl.show_warning("The directory "..cert_basedir.." is not owned by the current user, won't be able to write files to it");
+			pctl.show_warning("The directory %s is not owned by the current user, won't be able to write files to it", cert_basedir);
 			return 1;
 		elseif not cert_dir_attrs.permissions then -- COMPAT with LuaFilesystem < 1.6.2 (hey CentOS!)
 			pctl.show_message("Unable to check permissions on %s (LuaFilesystem 1.6.2+ required)", cert_basedir);
 			pctl.show_message("Please confirm that Prosody (and only Prosody) can write to this directory)");
 		elseif cert_dir_attrs.permissions:match("^%.w..%-..%-.$") then
-			pctl.show_warning("The directory "..cert_basedir.." not only writable by its owner");
+			pctl.show_warning("The directory %s not only writable by its owner", cert_basedir);
 			return 1;
 		end
 		local subcmd = table.remove(arg, 1);