loncom/configuration/SSL.pm - diff

Return to SSL.pm CVS log

Up to [LON-CAPA] / loncom / configuration

Diff for /loncom/configuration/SSL.pm between versions 1.9 and 1.10

version 1.9, 2019/04/12 02:41:47	version 1.10, 2019/07/11 18:12:06
Line 58 sub print_certstatus {	Line 58 sub print_certstatus {
'key' => 'Private Key',	'key' => 'Private Key',
'host' => 'Connections Certificate',	'host' => 'Connections Certificate',
'hostname' => 'Replication Certificate',	'hostname' => 'Replication Certificate',
	'crl' => 'Revocations List',
'ca' => 'LON-CAPA CA Certificate',	'ca' => 'LON-CAPA CA Certificate',
'expired' => 'Expired',	'expired' => 'Expired',
'future' => 'Future validity',	'future' => 'Future validity',
Line 67 sub print_certstatus {	Line 68 sub print_certstatus {
'wrongcn' => 'Incorrect CN',	'wrongcn' => 'Incorrect CN',
'mismatch' => 'Mismatched Issuer',	'mismatch' => 'Mismatched Issuer',
);	);
my @files = qw(key host hostname ca);	my @files = qw(key host hostname ca crl);
my @fields = qw(status cn start end alg size email);	my @fields = qw(status cn start end alg size email);
foreach my $server (sort(keys(%{$servers}))) {	foreach my $server (sort(keys(%{$servers}))) {
my $hostname = $servers->{$server};	my $hostname = $servers->{$server};
Line 103 sub print_certstatus {	Line 104 sub print_certstatus {
}	}
unless ($file eq 'key') {	unless ($file eq 'key') {
if ($hashref->{$file}->{'end'} ne '') {	if ($hashref->{$file}->{'end'} ne '') {
my $dt = DateTime::Format::x509->parse_datetime($hashref->{$file}->{'end'});	if ($file eq 'crl') {
if (ref($dt)) {	$endtime = $hashref->{$file}->{'end'};
$endtime = $dt->epoch;	} else {
if ($endtime < time) {	my $dt = DateTime::Format::x509->parse_datetime($hashref->{$file}->{'end'});
if ($target eq 'web') {	if (ref($dt)) {
$dateinvalid = $lt{'expired'};	$endtime = $dt->epoch;
} else {
$dateinvalid = 'expired';
}
}	}
}	}
	if (($endtime ne '') && ($endtime < time)) {
	$dateinvalid = 'expired';
	}
}	}
if ($hashref->{$file}->{'start'} ne '') {	if ($hashref->{$file}->{'start'} ne '') {
my $dt = DateTime::Format::x509->parse_datetime($hashref->{$file}->{'start'});	if ($file eq 'crl') {
if (ref($dt)) {	$starttime = $hashref->{$file}->{'start'};
$starttime = $dt->epoch;	} else {
if ($starttime > time) {	my $dt = DateTime::Format::x509->parse_datetime($hashref->{$file}->{'start'});
unless ($dateinvalid) {	if (ref($dt)) {
if ($target eq 'web') {	$starttime = $dt->epoch;
$dateinvalid = $lt{'future'};	}
} else {	}
$dateinvalid = 'future';	if ($starttime > time) {
}	unless ($dateinvalid) {
}	$dateinvalid = 'future';
}	}
}	}
}	}
Line 140 sub print_certstatus {	Line 141 sub print_certstatus {
$display = &Apache::lonhtmlcommon::confirm_success($display);	$display = &Apache::lonhtmlcommon::confirm_success($display);
}	}
}	}
	} elsif ($file eq 'crl') {
	if ($dateinvalid) {
	if (($target eq 'web') && (exists($lt{$dateinvalid}))) {
	$display = $lt{$dateinvalid};
	} else {
	$display = $dateinvalid;
	}
	} elsif ($target eq 'web') {
	if ($display ne '') {
	$display = &Apache::lonhtmlcommon::confirm_success($display);
	}
	my $details = $hashref->{$file}->{details};
	if ($details ne '') {
	$display .= ' '.$details;
	}
	}
} elsif ($file eq 'ca') {	} elsif ($file eq 'ca') {
if ($dateinvalid) {	if ($dateinvalid) {
$display = $dateinvalid;	if (($target eq 'web') && (exists($lt{$dateinvalid}))) {
	$display = $lt{$dateinvalid};
	} else {
	$display = $dateinvalid;
	}
} elsif ($target eq 'web') {	} elsif ($target eq 'web') {
$display = &Apache::lonhtmlcommon::confirm_success($display);	if ($display ne '') {
	$display = &Apache::lonhtmlcommon::confirm_success($display);
	}
}	}
} elsif ($display =~ /^ok/) {	} elsif ($display =~ /^ok/) {
if ($dateinvalid) {	if ($dateinvalid) {
$display = $dateinvalid;	if (($target eq 'web') && (exists($lt{$dateinvalid}))) {
	$display = $lt{$dateinvalid};
	} else {
	$display = $dateinvalid;
	}
} elsif ($target eq 'web') {	} elsif ($target eq 'web') {
$display = &Apache::lonhtmlcommon::confirm_success($display);	$display = &Apache::lonhtmlcommon::confirm_success($display);
}	}
} elsif (($display eq 'nokey') \|\| ($display eq 'otherkey') \|\|	} elsif (($display eq 'nokey') \|\| ($display eq 'otherkey') \|\|
($display eq 'revoked') \|\| ($display eq 'expired') \|\|	($display eq 'revoked') \|\| ($display eq 'expired') \|\|
($display eq 'wrongcn') \|\| ($display eq 'mismatch')) {	($display eq 'wrongcn') \|\| ($display eq 'mismatch') \|\|
if ($target eq 'web') {	($display eq '')) {
	if (($target eq 'web') && ($display ne '') && (exists($lt{$display}))) {
$display = $lt{$display};	$display = $lt{$display};
}	}
if (ref($hashref->{$file.'-csr'}) eq 'HASH') {	if (ref($hashref->{$file.'-csr'}) eq 'HASH') {
if ($hashref->{$file.'-csr'}->{$item} eq 'ok') {	if ($hashref->{$file.'-csr'}->{$item} eq 'ok') {
if ($target eq 'web') {	if ($target eq 'web') {
$display .= '<br />'.&mt('(New request awaiting signature)');	$display .= (($display ne '')? '<br />':'').
	&mt('(New request awaiting signature)');
}	}
$csr{$file} = 1;	$csr{$file} = 1;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.9
changed lines
	Added in v.1.10