version 1.13, 2015/11/07 18:41:11
|
version 1.21, 2018/12/10 17:34:22
|
Line 37 use strict;
|
Line 37 use strict;
|
|
|
use IO::Socket::INET; |
use IO::Socket::INET; |
use IO::Socket::SSL; |
use IO::Socket::SSL; |
|
use Net::SSLeay; |
|
|
use Fcntl; |
use Fcntl; |
use POSIX; |
use POSIX; |
Line 111 sub SetFdBlocking {
|
Line 112 sub SetFdBlocking {
|
# Socket IO::Socket::INET Original ordinary socket. |
# Socket IO::Socket::INET Original ordinary socket. |
# CACert string Full path name to the certificate |
# CACert string Full path name to the certificate |
# authority certificate file. |
# authority certificate file. |
# MyCert string Full path name to the certificate |
# MyCert string Full path name to the certificate |
# issued to this host. |
# issued to this host. |
# KeyFile string Full pathname to the host's private |
# KeyFile string Full pathname to the host's private |
# key file for the certificate. |
# key file for the certificate. |
|
# peer string lonid of remote LON-CAPA server |
|
# peerdef string default lonHostID of remote server |
|
# CRLFile Full path name to the certificate |
|
# revocation list file for the cluster |
|
# to which server belongs (optional) |
|
|
# Returns |
# Returns |
# - Reference to an SSL socket on success |
# - Reference to an SSL socket on success |
# - undef on failure. Reason for failure can be interrogated from |
# - undef on failure. Reason for failure can be interrogated from |
Line 126 sub PromoteClientSocket {
|
Line 133 sub PromoteClientSocket {
|
my ($PlaintextSocket, |
my ($PlaintextSocket, |
$CACert, |
$CACert, |
$MyCert, |
$MyCert, |
$KeyFile) = @_; |
$KeyFile, |
|
$peer, |
|
$peerdef, |
Debug("Client promotion using key: $KeyFile, Cert: $MyCert, CA: $CACert\n"); |
$CRLFile) = @_; |
|
|
|
Debug("Client promotion using key: $KeyFile, Cert: $MyCert, CA: $CACert, CRL: $CRLFile, Remote Host: $peer\n"); |
|
|
# To create the ssl socket we need to duplicate the existing |
# To create the ssl socket we need to duplicate the existing |
# socket. Otherwise closing the ssl socket will close the plaintext socket |
# socket. Otherwise closing the ssl socket will close the plaintext socket |
Line 141 sub PromoteClientSocket {
|
Line 150 sub PromoteClientSocket {
|
my $dupfno = fcntl($PlaintextSocket, F_DUPFD, 0); |
my $dupfno = fcntl($PlaintextSocket, F_DUPFD, 0); |
Debug("Client promotion got dup = $dupfno\n"); |
Debug("Client promotion got dup = $dupfno\n"); |
|
|
|
# Starting with IO::Socket::SSL rev. 1.79, carp warns that a verify |
my $client = IO::Socket::SSL->new_from_fd($dupfno, |
# mode of SSL_VERIFY_NONE should be explicitly set for client, if |
SSL_use_cert => 1, |
# verification is not to be used, and SSL_verify_mode is not set. |
SSL_key_file => $KeyFile, |
# Starting with rev. 1.95, the default became SSL_VERIFY_PEER which |
SSL_cert_file => $MyCert, |
# prevents an SSL connection to lond unless SSL_verifycn_name is set |
SSL_ca_file => $CACert); |
# to the lonHostID of the remote host, (and the remote certificate has |
|
# the remote lonHostID as CN, and has been signed by the LON-CAPA CA. |
|
# Set SSL_verify_mode to Net::SSLeay::VERIFY_PEER() instead of to |
|
# SSL_VERIFY_PEER for compatibility with IO::Socket::SSL rev. 1.01 |
|
# used by CentOS/RHEL/Scientific Linux 5). |
|
|
|
my $verify_cn = $peerdef; |
|
if ($verify_cn eq '') { |
|
$verify_cn = $peer; |
|
} |
|
|
|
my %sslargs = (SSL_use_cert => 1, |
|
SSL_key_file => $KeyFile, |
|
SSL_cert_file => $MyCert, |
|
SSL_ca_file => $CACert, |
|
SSL_verifycn_name => $verify_cn, |
|
SSL_verify_mode => Net::SSLeay::VERIFY_PEER()); |
|
if (($CRLFile ne '') && (-e $CRLFile)) { |
|
$sslargs{SSL_check_crl} = 1; |
|
$sslargs{SSL_crl_file} = $CRLFile; |
|
} |
|
my $client = IO::Socket::SSL->new_from_fd($dupfno,%sslargs); |
if(!$client) { |
if(!$client) { |
$lasterror = IO::Socket::SSL::errstr(); |
if ($IO::Socket::SSL::SSL_ERROR == -1) { |
|
$lasterror = -1; |
|
} |
return undef; |
return undef; |
} |
} |
return $client; # Undef if the client negotiation fails. |
return $client; # Undef if the client negotiation fails. |
Line 158 sub PromoteClientSocket {
|
Line 189 sub PromoteClientSocket {
|
#---------------------------------------------------------------------- |
#---------------------------------------------------------------------- |
# Name PromoteServerSocket |
# Name PromoteServerSocket |
# Description Given an ordinary IO::Socket::INET Creates an SSL socket |
# Description Given an ordinary IO::Socket::INET Creates an SSL socket |
# for a server that is connected to the same client.l |
# for a server that is connected to the same client. |
# Parameters Name Type Description |
# Parameters Name Type Description |
# Socket IO::Socket::INET Original ordinary socket. |
# Socket IO::Socket::INET Original ordinary socket. |
# CACert string Full path name to the certificate |
# CACert string Full path name to the certificate |
Line 167 sub PromoteClientSocket {
|
Line 198 sub PromoteClientSocket {
|
# issued to this host. |
# issued to this host. |
# KeyFile string Full pathname to the host's private |
# KeyFile string Full pathname to the host's private |
# key file for the certificate. |
# key file for the certificate. |
|
# peer string lonHostID of remote LON-CAPA client |
|
# CRLFile Full path name to the certificate |
|
# revocation list file for the cluster |
|
# to which server belongs (optional) |
|
# clientversion LON-CAPA version running on remote |
|
# client |
# Returns |
# Returns |
# - Reference to an SSL socket on success |
# - Reference to an SSL socket on success |
# - undef on failure. Reason for failure can be interrogated from |
# - undef on failure. Reason for failure can be interrogated from |
Line 178 sub PromoteServerSocket {
|
Line 215 sub PromoteServerSocket {
|
my ($PlaintextSocket, |
my ($PlaintextSocket, |
$CACert, |
$CACert, |
$MyCert, |
$MyCert, |
$KeyFile) = @_; |
$KeyFile, |
|
$peer, |
|
$CRLFile, |
|
$clientversion) = @_; |
|
|
# To create the ssl socket we need to duplicate the existing |
# To create the ssl socket we need to duplicate the existing |
# socket. Otherwise closing the ssl socket will close the plaintext socket |
# socket. Otherwise closing the ssl socket will close the plaintext socket |
Line 194 sub PromoteServerSocket {
|
Line 232 sub PromoteServerSocket {
|
Debug("dup failed: $!\n"); |
Debug("dup failed: $!\n"); |
} |
} |
Debug(" Fileno = $dupfno\n"); |
Debug(" Fileno = $dupfno\n"); |
my $client = IO::Socket::SSL->new_from_fd($dupfno, |
my %sslargs = (SSL_server => 1, # Server role. |
SSL_server => 1, # Server role. |
SSL_use_cert => 1, |
SSL_use_cert => 1, |
SSL_key_file => $KeyFile, |
SSL_key_file => $KeyFile, |
SSL_cert_file => $MyCert, |
SSL_cert_file => $MyCert, |
SSL_ca_file => $CACert); |
SSL_ca_file => $CACert); |
my ($major,$minor) = split(/\./,$clientversion); |
|
if (($major < 2) || ($major == 2 && $minor < 12)) { |
|
$sslargs{SSL_verify_mode} = Net::SSLeay::VERIFY_NONE(); |
|
} else { |
|
$sslargs{SSL_verifycn_name} = $peer; |
|
$sslargs{SSL_verify_mode} = Net::SSLeay::VERIFY_PEER(); |
|
if (($CRLFile ne '') && (-e $CRLFile)) { |
|
$sslargs{SSL_check_crl} = 1; |
|
$sslargs{SSL_crl_file} = $CRLFile; |
|
} |
|
} |
|
my $client = IO::Socket::SSL->new_from_fd($dupfno,%sslargs); |
if(!$client) { |
if(!$client) { |
$lasterror = IO::Socket::SSL::errstr(); |
if ($IO::Socket::SSL::SSL_ERROR == -1) { |
|
$lasterror = -1; |
|
} |
return undef; |
return undef; |
} |
} |
return $client; |
return $client; |
Line 323 sub KeyFile {
|
Line 374 sub KeyFile {
|
return $KeyFilename; |
return $KeyFilename; |
} |
} |
|
|
|
sub CRLFile { |
|
|
|
# I need some perl variables from the configuration file for this: |
|
|
|
my $CertificateDir = $perlvar->{lonCertificateDirectory}; |
|
my $CRLFilename = $perlvar->{lonnetCertRevocationList}; |
|
|
|
# Ensure the variables exist: |
|
|
|
if((!$CertificateDir) || (!$CRLFilename)) { |
|
$lasterror = "Missing parameter dir: $CertificateDir " |
|
."CRL file: $CRLFilename"; |
|
return undef; |
|
} |
|
|
|
# Build the actual filename and ensure that it not only exists but |
|
# is also readable: |
|
|
|
$CRLFilename = $CertificateDir.$pathsep.$CRLFilename; |
|
if(! (-r $CRLFilename)) { |
|
$lasterror = "Unreadable key file $CRLFilename"; |
|
return undef; |
|
} |
|
|
|
return $CRLFilename; |
|
} |
|
|
|
sub BadCertDir { |
|
my $SocketDir = $perlvar->{lonSockDir}; |
|
if (-d "$SocketDir/nosslverify/") { |
|
return "$SocketDir/nosslverify" |
|
} |
|
} |
|
|
|
sub has_badcert_file { |
|
my ($client) = @_; |
|
my $SocketDir = $perlvar->{lonSockDir}; |
|
if (-e "$SocketDir/nosslverify/$client") { |
|
return 1; |
|
} |
|
return; |
|
} |
|
|
|
sub Read_Connect_Config { |
|
my ($secureconf,$perlvarref) = @_; |
|
return unless (ref($secureconf) eq 'HASH'); |
|
|
|
unless (ref($perlvarref) eq 'HASH') { |
|
$perlvarref = $perlvar; |
|
} |
|
|
|
# Clean out the old table first. |
|
foreach my $key (keys(%{$secureconf})) { |
|
delete($secureconf->{$key}); |
|
} |
|
|
|
my $result; |
|
my $tablename = $perlvarref->{'lonTabDir'}."/connectionrules.tab"; |
|
if (open(my $fh,'<',$tablename)) { |
|
while (my $line = <$fh>) { |
|
chomp($line); |
|
my ($name,$value) = split(/=/,$line); |
|
if ($value =~ /^(?:no|yes|req)$/) { |
|
if ($name =~ /^conn(to|from)_(dom|intdom|other)$/) { |
|
$secureconf->{'conn'.$1}{$2} = $value; |
|
} |
|
} |
|
} |
|
close($fh); |
|
return 'ok'; |
|
} |
|
return; |
|
} |
|
|
|
sub Read_Host_Types { |
|
my ($hosttypes,$perlvarref) = @_; |
|
return unless (ref($hosttypes) eq 'HASH'); |
|
|
|
unless (ref($perlvarref) eq 'HASH') { |
|
$perlvarref = $perlvar; |
|
} |
|
|
|
# Clean out the old table first. |
|
foreach my $key (keys(%{$hosttypes})) { |
|
delete($hosttypes->{$key}); |
|
} |
|
|
|
my $result; |
|
my $tablename = $perlvarref->{'lonTabDir'}."/hosttypes.tab"; |
|
if (open(my $fh,'<',$tablename)) { |
|
while (my $line = <$fh>) { |
|
chomp($line); |
|
my ($name,$value) = split(/:/,$line); |
|
if (($name ne '') && ($value =~ /^(dom|intdom|other)$/)) { |
|
$hosttypes->{$name} = $value; |
|
} |
|
} |
|
close($fh); |
|
return 'ok'; |
|
} |
|
return; |
|
} |
|
|
1; |
1; |