--- loncom/LondConnection.pm 2003/08/03 00:45:54 1.8 +++ loncom/LondConnection.pm 2003/10/28 11:15:10 1.15 @@ -1,7 +1,7 @@ # This module defines and implements a class that represents # a connection to a lond daemon. # -# $Id: LondConnection.pm,v 1.8 2003/08/03 00:45:54 foxr Exp $ +# $Id: LondConnection.pm,v 1.15 2003/10/28 11:15:10 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,8 +25,10 @@ # # http://www.lon-capa.org/ # + package LondConnection; +use strict; use IO::Socket; use IO::Socket::INET; use IO::Handle; @@ -34,23 +36,61 @@ use IO::File; use Fcntl; use POSIX; use Crypt::IDEA; -use LONCAPA::Configuration; -use LONCAPA::HashIterator; + + + + my $DebugLevel=0; +my %hostshash; +my %perlvar; + +# +# The config read is done in this way to support the read of +# the non-default configuration file in the +# event we are being used outside of loncapa. +# + +my $ConfigRead = 0; # Read the configuration file for apache to get the perl # variable set. -my $perlvarref = LONCAPA::Configuration::read_conf('loncapa.conf'); -my %perlvar = %{$perlvarref}; -my $hoststab = - LONCAPA::Configuration::read_hosts( - "$perlvar{'lonTabDir'}/hosts.tab") || - die "Can't read host table!!"; -my %hostshash = %{$hoststab}; +sub ReadConfig { + my $perlvarref = read_conf('loncapa.conf'); + %perlvar = %{$perlvarref}; + my $hoststab = read_hosts( + "$perlvar{'lonTabDir'}/hosts.tab") || + die "Can't read host table!!"; + %hostshash = %{$hoststab}; + +} + +# +# Read a foreign configuration. +# This sub is intended for the cases where the package +# will be read from outside the LonCAPA environment, in that case +# the client will need to explicitly provide: +# - A file in hosts.tab format. +# - Some idea of the 'lonCAPA' name of the local host (for building +# the encryption key). +# +# Parameters: +# MyHost - Name of this host as far as LonCAPA is concerned. +# Filename - Name of a hosts.tab formatted file that will be used +# to build up the hosts table. +# +sub ReadForeignConfig { + my $MyHost = shift; + my $Filename = shift; + + $perlvar{lonHostID} = $MyHost; # Rmember my host. + my $hosttab = read_hosts($Filename) || + die "Can't read hosts table!!"; + %hostshash = %{$hosttab} -close(CONFIG); + +} sub Debug { my $level = shift; @@ -64,15 +104,17 @@ sub Debug { =head2 Dump -Dump the internal state of the object: For debugging purposes. +Dump the internal state of the object: For debugging purposes, to stderr. =cut sub Dump { my $self = shift; + my $key; + my $value; print "Dumping LondConnectionObject:\n"; while(($key, $value) = each %$self) { - print "$key -> $value\n"; + print STDERR "$key -> $value\n"; } print "-------------------------------\n"; } @@ -97,6 +139,7 @@ sub Transition { } + =pod =head2 new @@ -119,6 +162,11 @@ sub new { my $class = shift; # class name. my $Hostname = shift; # Name of host to connect to. my $Port = shift; # Port to connect + + if (!$ConfigRead) { + ReadConfig(); + $ConfigRead = 1; + } &Debug(4,$class."::new( ".$Hostname.",".$Port.")\n"); # The host must map to an entry in the hosts table: @@ -145,8 +193,8 @@ sub new { TimeoutCallback => undef, TransitionCallback => undef, Timeoutable => 0, - TimeoutValue => 60, - TimeoutRemaining => 0, + TimeoutValue => 30, + TimeoutRemaining => 0, CipherKey => "", Cipher => undef}; bless($self, $class); @@ -154,7 +202,7 @@ sub new { PeerPort => $self->{Port}, Type => SOCK_STREAM, Proto => "tcp", - Timeout => 5)) { + Timeout => 3)) { return undef; # Inidicates the socket could not be made. } # @@ -162,13 +210,14 @@ sub new { # $self->Transition("Connected"); $self->{InformWritable} = 1; # When socket is writable we send init + $self->{Timeoutable} = 1; # Timeout allowed during startup negotiation. $self->{TransactionRequest} = "init\n"; # # Set socket to nonblocking I/O. # my $socket = $self->{Socket}; - $flags = fcntl($socket->fileno, F_GETFL,0); + my $flags = fcntl($socket->fileno, F_GETFL,0); if($flags == -1) { $socket->close; return undef; @@ -237,7 +286,7 @@ sub Readable { if($self->{TransactionReply} =~ /(.*\n)/) { &Debug(8,"Readable End of line detected"); if ($self->{State} eq "Initialized") { # We received the challenge: - if($self->{TransactionReply} eq "refused") { # Remote doesn't have + if($self->{TransactionReply} eq "refused\n") { # Remote doesn't have $self->Transition("Disconnected"); # in host tables. $socket->close(); @@ -272,7 +321,7 @@ sub Readable { $key=substr($key,0,32); my $cipherkey=pack("H32",$key); $self->{Cipher} = new IDEA $cipherkey; - if($self->{Cipher} == undef) { + if($self->{Cipher} eq undef) { $self->Transition("Disconnected"); $socket->close(); return -1; @@ -337,7 +386,7 @@ sub Writable { } } - if (($rv >= 0) || + if (($nwritten >= 0) || ($errno == POSIX::EWOULDBLOCK) || ($errno == POSIX::EAGAIN) || ($errno == POSIX::EINTR) || @@ -654,7 +703,7 @@ sub Decrypt { # Decode the data in 8 byte blocks. The string is encoded # as hex digits so there are two characters per byte: - $decrpyted = ""; + my $decrypted = ""; for(my $index = 0; $index < length($EncryptedString); $index += 16) { $decrypted .= $self->{Cipher}->decrypt( @@ -685,7 +734,7 @@ are used as follows: [1] - LonCapa domain name. [2] - Loncapa role (e.g. library or access). [3] - DNS name server hostname. - [4] - IP address (result of e.g. nslooup [3]). + [4] - IP address (result of e.g. nslookup [3]). [5] - Maximum connection count. [6] - Idle timeout for reducing connection count. [7] - Minimum connection count. @@ -697,6 +746,85 @@ sub GetHostIterator { return HashIterator->new(\%hostshash); } +########################################################### +# +# The following is an unashamed kludge that is here to +# allow LondConnection to be used outside of the +# loncapa environment (e.g. by lonManage). +# +# This is a textual inclusion of pieces of the +# Configuration.pm module. +# + + +my $confdir='/etc/httpd/conf/'; + +# ------------------- Subroutine read_conf: read LON-CAPA server configuration. +# This subroutine reads PerlSetVar values out of specified web server +# configuration files. +sub read_conf + { + my (@conf_files)=@_; + my %perlvar; + foreach my $filename (@conf_files,'loncapa_apache.conf') + { + open(CONFIG,'<'.$confdir.$filename) or + die("Can't read $confdir$filename"); + while (my $configline=) + { + if ($configline =~ /^[^\#]*PerlSetVar/) + { + my ($unused,$varname,$varvalue)=split(/\s+/,$configline); + chomp($varvalue); + $perlvar{$varname}=$varvalue; + } + } + close(CONFIG); + } + my $perlvarref=\%perlvar; + return ($perlvarref); + } + +#---------------------- Subroutine read_hosts: Read a LON-CAPA hosts.tab +# formatted configuration file. +# +my $RequiredCount = 5; # Required item count in hosts.tab. +my $DefaultMaxCon = 5; # Default value for maximum connections. +my $DefaultIdle = 1000; # Default connection idle time in seconds. +my $DefaultMinCon = 0; # Default value for minimum connections. + +sub read_hosts { + my $Filename = shift; + my %HostsTab; + + open(CONFIG,'<'.$Filename) or die("Can't read $Filename"); + while (my $line = ) { + if (!($line =~ /^\s*\#/)) { + my @items = split(/:/, $line); + if(scalar @items >= $RequiredCount) { + if (scalar @items == $RequiredCount) { # Only required items: + $items[$RequiredCount] = $DefaultMaxCon; + } + if(scalar @items == $RequiredCount + 1) { # up through maxcon. + $items[$RequiredCount+1] = $DefaultIdle; + } + if(scalar @items == $RequiredCount + 2) { # up through idle. + $items[$RequiredCount+2] = $DefaultMinCon; + } + { + my @list = @items; # probably not needed but I'm unsure of + # about the scope of item so... + $HostsTab{$list[0]} = \@list; + } + } + } + } + close(CONFIG); + my $hostref = \%HostsTab; + return ($hostref); +} + + 1; =pod