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

prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349)

Browse source
This commit is contained in:
Kim Alvefur 2016-02-25 15:35:44 +01:00
parent 39d21210c4
commit 50918d981e
1 changed files with 33 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
prosodyctl
View file

@ -698,8 +698,20 @@ function cert_commands.config(arg)
if use_existing(conf_filename) then if use_existing(conf_filename) then
return nil, conf_filename; return nil, conf_filename;
end end
local distinguished_name;
if arg[#arg]:find("^/") then
distinguished_name = table.remove(arg);
end
local conf = openssl.config.new(); local conf = openssl.config.new();
conf:from_prosody(hosts, config, arg); conf:from_prosody(hosts, config, arg);
if distinguished_name then
local dn = {};
for k, v in distinguished_name:gmatch("/([^=/]+)=([^/]+)") do
table.insert(dn, k);
dn[k] = v;
end
conf.distinguished_name = dn;
else
show_message("Please provide details to include in the certificate config file."); show_message("Please provide details to include in the certificate config file.");
show_message("Leave the field empty to use the default value or '.' to exclude the field.") show_message("Leave the field empty to use the default value or '.' to exclude the field.")
for i, k in ipairs(openssl._DN_order) do for i, k in ipairs(openssl._DN_order) do
@ -724,6 +736,7 @@ function cert_commands.config(arg)
conf.distinguished_name[k] = nv ~= "." and nv or nil; conf.distinguished_name[k] = nv ~= "." and nv or nil;
end end
end end
end
local conf_file, err = io.open(conf_filename, "w"); local conf_file, err = io.open(conf_filename, "w");
if not conf_file then if not conf_file then
show_warning("Could not open OpenSSL config file for writing"); show_warning("Could not open OpenSSL config file for writing");