mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +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

53
prosodyctl
View file

@ -698,30 +698,43 @@ 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);
show_message("Please provide details to include in the certificate config file."); if distinguished_name then
show_message("Leave the field empty to use the default value or '.' to exclude the field.") local dn = {};
for i, k in ipairs(openssl._DN_order) do for k, v in distinguished_name:gmatch("/([^=/]+)=([^/]+)") do
local v = conf.distinguished_name[k]; table.insert(dn, k);
if v then dn[k] = v;
local nv; end
if k == "commonName" then conf.distinguished_name = dn;
v = arg[1] else
elseif k == "emailAddress" then show_message("Please provide details to include in the certificate config file.");
v = "xmpp@" .. arg[1]; show_message("Leave the field empty to use the default value or '.' to exclude the field.")
elseif k == "countryName" then for i, k in ipairs(openssl._DN_order) do
local tld = arg[1]:match"%.([a-z]+)$"; local v = conf.distinguished_name[k];
if tld and #tld == 2 and tld ~= "uk" then if v then
v = tld:upper(); local nv;
if k == "commonName" then
v = arg[1]
elseif k == "emailAddress" then
v = "xmpp@" .. arg[1];
elseif k == "countryName" then
local tld = arg[1]:match"%.([a-z]+)$";
if tld and #tld == 2 and tld ~= "uk" then
v = tld:upper();
end
end end
nv = show_prompt(("%s (%s):"):format(k, nv or v));
nv = (not nv or nv == "") and v or nv;
if nv:find"[\192-\252][\128-\191]+" then
conf.req.string_mask = "utf8only"
end
conf.distinguished_name[k] = nv ~= "." and nv or nil;
end end
nv = show_prompt(("%s (%s):"):format(k, nv or v));
nv = (not nv or nv == "") and v or nv;
if nv:find"[\192-\252][\128-\191]+" then
conf.req.string_mask = "utf8only"
end
conf.distinguished_name[k] = nv ~= "." and nv or nil;
end end
end end
local conf_file, err = io.open(conf_filename, "w"); local conf_file, err = io.open(conf_filename, "w");