michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Only download fixed CA certs if none was found in the original response

Browse Source
This commit is contained in:
Jamie Cameron
2021-10-09 11:21:10 -07:00
parent 54423f9925
commit 0bef41d229
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
webmin/letsencrypt-lib.pl
View File

@@ -332,7 +332,6 @@ else {
# Check if the returned cert contains a CA cert as well
my $chain = &transname();
my @certs = &cert_file_split($cert);
my %donecert;
if (@certs > 1) {
# Yes .. keep the first as the cert, and use the others as
# the chain
@@ -341,7 +340,6 @@ else {
&open_tempfile($fh, ">$chain");
foreach my $c (@certs) {
&print_tempfile($fh, $c);
$donecert{$c}++;
}
&close_tempfile($fh);
my $fh2 = "CERT";
@@ -349,22 +347,24 @@ else {
&print_tempfile($fh2, $orig);
&close_tempfile($fh2);
}
# Download the latest chained cert files
foreach my $url (@$letsencrypt_chain_urls) {
my $cout;
my ($host, $port, $page, $ssl) = &parse_http_url($url);
my $err;
&http_download($host, $port, $page, \$cout, \$err, undef, $ssl);
if ($err) {
&cleanup_wellknown($wellknown_new, $challenge_new);
return (0, &text('letsencrypt_echain', $err));
}
if ($cout !~ /\S/ && !-r $chain) {
&cleanup_wellknown($wellknown_new, $challenge_new);
return (0, &text('letsencrypt_echain2', $url));
}
if (!$donecert{$cout}++) {
else {
# Download the fixed list chained cert files
foreach my $url (@$letsencrypt_chain_urls) {
my $cout;
my ($host, $port, $page, $ssl) = &parse_http_url($url);
my $err;
&http_download($host, $port, $page, \$cout, \$err,
undef, $ssl);
if ($err) {
&cleanup_wellknown($wellknown_new,
$challenge_new);
return (0, &text('letsencrypt_echain', $err));
}
if ($cout !~ /\S/ && !-r $chain) {
&cleanup_wellknown($wellknown_new,
$challenge_new);
return (0, &text('letsencrypt_echain2', $url));
}
my $fh = "CHAIN";
&open_tempfile($fh, ">>$chain");
&print_tempfile($fh, $cout);