--- loncom/lond 2015/03/12 00:37:30 1.489.2.17 +++ loncom/lond 2013/08/10 01:27:31 1.502 @@ -2,7 +2,7 @@ # The LearningOnline Network # lond "LON Daemon" Server (port "LOND" 5663) # -# $Id: lond,v 1.489.2.17 2015/03/12 00:37:30 raeburn Exp $ +# $Id: lond,v 1.502 2013/08/10 01:27:31 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -61,7 +61,7 @@ my $DEBUG = 0; # Non zero to ena my $status=''; my $lastlog=''; -my $VERSION='$Revision: 1.489.2.17 $'; #' stupid emacs +my $VERSION='$Revision: 1.502 $'; #' stupid emacs my $remoteVERSION; my $currenthostid="default"; my $currentdomainid; @@ -621,7 +621,7 @@ sub ConfigFileFromSelector { # String to send to client ("ok" or "refused" if bad file). # sub PushFile { - my $request = shift; + my $request = shift; my ($command, $filename, $contents) = split(":", $request, 3); &Debug("PushFile"); @@ -651,44 +651,6 @@ sub PushFile { if($filename eq "host") { $contents = AdjustHostContents($contents); - } elsif ($filename eq 'dns_host' || $filename eq 'dns_domain') { - if ($contents eq '') { - &logthis(' Pushfile: unable to install ' - .$tablefile." - no data received from push. "); - return 'error: push had no data'; - } - if (&Apache::lonnet::get_host_ip($clientname)) { - my $clienthost = &Apache::lonnet::hostname($clientname); - if ($managers{$clientip} eq $clientname) { - my $clientprotocol = $Apache::lonnet::protocol{$clientname}; - $clientprotocol = 'http' if ($clientprotocol ne 'https'); - my $url = '/adm/'.$filename; - $url =~ s{_}{/}; - my $ua=new LWP::UserAgent; - $ua->timeout(60); - my $request=new HTTP::Request('GET',"$clientprotocol://$clienthost$url"); - my $response=$ua->request($request); - if ($response->is_error()) { - &logthis(' Pushfile: unable to install ' - .$tablefile." - error attempting to pull data. "); - return 'error: pull failed'; - } else { - my $result = $response->content; - chomp($result); - unless ($result eq $contents) { - &logthis(' Pushfile: unable to install ' - .$tablefile." - pushed data and pulled data differ. "); - my $pushleng = length($contents); - my $pullleng = length($result); - if ($pushleng != $pullleng) { - return "error: $pushleng vs $pullleng bytes"; - } else { - return "error: mismatch push and pull"; - } - } - } - } - } } # Install the new file: @@ -1723,14 +1685,8 @@ sub read_lonnet_global { sub server_devalidatecache_handler { my ($cmd,$tail,$client) = @_; my $userinput = "$cmd:$tail"; - my $items = &unescape($tail); - my @cached = split(/\&/,$items); - foreach my $key (@cached) { - if ($key =~ /:/) { - my ($name,$id) = map { &unescape($_); } split(/:/,$key); - &Apache::lonnet::devalidate_cache_new($name,$id); - } - } + my ($name,$id) = map { &unescape($_); } split(/:/,$tail); + &Apache::lonnet::devalidate_cache_new($name,$id); my $result = 'ok'; &Reply($client,\$result,$userinput); return 1; @@ -1932,12 +1888,8 @@ sub authenticate_handler { if (ref($hostedsession) eq 'HASH') { $hosted = $hostedsession->{'hosted'}; } - my $loncaparev = $clientversion; - if ($loncaparev eq '') { - $loncaparev = $Apache::lonnet::loncaparevs{$clientname}; - } $canhost = &Apache::lonnet::can_host_session($udom,$clientname, - $loncaparev, + $clientversion, $remote,$hosted); } } @@ -2812,10 +2764,6 @@ sub newput_user_profile_entry { foreach my $pair (@pairs) { my ($key,$value)=split(/=/,$pair); if (exists($hashref->{$key})) { - if (!&untie_user_hash($hashref)) { - &logthis("error: ".($!+0)." untie (GDBM) failed ". - "while attempting newput - early out as key exists"); - } &Failure($client, "key_exists: ".$key."\n",$userinput); return 1; } @@ -3219,6 +3167,17 @@ sub get_profile_keys { sub dump_profile_database { my ($cmd, $tail, $client) = @_; + my $res = LONCAPA::Lond::dump_profile_database($tail); + + if ($res =~ /^error:/) { + Failure($client, \$res, "$cmd:$tail"); + } else { + Reply($client, \$res, "$cmd:$tail"); + } + + return 1; + + #TODO remove my $userinput = "$cmd:$tail"; my ($udom,$uname,$namespace) = split(/:/,$tail); @@ -3298,11 +3257,11 @@ sub dump_with_regexp { my ($cmd, $tail, $client) = @_; my $res = LONCAPA::Lond::dump_with_regexp($tail, $clientversion); - + if ($res =~ /^error:/) { - &Failure($client, \$res, "$cmd:$tail"); + Failure($client, \$res, "$cmd:$tail"); } else { - &Reply($client, \$res, "$cmd:$tail"); + Reply($client, \$res, "$cmd:$tail"); } return 1; @@ -3319,9 +3278,6 @@ sub dump_with_regexp { # namespace - Name of the database being modified # rid - Resource keyword to modify. # what - new value associated with rid. -# laststore - (optional) version=timestamp -# for most recent transaction for rid -# in namespace, when cstore was called # # $client - Socket open on the client. # @@ -3330,47 +3286,23 @@ sub dump_with_regexp { # 1 (keep on processing). # Side-Effects: # Writes to the client -# Successful storage will cause either 'ok', or, if $laststore was included -# in the tail of the request, and the version number for the last transaction -# is larger than the version in $laststore, delay:$numtrans , where $numtrans -# is the number of store evevnts recorded for rid in namespace since -# lonnet::store() was called by the client. -# sub store_handler { my ($cmd, $tail, $client) = @_; my $userinput = "$cmd:$tail"; - chomp($tail); - my ($udom,$uname,$namespace,$rid,$what,$laststore) =split(/:/,$tail); + my ($udom,$uname,$namespace,$rid,$what) =split(/:/,$tail); if ($namespace ne 'roles') { + chomp($what); my @pairs=split(/\&/,$what); my $hashref = &tie_user_hash($udom, $uname, $namespace, &GDBM_WRCREAT(), "S", "$rid:$what"); if ($hashref) { my $now = time; - my $numtrans; - if ($laststore) { - my ($previousversion,$previoustime) = split(/\=/,$laststore); - my ($lastversion,$lasttime) = (0,0); - $lastversion = $hashref->{"version:$rid"}; - if ($lastversion) { - $lasttime = $hashref->{"$lastversion:$rid:timestamp"}; - } - if (($previousversion) && ($previousversion !~ /\D/)) { - if (($lastversion > $previousversion) && ($lasttime >= $previoustime)) { - $numtrans = $lastversion - $previousversion; - } - } elsif ($lastversion) { - $numtrans = $lastversion; - } - if ($numtrans) { - $numtrans =~ s/D//g; - } - } - + my @previouskeys=split(/&/,$hashref->{"keys:$rid"}); + my $key; $hashref->{"version:$rid"}++; my $version=$hashref->{"version:$rid"}; my $allkeys=''; @@ -3383,11 +3315,7 @@ sub store_handler { $allkeys.='timestamp'; $hashref->{"$version:keys:$rid"}=$allkeys; if (&untie_user_hash($hashref)) { - my $msg = 'ok'; - if ($numtrans) { - $msg = 'delay:'.$numtrans; - } - &Reply($client, "$msg\n", $userinput); + &Reply($client, "ok\n", $userinput); } else { &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ". "while attempting store\n", $userinput); @@ -3903,9 +3831,7 @@ sub put_course_id_hash_handler { # creationcontext - include courses created in specified context # # domcloner - flag to indicate if user can create CCs in course's domain. -# If so, ability to clone course is automatic. -# hasuniquecode - filter by courses for which a six character unique code has -# been set. +# If so, ability to clone course is automatic. # # $client - The socket open on the client. # Returns: @@ -3914,12 +3840,23 @@ sub put_course_id_hash_handler { # a reply is written to $client. sub dump_course_id_handler { my ($cmd, $tail, $client) = @_; + + my $res = LONCAPA::Lond::dump_course_id_handler($tail); + if ($res =~ /^error:/) { + Failure($client, \$res, "$cmd:$tail"); + } else { + Reply($client, \$res, "$cmd:$tail"); + } + + return 1; + + #TODO remove my $userinput = "$cmd:$tail"; my ($udom,$since,$description,$instcodefilter,$ownerfilter,$coursefilter, $typefilter,$regexp_ok,$rtn_as_hash,$selfenrollonly,$catfilter,$showhidden, $caller,$cloner,$cc_clone_list,$cloneonly,$createdbefore,$createdafter, - $creationcontext,$domcloner,$hasuniquecode) =split(/:/,$tail); + $creationcontext,$domcloner) =split(/:/,$tail); my $now = time; my ($cloneruname,$clonerudom,%cc_clone); if (defined($description)) { @@ -3992,9 +3929,6 @@ sub dump_course_id_handler { } else { $creationcontext = '.'; } - unless ($hasuniquecode) { - $hasuniquecode = '.'; - } my $unpack = 1; if ($description eq '.' && $instcodefilter eq '.' && $ownerfilter eq '.' && $typefilter eq '.') { @@ -4083,9 +4017,6 @@ sub dump_course_id_handler { $selfenroll_end = $items->{'selfenroll_end_date'}; $created = $items->{'created'}; $context = $items->{'context'}; - if ($hasuniquecode ne '.') { - next unless ($items->{'uniquecode'}); - } if ($selfenrollonly) { next if (!$selfenroll_types); if (($selfenroll_end > 0) && ($selfenroll_end <= $now)) { @@ -4520,7 +4451,7 @@ sub get_id_handler { # Returns: # 1 - Continue processing # 0 - Exit server. -# +# # sub del_id_handler { @@ -5318,7 +5249,7 @@ sub crsreq_checks_handler { my $userinput = "$cmd:$tail"; my $dom = $tail; my $result; - my @reqtypes = ('official','unofficial','community','textbook'); + my @reqtypes = ('official','unofficial','community'); eval { local($SIG{__DIE__})='DEFAULT'; my %validations; @@ -5345,20 +5276,19 @@ sub crsreq_checks_handler { sub validate_crsreq_handler { my ($cmd, $tail, $client) = @_; my $userinput = "$cmd:$tail"; - my ($dom,$owner,$crstype,$inststatuslist,$instcode,$instseclist,$customdata) = split(/:/, $tail); + my ($dom,$owner,$crstype,$inststatuslist,$instcode,$instseclist) = split(/:/, $tail); $instcode = &unescape($instcode); $owner = &unescape($owner); $crstype = &unescape($crstype); $inststatuslist = &unescape($inststatuslist); $instcode = &unescape($instcode); $instseclist = &unescape($instseclist); - my $custominfo = &Apache::lonnet::thaw_unescape($customdata); my $outcome; eval { local($SIG{__DIE__})='DEFAULT'; $outcome = &localenroll::validate_crsreq($dom,$owner,$crstype, $inststatuslist,$instcode, - $instseclist,$custominfo); + $instseclist); }; if (!$@) { &Reply($client, \$outcome, $userinput); @@ -5369,53 +5299,6 @@ sub validate_crsreq_handler { } ®ister_handler("autocrsreqvalidation", \&validate_crsreq_handler, 0, 1, 0); -sub crsreq_update_handler { - my ($cmd, $tail, $client) = @_; - my $userinput = "$cmd:$tail"; - my ($cdom,$cnum,$crstype,$action,$ownername,$ownerdomain,$fullname,$title,$code, - $accessstart,$accessend,$infohashref) = - split(/:/, $tail); - $crstype = &unescape($crstype); - $action = &unescape($action); - $ownername = &unescape($ownername); - $ownerdomain = &unescape($ownerdomain); - $fullname = &unescape($fullname); - $title = &unescape($title); - $code = &unescape($code); - $accessstart = &unescape($accessstart); - $accessend = &unescape($accessend); - my $incoming = &Apache::lonnet::thaw_unescape($infohashref); - my ($result,$outcome); - eval { - local($SIG{__DIE__})='DEFAULT'; - my %rtnhash; - $outcome = &localenroll::crsreq_updates($cdom,$cnum,$crstype,$action, - $ownername,$ownerdomain,$fullname, - $title,$code,$accessstart,$accessend, - $incoming,\%rtnhash); - if ($outcome eq 'ok') { - my @posskeys = qw(createdweb createdmsg queuedweb queuedmsg formitems reviewweb); - foreach my $key (keys(%rtnhash)) { - if (grep(/^\Q$key\E/,@posskeys)) { - $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rtnhash{$key}).'&'; - } - } - $result =~ s/\&$//; - } - }; - if (!$@) { - if ($outcome eq 'ok') { - &Reply($client, \$result, $userinput); - } else { - &Reply($client, "format_error\n", $userinput); - } - } else { - &Failure($client,"unknown_cmd\n",$userinput); - } - return 1; -} -®ister_handler("autocrsrequpdate", \&crsreq_update_handler, 0, 1, 0); - # # Read and retrieve institutional code format (for support form). # Formal Parameters: @@ -6363,6 +6246,9 @@ sub Debug { # reply - Text to send to client. # request - Original request from client. # +#NOTE $reply must be terminated by exactly *one* \n. If $reply is a reference +#this is done automatically ($$reply must not contain any \n in this case). +#If $reply is a string the caller has to ensure this. sub Reply { my ($fd, $reply, $request) = @_; if (ref($reply)) { @@ -6608,28 +6494,11 @@ sub make_new_child { # my $tmpsnum=0; # Now global #---------------------------------------------------- kerberos 5 initialization &Authen::Krb5::init_context(); - - my $no_ets; - if ($dist =~ /^(?:centos|rhes|scientific)(\d+)$/) { - if ($1 >= 7) { - $no_ets = 1; - } - } elsif ($dist =~ /^suse(\d+\.\d+)$/) { - if (($1 eq '9.3') || ($1 >= 12.2)) { - $no_ets = 1; - } - } elsif ($dist =~ /^sles(\d+)$/) { - if ($1 > 11) { - $no_ets = 1; - } - } elsif ($dist =~ /^fedora(\d+)$/) { - if ($1 < 7) { - $no_ets = 1; - } - } - unless ($no_ets) { - &Authen::Krb5::init_ets(); - } + unless (($dist eq 'fedora5') || ($dist eq 'fedora4') || + ($dist eq 'fedora6') || ($dist eq 'suse9.3') || + ($dist eq 'suse12.2') || ($dist eq 'suse12.3')) { + &Authen::Krb5::init_ets(); + } &status('Accepted connection'); # ============================================================================= @@ -6672,13 +6541,14 @@ sub make_new_child { # # If the remote is attempting a local init... give that a try: # + logthis("remotereq: $remotereq"); (my $i, my $inittype, $clientversion) = split(/:/, $remotereq); - # For LON-CAPA 2.9, the client session will have sent its LON-CAPA - # version when initiating the connection. For LON-CAPA 2.8 and older, - # the version is retrieved from the global %loncaparevs in lonnet.pm. - # $clientversion contains path to keyfile if $inittype eq 'local' - # it's overridden below in this case - $clientversion ||= $Apache::lonnet::loncaparevs{$clientname}; + # For LON-CAPA 2.9, the client session will have sent its LON-CAPA + # version when initiating the connection. For LON-CAPA 2.8 and older, + # the version is retrieved from the global %loncaparevs in lonnet.pm. + # $clientversion contains path to keyfile if $inittype eq 'local' + # it's overridden below in this case + $clientversion ||= $Apache::lonnet::loncaparevs{$clientname}; # If the connection type is ssl, but I didn't get my # certificate files yet, then I'll drop back to @@ -7495,6 +7365,8 @@ sub get_usersession_config { } + + sub distro_and_arch { return $dist.':'.$arch; } @@ -7823,6 +7695,8 @@ Authen::Krb5 =head1 COREQUISITES +none + =head1 OSNAMES linux @@ -7910,9 +7784,9 @@ or the CA's certificate in the call to l is the textual reason this failed. Usual reasons: =over 2 - + =item Apache config file for loncapa incorrect: - + one of the variables lonCertificateDirectory, lonnetCertificateAuthority, or lonnetCertificate undefined or incorrect @@ -8031,7 +7905,7 @@ Could not rewrite the internal password file for a user =item Result of password change for : - + A unix password change for was attempted and the pipe returned @@ -8060,7 +7934,7 @@ lond has been asked to exit by its clien client systemand is the full exit command sent to the server. =item Red CRITICAL: ABNORMAL EXIT. child for server died through a crass with this error->[]. - + A lond child terminated. NOte that this termination can also occur when the child receives the QUIT or DIE signals. is the process id of the child, the host lond is working for, and the reason the child died @@ -8144,7 +8018,7 @@ file when sent it's USR1 signal. That p assumed to be hung in some un-fixable way. =item Finished checking children - + Master processs's USR1 processing is cojmplete. =item (Red) CRITICAL: ------- Starting ------ @@ -8158,7 +8032,7 @@ Started a new child process for connected to the child. This was as a result of a TCP/IP connection from a client. =item Unable to determine who caller was, getpeername returned nothing - + In child process initialization. either getpeername returned undef or a zero sized object was returned. Processing continues, but in my opinion, this should be cause for the child to exit. @@ -8169,7 +8043,7 @@ In child process initialization. The pe The client address is stored as "Unavailable" and processing continues. =item (Yellow) INFO: Connection connection type = - + In child initialization. A good connectionw as received from . =over 2 @@ -8219,7 +8093,7 @@ The client ( is the peer's name negotiated an SSL connection with this child process. =item (Green) Successful insecure authentication with - + The client has successfully negotiated an insecure connection withthe child process.