michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-09-27 16:00:38 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Also support passing in the key ID and hmac for non-standard servers

Browse Source
This commit is contained in:
Jamie Cameron
2023-09-05 20:28:21 -07:00
parent 6f84ca1c9d
commit a9097cbb42
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
webmin/letsencrypt-lib.pl
View File

@@ -58,14 +58,14 @@ return &software::missing_install_link(
# request_letsencrypt_cert(domain|&domains, webroot, [email], [keysize],
# [request-mode], [use-staging], [account-email],
# [reuse-key], [server-url])
# [reuse-key], [server-url, server-key, server-hmac])
# Attempt to request a cert using a generated key with the Let's Encrypt client
# command, and write it to the given path. Returns a status flag, and either
# an error message or the paths to cert, key and chain files.
sub request_letsencrypt_cert
{
my ($dom, $webroot, $email, $size, $mode, $staging, $account_email,
$key_type, $reuse_key, $server) = @_;
$key_type, $reuse_key, $server, $server_key, $server_hmac) = @_;
my @doms = ref($dom) ? @$dom : ($dom);
$email ||= "root\@$doms[0]";
$mode ||= "web";
@@ -80,6 +80,11 @@ foreach my $d (@doms) {
}
}
if ($server && !$letsencrypt_cmd) {
return (0, "A non-standard server can only be used when the native ".
"Let's Encrypt client is installed");
}
if ($mode eq "web") {
# Create a challenges directory under the web root
if ($wildcard) {
@@ -186,6 +191,13 @@ if ($letsencrypt_cmd) {
}
if ($server) {
$server_flags = " --server ".quotemeta($server);
if ($server_key) {
$server_flags .= " --eab-kid ".quotemeta($server_key);
}
if ($server_hmac) {
$server_flags .= " --eab-hmac-key ".
quotemeta($server_hmac);
}
}
$dir =~ s/\/[^\/]+$//;
$size ||= 2048;