michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added PKCS12 download link

Browse Source
This commit is contained in:
Jamie Cameron
2007-05-18 19:12:10 +00:00
parent 59581a2d9e
commit 657eb01736
5 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webmin/CHANGELOG
View File

@@ -59,4 +59,4 @@ Converted many pages to use new ui-lib.pl functions, and broke down long forms u
When Webmin's detected OS is automatically updated, Usermin's will be too (if it is an equivalent version).
---- Changes since 1.340 ----
Added an option to the Proxy Servers form to fallback to a direct connection if the proxy is down.
Added a tab showing details of the current cert, with a link to download in PEM format.
Added a tab showing details of the current cert, with a link to download in PEM or PKCS12 format.

16
webmin/download_cert.cgi
View File

@@ -1,13 +1,23 @@
#!/usr/local/bin/perl
# Output the certificate in PEM format
# Output the certificate in PEM or PKCS12 format
require './webmin-lib.pl';
&ReadParse();
&get_miniserv_config(\%miniserv);
$data = &cert_pem_data($miniserv{'certfile'} || $miniserv{'keyfile'});
if ($ENV{'PATH_INFO'} =~ /\.p12$/) {
# PKCS12 format
$data = &cert_pkcs12_data($miniserv{'keyfile'}, $miniserv{'certfile'});
$type = "application/x-pkcs12";
}
else {
# PEM format
$data = &cert_pem_data($miniserv{'certfile'} || $miniserv{'keyfile'});
$type = "text/plain";
}
if ($data) {
print "Content-type: text/plain\n\n";
print "Content-type: $type\n\n";
print $data;
}
else {

8
webmin/edit_ssl.cgi
View File

@@ -72,9 +72,13 @@ foreach $i ('cn', 'o', 'email', 'issuer_cn', 'issuer_o', 'issuer_email',
print &ui_table_row($text{'ca_'.$i}, $info->{$i});
}
}
print &ui_table_row($text{'ssl_download'},
@clinks = (
"<a href='download_cert.cgi/cert.pem'>".
"$text{'ssl_pem'}</a>");
"$text{'ssl_pem'}</a>",
"<a href='download_cert.cgi/cert.p12'>".
"$text{'ssl_pkcs12'}</a>"
);
print &ui_table_row($text{'ssl_download'}, &ui_links_row(\@clinks));
print &ui_table_end();
print &ui_tabs_end_tab();

3
webmin/lang/en
View File

@@ -342,7 +342,8 @@ ssl_cheader=Details of current certificate
ssl_typeself=Self-signed
ssl_typereal=Signed by CA
ssl_download=Download certificate
ssl_pem=PEM format..
ssl_pem=PEM format
ssl_pkcs12=PKCS12 format
ssl_current=This section shows the details of the current Webmin SSL certificate, and allows it to be downloaded so that it can be accepted by your browser.
ssl_edownload=Failed to extract PEM data from certificate

23
webmin/webmin-lib.pl
View File

@@ -1187,4 +1187,27 @@ if ($data =~ /(-----BEGIN\s+CERTIFICATE-----\n([A-Za-z0-9\+\/=\n\r]+)-----END\s+
return undef;
}
# cert_pkcs12_data(keyfile, [certfile])
# Returns a cert in PKCS12 format
sub cert_pkcs12_data
{
local ($keyfile, $certfile) = @_;
if ($certfile) {
open(OUT, "openssl pkcs12 -in ".quotemeta($certfile).
" -inkey ".quotemeta($keyfile).
" -export -passout pass: -nokeys |");
}
else {
open(OUT, "openssl pkcs12 -in ".quotemeta($keyfile).
" -export -passout pass: -nokeys |");
}
while(<OUT>) {
$data .= $_;
}
close(OUT);
return $data;
}
1;