--- loncom/lond 2021/12/21 16:22:14 1.489.2.43 +++ loncom/lond 2012/04/11 21:32:28 1.490 @@ -2,7 +2,7 @@ # The LearningOnline Network # lond "LON Daemon" Server (port "LOND" 5663) # -# $Id: lond,v 1.489.2.43 2021/12/21 16:22:14 raeburn Exp $ +# $Id: lond,v 1.490 2012/04/11 21:32:28 droeschl Exp $ # # Copyright Michigan State University Board of Trustees # @@ -15,6 +15,7 @@ # # LON-CAPA is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # @@ -54,16 +55,13 @@ use LONCAPA::lonssl; use Fcntl qw(:flock); use Apache::lonnet; use Mail::Send; -use Crypt::Eksblowfish::Bcrypt; -use Digest::SHA; -use Encode; my $DEBUG = 0; # Non zero to enable debug log entries. my $status=''; my $lastlog=''; -my $VERSION='$Revision: 1.489.2.43 $'; #' stupid emacs +my $VERSION='$Revision: 1.490 $'; #' stupid emacs my $remoteVERSION; my $currenthostid="default"; my $currentdomainid; @@ -132,13 +130,32 @@ my @passwderrors = ("ok", "pwchange_failure - lcpasswd Error filename is invalid"); +# The array below are lcuseradd error strings.: + +my $lastadderror = 13; +my @adderrors = ("ok", + "User ID mismatch, lcuseradd must run as user www", + "lcuseradd Incorrect number of command line parameters must be 3", + "lcuseradd Incorrect number of stdinput lines, must be 3", + "lcuseradd Too many other simultaneous pwd changes in progress", + "lcuseradd User does not exist", + "lcuseradd Unable to make www member of users's group", + "lcuseradd Unable to su to root", + "lcuseradd Unable to set password", + "lcuseradd Username has invalid characters", + "lcuseradd Password has an invalid character", + "lcuseradd User already exists", + "lcuseradd Could not add user.", + "lcuseradd Password mismatch"); + + # This array are the errors from lcinstallfile: my @installerrors = ("ok", "Initial user id of client not that of www", "Usage error, not enough command line arguments", - "Source filename does not exist", - "Destination filename does not exist", + "Source file name does not exist", + "Destination file name does not exist", "Some file operation failed", "Invalid table filename." ); @@ -623,7 +640,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"); @@ -653,44 +670,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: @@ -1424,22 +1403,6 @@ sub du2_handler { # selected directory the filename followed by the full output of # the stat function is returned. The returned info for each # file are separated by ':'. The stat fields are separated by &'s. -# -# If the requested path contains /../ or is: -# -# 1. for a directory, and the path does not begin with one of: -# (a) /home/httpd/html/res/ -# (b) /home/httpd/html/userfiles/ -# (c) /home/httpd/lonUsers//<1>/<2>/<3>//userfiles -# or is: -# -# 2. for a file, and the path (after prepending) does not begin with one of: -# (a) /home/httpd/lonUsers//<1>/<2>/<3>// -# (b) /home/httpd/html/res/// -# (c) /home/httpd/html/userfiles/// -# -# the response will be "refused". -# # Parameters: # $cmd - The command that dispatched us (ls). # $ulsdir - The directory path to list... I'm not sure what this @@ -1461,17 +1424,8 @@ sub ls_handler { my $rights; my $ulsout=''; my $ulsfn; - if ($ulsdir =~m{/\.\./}) { - &Failure($client,"refused\n",$userinput); - return 1; - } if (-e $ulsdir) { if(-d $ulsdir) { - unless (($ulsdir =~ m{^/home/httpd/html/(res/$LONCAPA::match_domain|userfiles/)}) || - ($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/userfiles})) { - &Failure($client,"refused\n",$userinput); - return 1; - } if (opendir(LSDIR,$ulsdir)) { while ($ulsfn=readdir(LSDIR)) { undef($obs); @@ -1495,11 +1449,6 @@ sub ls_handler { closedir(LSDIR); } } else { - unless (($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/}) || - ($ulsdir =~ m{^/home/httpd/html/(?:res|userfiles)/$LONCAPA::match_domain/$LONCAPA::match_name/})) { - &Failure($client,"refused\n",$userinput); - return 1; - } my @ulsstats=stat($ulsdir); $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':'; } @@ -1524,22 +1473,6 @@ sub ls_handler { # selected directory the filename followed by the full output of # the stat function is returned. The returned info for each # file are separated by ':'. The stat fields are separated by &'s. -# -# If the requested path contains /../ or is: -# -# 1. for a directory, and the path does not begin with one of: -# (a) /home/httpd/html/res/ -# (b) /home/httpd/html/userfiles/ -# (c) /home/httpd/lonUsers//<1>/<2>/<3>//userfiles -# or is: -# -# 2. for a file, and the path (after prepending) does not begin with one of: -# (a) /home/httpd/lonUsers//<1>/<2>/<3>// -# (b) /home/httpd/html/res/// -# (c) /home/httpd/html/userfiles/// -# -# the response will be "refused". -# # Parameters: # $cmd - The command that dispatched us (ls). # $ulsdir - The directory path to list... I'm not sure what this @@ -1560,17 +1493,8 @@ sub ls2_handler { my $rights; my $ulsout=''; my $ulsfn; - if ($ulsdir =~m{/\.\./}) { - &Failure($client,"refused\n",$userinput); - return 1; - } if (-e $ulsdir) { if(-d $ulsdir) { - unless (($ulsdir =~ m{^/home/httpd/html/(res/$LONCAPA::match_domain|userfiles/)}) || - ($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/userfiles})) { - &Failure($client,"refused\n","$userinput"); - return 1; - } if (opendir(LSDIR,$ulsdir)) { while ($ulsfn=readdir(LSDIR)) { undef($obs); @@ -1595,11 +1519,6 @@ sub ls2_handler { closedir(LSDIR); } } else { - unless (($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/}) || - ($ulsdir =~ m{^/home/httpd/html/(?:res|userfiles)/$LONCAPA::match_domain/$LONCAPA::match_name/})) { - &Failure($client,"refused\n",$userinput); - return 1; - } my @ulsstats=stat($ulsdir); $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':'; } @@ -1616,25 +1535,6 @@ sub ls2_handler { # selected directory the filename followed by the full output of # the stat function is returned. The returned info for each # file are separated by ':'. The stat fields are separated by &'s. -# -# If the requested path (after prepending) contains /../ or is: -# -# 1. for a directory, and the path does not begin with one of: -# (a) /home/httpd/html/res/ -# (b) /home/httpd/html/userfiles/ -# (c) /home/httpd/lonUsers//<1>/<2>/<3>//userfiles -# (d) /home/httpd/html/priv/ and client is the homeserver -# -# or is: -# -# 2. for a file, and the path (after prepending) does not begin with one of: -# (a) /home/httpd/lonUsers//<1>/<2>/<3>// -# (b) /home/httpd/html/res/// -# (c) /home/httpd/html/userfiles/// -# (d) /home/httpd/html/priv/// and client is the homeserver -# -# the response will be "refused". -# # Parameters: # $cmd - The command that dispatched us (ls). # $tail - The tail of the request that invoked us. @@ -1674,12 +1574,22 @@ sub ls3_handler { } my $dir_root = $perlvar{'lonDocRoot'}; - if (($getpropath) || ($getuserdir)) { + if ($getpropath) { if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) { $dir_root = &propath($udom,$uname); $dir_root =~ s/\/$//; } else { - &Failure($client,"refused\n",$userinput); + &Failure($client,"refused\n","$cmd:$tail"); + return 1; + } + } elsif ($getuserdir) { + if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) { + my $subdir=$uname.'__'; + $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/; + $dir_root = $Apache::lonnet::perlvar{'lonUsersDir'} + ."/$udom/$subdir/$uname"; + } else { + &Failure($client,"refused\n","$cmd:$tail"); return 1; } } elsif ($alternate_root ne '') { @@ -1692,28 +1602,12 @@ sub ls3_handler { $ulsdir = $dir_root.'/'.$ulsdir; } } - if ($ulsdir =~m{/\.\./}) { - &Failure($client,"refused\n",$userinput); - return 1; - } - my $islocal; - my @machine_ids = &Apache::lonnet::current_machine_ids(); - if (grep(/^\Q$clientname\E$/,@machine_ids)) { - $islocal = 1; - } my $obs; my $rights; my $ulsout=''; my $ulsfn; if (-e $ulsdir) { if(-d $ulsdir) { - unless (($getpropath) || ($getuserdir) || - ($ulsdir =~ m{^/home/httpd/html/(res/$LONCAPA::match_domain|userfiles/)}) || - ($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/userfiles}) || - (($ulsdir =~ m{^/home/httpd/html/priv/$LONCAPA::match_domain}) && ($islocal))) { - &Failure($client,"refused\n",$userinput); - return 1; - } if (opendir(LSDIR,$ulsdir)) { while ($ulsfn=readdir(LSDIR)) { undef($obs); @@ -1738,13 +1632,6 @@ sub ls3_handler { closedir(LSDIR); } } else { - unless (($getpropath) || ($getuserdir) || - ($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/}) || - ($ulsdir =~ m{^/home/httpd/html/(?:res|userfiles)/$LONCAPA::match_domain/$LONCAPA::match_name/}) || - (($ulsdir =~ m{^/home/httpd/html/priv/$LONCAPA::match_domain/$LONCAPA::match_name/}) && ($islocal))) { - &Failure($client,"refused\n",$userinput); - return 1; - } my @ulsstats=stat($ulsdir); $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':'; } @@ -1795,7 +1682,7 @@ sub read_lonnet_global { } if ($what eq 'perlvar') { if (!exists($packagevars{$what}{'lonBalancer'})) { - if ($dist =~ /^(centos|rhes|fedora|scientific|oracle|rocky|alma)/) { + if ($dist =~ /^(centos|rhes|fedora|scientific)/) { my $othervarref=LONCAPA::Configuration::read_conf('httpd.conf'); if (ref($othervarref) eq 'HASH') { $items->{'lonBalancer'} = $othervarref->{'lonBalancer'}; @@ -1817,14 +1704,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; @@ -2020,7 +1901,7 @@ sub authenticate_handler { my ($remote,$hosted); my $remotesession = &get_usersession_config($udom,'remotesession'); if (ref($remotesession) eq 'HASH') { - $remote = $remotesession->{'remote'}; + $remote = $remotesession->{'remote'} } my $hostedsession = &get_usersession_config($clienthomedom,'hostedsession'); if (ref($hostedsession) eq 'HASH') { @@ -2107,90 +1988,19 @@ sub change_password_handler { } if($validated) { my $realpasswd = &get_auth_type($udom, $uname); # Defined since authd. + my ($howpwd,$contentpwd)=split(/:/,$realpasswd); - my $notunique; if ($howpwd eq 'internal') { &Debug("internal auth"); - my $ncpass = &hash_passwd($udom,$npass); - my (undef,$method,@rest) = split(/!/,$contentpwd); - if ($method eq 'bcrypt') { - my %passwdconf = &Apache::lonnet::get_passwdconf($udom); - if (($passwdconf{'numsaved'}) && ($passwdconf{'numsaved'} =~ /^\d+$/)) { - my @oldpasswds; - my $userpath = &propath($udom,$uname); - my $fullpath = $userpath.'/oldpasswds'; - if (-d $userpath) { - my @oldfiles; - if (-e $fullpath) { - if (opendir(my $dir,$fullpath)) { - (@oldfiles) = grep(/^\d+$/,readdir($dir)); - closedir($dir); - } - if (@oldfiles) { - @oldfiles = sort { $b <=> $a } (@oldfiles); - my $numremoved = 0; - for (my $i=0; $i<@oldfiles; $i++) { - if ($i>=$passwdconf{'numsaved'}) { - if (-f "$fullpath/$oldfiles[$i]") { - if (unlink("$fullpath/$oldfiles[$i]")) { - $numremoved ++; - } - } - } elsif (open(my $fh,'<',"$fullpath/$oldfiles[$i]")) { - while (my $line = <$fh>) { - push(@oldpasswds,$line); - } - close($fh); - } - } - if ($numremoved) { - &logthis("unlinked $numremoved old password files for $uname:$udom"); - } - } - } - push(@oldpasswds,$contentpwd); - foreach my $item (@oldpasswds) { - my (undef,$method,@rest) = split(/!/,$item); - if ($method eq 'bcrypt') { - my $result = &hash_passwd($udom,$npass,@rest); - if ($result eq $item) { - $notunique = 1; - last; - } - } - } - unless ($notunique) { - unless (-e $fullpath) { - if (&mkpath("$fullpath/")) { - chmod(0700,$fullpath); - } - } - if (-d $fullpath) { - my $now = time; - if (open(my $fh,'>',"$fullpath/$now")) { - print $fh $contentpwd; - close($fh); - chmod(0400,"$fullpath/$now"); - } - } - } - } - } - } - if ($notunique) { - my $msg="Result of password change for $uname:$udom - password matches one used before"; - if ($lonhost) { - $msg .= " - request originated from: $lonhost"; - } - &logthis($msg); - &Reply($client, "prioruse\n", $userinput); - } elsif (&rewrite_password_file($udom, $uname, "internal:$ncpass")) { + my $salt=time; + $salt=substr($salt,6,2); + my $ncpass=crypt($npass,$salt); + if(&rewrite_password_file($udom, $uname, "internal:$ncpass")) { my $msg="Result of password change for $uname: pwchange_success"; if ($lonhost) { $msg .= " - request originated from: $lonhost"; } &logthis($msg); - &update_passwd_history($uname,$udom,$howpwd,$context); &Reply($client, "ok\n", $userinput); } else { &logthis("Unable to open $uname passwd " @@ -2199,9 +2009,6 @@ sub change_password_handler { } } elsif ($howpwd eq 'unix' && $context ne 'reset_by_email') { my $result = &change_unix_password($uname, $npass); - if ($result eq 'ok') { - &update_passwd_history($uname,$udom,$howpwd,$context); - } &logthis("Result of password change for $uname: ". $result); &Reply($client, \$result, $userinput); @@ -2212,6 +2019,7 @@ sub change_password_handler { # &Failure( $client, "auth_mode_error\n", $userinput); } + } else { if ($failure eq '') { $failure = 'non_authorized'; @@ -2223,38 +2031,6 @@ sub change_password_handler { } ®ister_handler("passwd", \&change_password_handler, 1, 1, 0); -sub hash_passwd { - my ($domain,$plainpass,@rest) = @_; - my ($salt,$cost); - if (@rest) { - $cost = $rest[0]; - # salt is first 22 characters, base-64 encoded by bcrypt - my $plainsalt = substr($rest[1],0,22); - $salt = Crypt::Eksblowfish::Bcrypt::de_base64($plainsalt); - } else { - my %domdefaults = &Apache::lonnet::get_domain_defaults($domain); - my $defaultcost = $domdefaults{'intauth_cost'}; - if (($defaultcost eq '') || ($defaultcost =~ /D/)) { - $cost = 10; - } else { - $cost = $defaultcost; - } - # Generate random 16-octet base64 salt - $salt = ""; - $salt .= pack("C", int rand(256)) for 1..16; - } - my $hash = &Crypt::Eksblowfish::Bcrypt::bcrypt_hash({ - key_nul => 1, - cost => $cost, - salt => $salt, - }, Digest::SHA::sha512(Encode::encode('UTF-8',$plainpass))); - - my $result = join("!", "", "bcrypt", sprintf("%02d",$cost), - &Crypt::Eksblowfish::Bcrypt::en_base64($salt). - &Crypt::Eksblowfish::Bcrypt::en_base64($hash)); - return $result; -} - # # Create a new user. User in this case means a lon-capa user. # The user must either already exist in some authentication realm @@ -2298,8 +2074,7 @@ sub add_user_handler { ."makeuser"; } unless ($fperror) { - my $result=&make_passwd_file($uname,$udom,$umode,$npass, - $passfilename,'makeuser'); + my $result=&make_passwd_file($uname,$udom,$umode,$npass, $passfilename); &Reply($client,\$result, $userinput); #BUGBUG - could be fail } else { &Failure($client, \$fperror, $userinput); @@ -2360,30 +2135,36 @@ sub change_authentication_handler { my $passfilename = &password_path($udom, $uname); if ($passfilename) { # Not allowed to create a new user!! # If just changing the unix passwd. need to arrange to run - # passwd since otherwise make_passwd_file will fail as - # creation of unix authenticated users is no longer supported - # except from the command line, when running make_domain_coordinator.pl + # passwd since otherwise make_passwd_file will run + # lcuseradd which fails if an account already exists + # (to prevent an unscrupulous LONCAPA admin from stealing + # an existing account by overwriting it as a LonCAPA account). if(($oldauth =~/^unix/) && ($umode eq "unix")) { my $result = &change_unix_password($uname, $npass); &logthis("Result of password change for $uname: ".$result); if ($result eq "ok") { - &update_passwd_history($uname,$udom,$umode,'changeuserauth'); &Reply($client, \$result); } else { &Failure($client, \$result); } } else { - my $result=&make_passwd_file($uname,$udom,$umode,$npass, - $passfilename,'changeuserauth'); + my $result=&make_passwd_file($uname,$udom,$umode,$npass,$passfilename); # # If the current auth mode is internal, and the old auth mode was # unix, or krb*, and the user is an author for this domain, # re-run manage_permissions for that role in order to be able # to take ownership of the construction space back to www:www # - - + + + if( (($oldauth =~ /^unix/) && ($umode eq "internal")) || + (($oldauth =~ /^internal/) && ($umode eq "unix")) ) { + if(&is_author($udom, $uname)) { + &Debug(" Need to manage author permissions..."); + &manage_permissions("/$udom/_au", $udom, $uname, "$umode:"); + } + } &Reply($client, \$result, $userinput); } @@ -2396,17 +2177,6 @@ sub change_authentication_handler { } ®ister_handler("changeuserauth", \&change_authentication_handler, 1,1, 0); -sub update_passwd_history { - my ($uname,$udom,$umode,$context) = @_; - my $proname=&propath($udom,$uname); - my $now = time; - if (open(my $fh,">>$proname/passwd.log")) { - print $fh "$now:$umode:$context\n"; - close($fh); - } - return; -} - # # Determines if this is the home server for a user. The home server # for a user will have his/her lon-capa passwd file. Therefore all we need @@ -2499,12 +2269,8 @@ sub update_resource_handler { } alarm(0); if ($response->is_error()) { - my $reply=&Apache::lonnet::reply("unsub:$fname","$clientname"); - &devalidate_meta_cache($fname); - if (-e $transname) { - unlink($transname); - } - unlink($fname); +# FIXME: we should probably clean up here instead of just whine + unlink($transname); my $message=$response->status_line; &logthis("LWP GET: $message for $fname ($remoteurl)"); } else { @@ -2608,24 +2374,6 @@ sub fetch_user_file_handler { unlink($transname); &Failure($client, "failed\n", $userinput); } else { - if ($fname =~ /^default.+\.(page|sequence)$/) { - my ($major,$minor) = split(/\./,$clientversion); - if (($major < 2) || ($major == 2 && $minor < 11)) { - my $now = time; - &Apache::lonnet::do_cache_new('crschange',$udom.'_'.$uname,$now,600); - my $key = &escape('internal.contentchange'); - my $what = "$key=$now"; - my $hashref = &tie_user_hash($udom,$uname,'environment', - &GDBM_WRCREAT(),"P",$what); - if ($hashref) { - $hashref->{$key}=$now; - if (!&untie_user_hash($hashref)) { - &logthis("error: ".($!+0)." untie (GDBM) failed ". - "when updating internal.contentchange"); - } - } - } - } &Reply($client, "ok\n", $userinput); } } @@ -2662,20 +2410,11 @@ sub remove_user_file_handler { if (-e $file) { # # If the file is a regular file unlink is fine... - # However it's possible the client wants a dir - # removed, in which case rmdir is more appropriate - # Note: rmdir will only remove an empty directory. + # However it's possible the client wants a dir. + # removed, in which case rmdir is more approprate: # if (-f $file){ unlink($file); - # for html files remove the associated .bak file - # which may have been created by the editor. - if ($ufile =~ m{^((docs|supplemental)/(?:\d+|default)/\d+(?:|/.+)/)[^/]+\.x?html?$}i) { - my $path = $1; - if (-e $file.'.bak') { - unlink($file.'.bak'); - } - } } elsif(-d $file) { rmdir($file); } @@ -3038,10 +2777,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; } @@ -3293,8 +3028,7 @@ sub get_profile_entry { # # Parameters: # $cmd - Command keyword of request (eget). -# $tail - Tail of the command. See GetProfileEntry -# for more information about this. +# $tail - Tail of the command. See GetProfileEntry # for more information about this. # $client - File open on the client. # Returns: # 1 - Continue processing @@ -3515,6 +3249,9 @@ sub dump_profile_database { # range - optional range of entries # e.g., 10-20 would return the # 10th to 19th items, etc. +# extra - optional ref to hash of +# additional args. currently +# skipcheck is only key used. # $client - Channel open on the client. # Returns: # 1 - Continue processing. @@ -3524,12 +3261,133 @@ sub dump_profile_database { sub dump_with_regexp { my ($cmd, $tail, $client) = @_; - my $res = LONCAPA::Lond::dump_with_regexp($tail, $clientversion); - + #TODO encapsulate $clientname and $clientversion in a object. + my $res = LONCAPA::Lond::dump_with_regexp($cmd, $tail, $clientname, $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; + + my $userinput = "$cmd:$tail"; + + my ($udom,$uname,$namespace,$regexp,$range,$extra)=split(/:/,$tail); + if (defined($regexp)) { + $regexp=&unescape($regexp); + } else { + $regexp='.'; + } + my ($start,$end); + if (defined($range)) { + if ($range =~/^(\d+)\-(\d+)$/) { + ($start,$end) = ($1,$2); + } elsif ($range =~/^(\d+)$/) { + ($start,$end) = (0,$1); + } else { + undef($range); + } + } + my $hashref = &tie_user_hash($udom, $uname, $namespace, + &GDBM_READER()); + my $skipcheck; + if ($hashref) { + my $qresult=''; + my $count=0; +# +# When dump is for roles.db, determine if LON-CAPA version checking is needed. +# Sessions on 2.10 and later will include skipcheck => 1 in extra args ref, +# to indicate no version checking is needed (in this case, checking occurs +# on the server hosting the user session, when constructing the roles/courses +# screen). +# + if ($extra ne '') { + $extra = &Apache::lonnet::thaw_unescape($extra); + $skipcheck = $extra->{'skipcheck'}; + } + my @ids = &Apache::lonnet::current_machine_ids(); + my (%homecourses,$major,$minor,$now); +# +# If dump is for roles.db from a pre-2.10 server, determine the LON-CAPA +# version on the server which requested the data. 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. +# + if (($namespace eq 'roles') && (!$skipcheck)) { + my $loncaparev = $clientversion; + if ($loncaparev eq '') { + $loncaparev = $Apache::lonnet::loncaparevs{$clientname}; + } + if ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?/) { + $major = $1; + $minor = $2; + } + $now = time; + } + while (my ($key,$value) = each(%$hashref)) { + if ($namespace eq 'roles') { + if ($key =~ m{^/($LONCAPA::match_domain)/($LONCAPA::match_courseid)(/?[^_]*)_(cc|co|in|ta|ep|ad|st|cr)$}) { + my $cdom = $1; + my $cnum = $2; + unless ($skipcheck) { + my ($role,$roleend,$rolestart) = split(/\_/,$value); + if (!$roleend || $roleend > $now) { +# +# For active course roles, check that requesting server is running a LON-CAPA +# version which meets any version requirements for the course. Do not include +# the role amongst the results returned if the requesting server's version is +# too old. +# +# This determination is handled differently depending on whether the course's +# homeserver is the current server, or whether it is a different server. +# In both cases, the course's version requirement needs to be retrieved. +# + next unless (&releasereqd_check($cnum,$cdom,$key,$value,$major, + $minor,\%homecourses,\@ids)); + } + } + } + } + if ($regexp eq '.') { + $count++; + if (defined($range) && $count >= $end) { last; } + if (defined($range) && $count < $start) { next; } + $qresult.=$key.'='.$value.'&'; + } else { + my $unescapeKey = &unescape($key); + if (eval('$unescapeKey=~/$regexp/')) { + $count++; + if (defined($range) && $count >= $end) { last; } + if (defined($range) && $count < $start) { next; } + $qresult.="$key=$value&"; + } + } + } + if (&untie_user_hash($hashref)) { +# +# If dump is for roles.db from a pre-2.10 server, check if the LON-CAPA +# version requirements for courses for which the current server is the home +# server permit course roles to be usable on the client server hosting the +# user's session. If so, include those role results in the data returned to +# the client server. +# + if (($namespace eq 'roles') && (!$skipcheck)) { + if (keys(%homecourses) > 0) { + $qresult .= &check_homecourses(\%homecourses,$regexp,$count, + $range,$start,$end,$major,$minor); + } + } + chop($qresult); + &Reply($client, \$qresult, $userinput); + } else { + &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ". + "while attempting dump\n", $userinput); + } + } else { + &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ". + "while attempting dump\n", $userinput); } return 1; @@ -3546,9 +3404,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. # @@ -3557,47 +3412,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=''; @@ -3610,11 +3441,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); @@ -3876,37 +3703,6 @@ sub send_query_handler { my ($query,$arg1,$arg2,$arg3)=split(/\:/,$tail); $query=~s/\n*$//g; - if (($query eq 'usersearch') || ($query eq 'instdirsearch')) { - my $usersearchconf = &get_usersearch_config($currentdomainid,'directorysrch'); - my $earlyout; - if (ref($usersearchconf) eq 'HASH') { - if ($currentdomainid eq $clienthomedom) { - if ($query eq 'usersearch') { - if ($usersearchconf->{'lcavailable'} eq '0') { - $earlyout = 1; - } - } else { - if ($usersearchconf->{'available'} eq '0') { - $earlyout = 1; - } - } - } else { - if ($query eq 'usersearch') { - if ($usersearchconf->{'lclocalonly'}) { - $earlyout = 1; - } - } else { - if ($usersearchconf->{'localonly'}) { - $earlyout = 1; - } - } - } - } - if ($earlyout) { - &Reply($client, "query_not_authorized\n"); - return 1; - } - } &Reply($client, "". &sql_reply("$clientname\&$query". "\&$arg1"."\&$arg2"."\&$arg3")."\n", $userinput); @@ -4161,9 +3957,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: @@ -4177,7 +3971,7 @@ sub dump_course_id_handler { 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)) { @@ -4250,9 +4044,6 @@ sub dump_course_id_handler { } else { $creationcontext = '.'; } - unless ($hasuniquecode) { - $hasuniquecode = '.'; - } my $unpack = 1; if ($description eq '.' && $instcodefilter eq '.' && $ownerfilter eq '.' && $typefilter eq '.') { @@ -4341,9 +4132,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)) { @@ -4576,44 +4364,6 @@ sub course_lastaccess_handler { } ®ister_handler("courselastaccess",\&course_lastaccess_handler, 0, 1, 0); -sub course_sessions_handler { - my ($cmd, $tail, $client) = @_; - my $userinput = "$cmd:$tail"; - my ($cdom,$cnum,$lastactivity) = split(':',$tail); - my $dbsuffix = '_'.$cdom.'_'.$cnum.'.db'; - my (%sessions,$qresult); - my $now=time; - if (opendir(DIR,$perlvar{'lonIDsDir'})) { - my $filename; - while ($filename=readdir(DIR)) { - next if ($filename=~/^\./); - next if ($filename=~/^publicuser_/); - next if ($filename=~/^[a-f0-9]+_(linked|lti_\d+)\.id$/); - if ($filename =~ /^($LONCAPA::match_username)_\d+_($LONCAPA::match_domain)_/) { - my ($uname,$udom) = ($1,$2); - next unless (-e "$perlvar{'lonDaemons'}/tmp/$uname$dbsuffix"); - my $mtime = (stat("$perlvar{'lonIDsDir'}/$filename"))[9]; - if ($lastactivity < 0) { - next if ($mtime-$now > $lastactivity); - } else { - next if ($now-$mtime > $lastactivity); - } - $sessions{$uname.':'.$udom} = $mtime; - } - } - closedir(DIR); - } - foreach my $user (keys(%sessions)) { - $qresult.=&escape($user).'='.$sessions{$user}.'&'; - } - if ($qresult) { - chop($qresult); - } - &Reply($client, \$qresult, $userinput); - return 1; -} -®ister_handler("coursesessions",\&course_sessions_handler, 0, 1, 0); - # # Puts an unencrypted entry in a namespace db file at the domain level # @@ -4662,7 +4412,7 @@ sub put_domain_handler { # domain directory. # # Parameters: -# $cmd - Command request keyword (getdom). +# $cmd - Command request keyword (get). # $tail - Tail of the command. This is a colon separated list # consisting of the domain and the 'namespace' # which selects the gdbm file to do the lookup in, @@ -4679,14 +4429,28 @@ sub put_domain_handler { sub get_domain_handler { my ($cmd, $tail, $client) = @_; - my $userinput = "$cmd:$tail"; + + my $userinput = "$client:$tail"; my ($udom,$namespace,$what)=split(/:/,$tail,3); - my $res = LONCAPA::Lond::get_dom($userinput); - if ($res =~ /^error:/) { - &Failure($client, \$res, $userinput); + chomp($what); + my @queries=split(/\&/,$what); + my $qresult=''; + my $hashref = &tie_domain_hash($udom, "$namespace", &GDBM_READER()); + if ($hashref) { + for (my $i=0;$i<=$#queries;$i++) { + $qresult.="$hashref->{$queries[$i]}&"; + } + if (&untie_domain_hash($hashref)) { + $qresult=~s/\&$//; + &Reply($client, \$qresult, $userinput); + } else { + &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ". + "while attempting getdom\n",$userinput); + } } else { - &Reply($client, \$res, $userinput); + &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ". + "while attempting getdom\n",$userinput); } return 1; @@ -4790,49 +4554,6 @@ sub get_id_handler { } ®ister_handler("idget", \&get_id_handler, 0, 1, 0); -# Deletes one or more ids in a domain's id database. -# -# Parameters: -# $cmd - Command keyword (iddel). -# $tail - Command tail. In this case a colon -# separated list containing: -# The domain for which we are deleting the id(s). -# &-separated list of id(s) to delete. -# $client - File open on client socket. -# Returns: -# 1 - Continue processing -# 0 - Exit server. -# -# - -sub del_id_handler { - my ($cmd,$tail,$client) = @_; - - my $userinput = "$cmd:$tail"; - - my ($udom,$what)=split(/:/,$tail); - chomp($what); - my $hashref = &tie_domain_hash($udom, "ids", &GDBM_WRCREAT(), - "D", $what); - if ($hashref) { - my @keys=split(/\&/,$what); - foreach my $key (@keys) { - delete($hashref->{$key}); - } - if (&untie_user_hash($hashref)) { - &Reply($client, "ok\n", $userinput); - } else { - &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ". - "while attempting iddel\n", $userinput); - } - } else { - &Failure( $client, "error: ".($!+0)." tie(GDBM) Failed ". - "while attempting iddel\n", $userinput); - } - return 1; -} -®ister_handler("iddel", \&del_id_handler, 0, 1, 0); - # # Puts broadcast e-mail sent by Domain Coordinator in nohist_dcmail database # @@ -5118,23 +4839,15 @@ sub tmp_put_handler { } my ($id,$store); $tmpsnum++; - my $numtries = 0; - my $execdir=$perlvar{'lonDaemons'}; - if (($context eq 'resetpw') || ($context eq 'createaccount') || - ($context eq 'sso') || ($context eq 'link') || ($context eq 'retry')) { - $id = &md5_hex(&md5_hex(time.{}.rand().$$.$tmpsnum)); - while ((-e "$execdir/tmp/$id.tmp") && ($numtries <10)) { - undef($id); - $id = &md5_hex(&md5_hex(time.{}.rand().$$.$tmpsnum)); - $numtries ++; - } + if (($context eq 'resetpw') || ($context eq 'createaccount')) { + $id = &md5_hex(&md5_hex(time.{}.rand().$$)); } else { $id = $$.'_'.$clientip.'_'.$tmpsnum; } $id=~s/\W/\_/g; $record=~s/\n//g; - if (($id ne '') && - ($store=IO::File->new(">$execdir/tmp/$id.tmp"))) { + my $execdir=$perlvar{'lonDaemons'}; + if ($store=IO::File->new(">$execdir/tmp/$id.tmp")) { print $store $record; close $store; &Reply($client, \$id, $userinput); @@ -5217,116 +4930,6 @@ sub tmp_del_handler { ®ister_handler("tmpdel", \&tmp_del_handler, 0, 1, 0); # -# Process the updatebalcookie command. This command updates a -# cookie in the lonBalancedir directory on a load balancer node. -# -# Parameters: -# $cmd - Command that got us here. -# $tail - Tail of the request (escaped cookie: escaped current entry) -# -# $client - socket open on the client process. -# -# Returns: -# 1 - Indicating processing should continue. -# Side Effects: -# A cookie file is updated from the lonBalancedir directory -# A reply is sent to the client. -# -sub update_balcookie_handler { - my ($cmd, $tail, $client) = @_; - - my $userinput= "$cmd:$tail"; - chomp($tail); - my ($cookie,$lastentry) = map { &unescape($_) } (split(/:/,$tail)); - - my $updatedone; - if ($cookie =~ /^$LONCAPA::match_domain\_$LONCAPA::match_username\_[a-f0-9]{32}$/) { - my $execdir=$perlvar{'lonBalanceDir'}; - if (-e "$execdir/$cookie.id") { - my $doupdate; - if (open(my $fh,'<',"$execdir/$cookie.id")) { - while (my $line = <$fh>) { - chomp($line); - if ($line eq $lastentry) { - $doupdate = 1; - last; - } - } - close($fh); - } - if ($doupdate) { - if (open(my $fh,'>',"$execdir/$cookie.id")) { - print $fh $clientname; - close($fh); - $updatedone = 1; - } - } - } - } - if ($updatedone) { - &Reply($client, "ok\n", $userinput); - } else { - &Failure( $client, "error: ".($!+0)."file update failed ". - "while attempting updatebalcookie\n", $userinput); - } - return 1; -} -®ister_handler("updatebalcookie", \&update_balcookie_handler, 0, 1, 0); - -# -# Process the delbalcookie command. This command deletes a balancer -# cookie in the lonBalancedir directory on a load balancer node. -# -# Parameters: -# $cmd - Command that got us here. -# $cookie - Cookie to be deleted. -# $client - socket open on the client process. -# -# Returns: -# 1 - Indicating processing should continue. -# Side Effects: -# A cookie file is deleted from the lonBalancedir directory -# A reply is sent to the client. -sub del_balcookie_handler { - my ($cmd, $cookie, $client) = @_; - - my $userinput= "$cmd:$cookie"; - - chomp($cookie); - $cookie = &unescape($cookie); - my $deleted = ''; - if ($cookie =~ /^$LONCAPA::match_domain\_$LONCAPA::match_username\_[a-f0-9]{32}$/) { - my $execdir=$perlvar{'lonBalanceDir'}; - if (-e "$execdir/$cookie.id") { - if (open(my $fh,'<',"$execdir/$cookie.id")) { - my $dodelete; - while (my $line = <$fh>) { - chomp($line); - if ($line eq $clientname) { - $dodelete = 1; - last; - } - } - close($fh); - if ($dodelete) { - if (unlink("$execdir/$cookie.id")) { - $deleted = 1; - } - } - } - } - } - if ($deleted) { - &Reply($client, "ok\n", $userinput); - } else { - &Failure( $client, "error: ".($!+0)."Unlinking cookie file Failed ". - "while attempting delbalcookie\n", $userinput); - } - return 1; -} -®ister_handler("delbalcookie", \&del_balcookie_handler, 0, 1, 0); - -# # Processes the setannounce command. This command # creates a file named announce.txt in the top directory of # the documentn root and sets its contents. The announce.txt file is @@ -5499,49 +5102,15 @@ sub validate_instcode_handler { my ($dom,$instcode,$owner) = split(/:/, $tail); $instcode = &unescape($instcode); $owner = &unescape($owner); - my ($outcome,$description,$credits) = + my ($outcome,$description) = &localenroll::validate_instcode($dom,$instcode,$owner); - my $result = &escape($outcome).'&'.&escape($description).'&'. - &escape($credits); + my $result = &escape($outcome).'&'.&escape($description); &Reply($client, \$result, $userinput); return 1; } ®ister_handler("autovalidateinstcode", \&validate_instcode_handler, 0, 1, 0); -# -# Validate co-owner for cross-listed institutional code and -# institutional course code itself used for a LON-CAPA course. -# -# Formal Parameters: -# $cmd - The command request that got us dispatched. -# $tail - The tail of the command. In this case, -# this is a colon separated string containing: -# $dom - Course's LON-CAPA domain -# $instcode - Institutional course code for the course -# $inst_xlist - Institutional course Id for the crosslisting -# $coowner - Username of co-owner -# (values for all but $dom have been escaped). -# -# $client - Socket open on the client. -# Returns: -# 1 - Indicating processing should continue. -# -sub validate_instcrosslist_handler { - my ($cmd, $tail, $client) = @_; - my $userinput = "$cmd:$tail"; - my ($dom,$instcode,$inst_xlist,$coowner) = split(/:/,$tail); - $instcode = &unescape($instcode); - $inst_xlist = &unescape($inst_xlist); - $coowner = &unescape($coowner); - my $outcome = &localenroll::validate_crosslist_access($dom,$instcode, - $inst_xlist,$coowner); - &Reply($client, \$outcome, $userinput); - - return 1; -} -®ister_handler("autovalidateinstcrosslist", \&validate_instcrosslist_handler, 0, 1, 0); - # Get the official sections for which auto-enrollment is possible. # Since the admin people won't know about 'unofficial sections' # we cannot auto-enroll on them. @@ -5638,10 +5207,9 @@ sub validate_course_section_handler { # Formal Parameters: # $cmd - The command request that got us dispatched. # $tail - The tail of the command. In this case this is a colon separated -# set of values that will be split into: +# set of words that will be split into: # $inst_class - Institutional code for the specific class section -# $ownerlist - An escaped comma-separated list of username:domain -# of the course owner, and co-owner(s). +# $courseowner - The escaped username:domain of the course owner # $cdom - The domain of the course from the institution's # point of view. # $client - The socket open on the client. @@ -5666,112 +5234,6 @@ sub validate_class_access_handler { ®ister_handler("autovalidateclass_sec", \&validate_class_access_handler, 0, 1, 0); # -# Modify institutional sections (using customized &instsec_reformat() -# routine in localenroll.pm), to either clutter or declutter, for -# purposes of ensuring an institutional course section (string) can -# be unambiguously separated into institutional course and section. -# -# Formal Parameters: -# $cmd - The command request that got us dispatched. -# $tail - The tail of the command. In this case this is a colon separated -# set of values that will be split into: -# $cdom - The LON-CAPA domain of the course. -# $action - Either: clutter or declutter -# clutter adds character(s) to eliminate ambiguity -# declutter removes the added characters (e.g., for -# display of the institutional course section string. -# $info - A frozen hash in which keys are: -# LON-CAPA course number:Institutional course code -# and values are a reference to an array of the -# items to modify -- either institutional sections, -# or institutional course sections (for crosslistings). -# $client - The socket open on the client. -# Returns: -# 1 - continue processing. -# - -sub instsec_reformat_handler { - my ($cmd, $tail, $client) = @_; - my $userinput = "$cmd:$tail"; - my ($cdom,$action,$info) = split(/:/,$tail); - my $instsecref = &Apache::lonnet::thaw_unescape($info); - my ($outcome,$result); - eval { - local($SIG{__DIE__})='DEFAULT'; - $outcome=&localenroll::instsec_reformat($cdom,$action,$instsecref); - if ($outcome eq 'ok') { - if (ref($instsecref) eq 'HASH') { - foreach my $key (keys(%{$instsecref})) { - $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($instsecref->{$key}).'&'; - } - $result =~ s/\&$//; - } - } - }; - if (!$@) { - if ($outcome eq 'ok') { - &Reply( $client, \$result, $userinput); - } else { - &Reply($client,\$outcome, $userinput); - } - } else { - &Failure($client,"unknown_cmd\n",$userinput); - } - return 1; -} -®ister_handler("autoinstsecreformat",\&instsec_reformat_handler, 0, 1, 0); - -# -# Validate course owner or co-owners(s) access to enrollment data for all sections -# and crosslistings for a particular course. -# -# -# Formal Parameters: -# $cmd - The command request that got us dispatched. -# $tail - The tail of the command. In this case this is a colon separated -# set of values that will be split into: -# $ownerlist - An escaped comma-separated list of username:domain -# of the course owner, and co-owner(s). -# $cdom - The domain of the course from the institution's -# point of view. -# $classes - Frozen hash of institutional course sections and -# crosslistings. -# $client - The socket open on the client. -# Returns: -# 1 - continue processing. -# - -sub validate_classes_handler { - my ($cmd, $tail, $client) = @_; - my $userinput = "$cmd:$tail"; - my ($ownerlist,$cdom,$classes) = split(/:/, $tail); - my $classesref = &Apache::lonnet::thaw_unescape($classes); - my $owners = &unescape($ownerlist); - my $result; - eval { - local($SIG{__DIE__})='DEFAULT'; - my %validations; - my $response = &localenroll::check_instclasses($owners,$cdom,$classesref, - \%validations); - if ($response eq 'ok') { - foreach my $key (keys(%validations)) { - $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($validations{$key}).'&'; - } - $result =~ s/\&$//; - } else { - $result = 'error'; - } - }; - if (!$@) { - &Reply($client, \$result, $userinput); - } else { - &Failure($client,"unknown_cmd\n",$userinput); - } - return 1; -} -®ister_handler("autovalidateinstclasses", \&validate_classes_handler, 0, 1, 0); - -# # Create a password for a new LON-CAPA user added by auto-enrollment. # Only used for case where authentication method for new user is localauth # @@ -5806,59 +5268,13 @@ sub create_auto_enroll_password_handler ®ister_handler("autocreatepassword", \&create_auto_enroll_password_handler, 0, 1, 0); -sub auto_export_grades_handler { - my ($cmd, $tail, $client) = @_; - my $userinput = "$cmd:$tail"; - my ($cdom,$cnum,$info,$data) = split(/:/,$tail); - my $inforef = &Apache::lonnet::thaw_unescape($info); - my $dataref = &Apache::lonnet::thaw_unescape($data); - my ($outcome,$result);; - eval { - local($SIG{__DIE__})='DEFAULT'; - my %rtnhash; - $outcome=&localenroll::export_grades($cdom,$cnum,$inforef,$dataref,\%rtnhash); - if ($outcome eq 'ok') { - foreach my $key (keys(%rtnhash)) { - $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rtnhash{$key}).'&'; - } - $result =~ s/\&$//; - } - }; - if (!$@) { - if ($outcome eq 'ok') { - if ($cipher) { - my $cmdlength=length($result); - $result.=" "; - my $encresult=''; - for (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) { - $encresult.= unpack("H16", - $cipher->encrypt(substr($result, - $encidx, - 8))); - } - &Reply( $client, "enc:$cmdlength:$encresult\n", $userinput); - } else { - &Failure( $client, "error:no_key\n", $userinput); - } - } else { - &Reply($client, "$outcome\n", $userinput); - } - } else { - &Failure($client,"export_error\n",$userinput); - } - return 1; -} -®ister_handler("autoexportgrades", \&auto_export_grades_handler, - 1, 1, 0); - - # Retrieve and remove temporary files created by/during autoenrollment. # # Formal Parameters: # $cmd - The command that got us dispatched. # $tail - The tail of the command. In our case this is a colon # separated list that will be split into: -# $filename - The name of the file to retrieve. +# $filename - The name of the file to remove. # The filename is given as a path relative to # the LonCAPA temp file directory. # $client - Socket open on the client. @@ -5872,11 +5288,7 @@ sub retrieve_auto_file_handler { my ($filename) = split(/:/, $tail); my $source = $perlvar{'lonDaemons'}.'/tmp/'.$filename; - if ($filename =~m{/\.\./}) { - &Failure($client, "refused\n", $userinput); - } elsif ($filename !~ /^$LONCAPA::match_domain\_$LONCAPA::match_courseid\_.+_classlist\.xml$/) { - &Failure($client, "refused\n", $userinput); - } elsif ( (-e $source) && ($filename ne '') ) { + if ( (-e $source) && ($filename ne '') ) { my $reply = ''; if (open(my $fh,$source)) { while (<$fh>) { @@ -5908,7 +5320,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; @@ -5935,20 +5347,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); @@ -5959,53 +5370,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 createdcustomized createdactions queuedweb queuedmsg formitems reviewweb validationjs onload javascript); - 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: @@ -6713,6 +6077,18 @@ sub lcpasswdstrerror { } } +# +# Convert an error return code from lcuseradd to a string value: +# +sub lcuseraddstrerror { + my $ErrorCode = shift; + if(($ErrorCode < 0) || ($ErrorCode > $lastadderror)) { + return "lcuseradd - Unrecognized error code: ".$ErrorCode; + } else { + return $adderrors[$ErrorCode]; + } +} + # grabs exception and records it to log before exiting sub catchexception { my ($error)=@_; @@ -6749,8 +6125,8 @@ my $wwwid=getpwnam('www'); if ($wwwid!=$<) { my $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}"; my $subj="LON: $currenthostid User ID mismatch"; - system("echo 'User ID mismatch. lond must be run as user www.' |". - " mail -s '$subj' $emailto > /dev/null"); + system("echo 'User ID mismatch. lond must be run as user www.' |\ + mailto $emailto -s '$subj' > /dev/null"); exit 1; } @@ -6953,6 +6329,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)) { @@ -7198,28 +6577,10 @@ sub make_new_child { # my $tmpsnum=0; # Now global #---------------------------------------------------- kerberos 5 initialization &Authen::Krb5::init_context(); - - my $no_ets; - if ($dist =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\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')) { + &Authen::Krb5::init_ets(); + } &status('Accepted connection'); # ============================================================================= @@ -7263,12 +6624,6 @@ sub make_new_child { # If the remote is attempting a local init... give that a try: # (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}; # If the connection type is ssl, but I didn't get my # certificate files yet, then I'll drop back to @@ -7333,6 +6688,7 @@ sub make_new_child { ."Attempted insecure connection disallowed "); close $client; $clientok = 0; + } } } else { @@ -7341,6 +6697,7 @@ sub make_new_child { ."$clientip failed to initialize: >$remotereq< "); &status('No init '.$clientip); } + } else { &logthis( "WARNING: Unknown client $clientip"); @@ -7366,7 +6723,7 @@ sub make_new_child { Debug("Main: Got $user_input\n"); $keep_going = &process_request($user_input); alarm(0); - &status('Listening to '.$clientname." ($keymode)"); + &status('Listening to '.$clientname." ($keymode)"); } # --------------------------------------------- client unknown or fishy, refuse @@ -7382,8 +6739,8 @@ sub make_new_child { &logthis("CRITICAL: " ."Disconnect from $clientip ($clientname)"); - - + + # this exit is VERY important, otherwise the child will become # a producer of more and more children, forking yourself into # process death. @@ -7498,25 +6855,15 @@ sub password_filename { # domain - domain of the user. # name - User's name. # contents - New contents of the file. -# saveold - (optional). If true save old file in a passwd.bak file. # Returns: # 0 - Failed. # 1 - Success. # sub rewrite_password_file { - my ($domain, $user, $contents, $saveold) = @_; + my ($domain, $user, $contents) = @_; my $file = &password_filename($domain, $user); if (defined $file) { - if ($saveold) { - my $bakfile = $file.'.bak'; - if (CopyFile($file,$bakfile)) { - chmod(0400,$bakfile); - &logthis("Old password saved in passwd.bak for internally authenticated user: $user:$domain"); - } else { - &logthis("Failed to save old password in passwd.bak for internally authenticated user: $user:$domain"); - } - } my $pf = IO::File->new(">$file"); if($pf) { print $pf "$contents\n"; @@ -7607,28 +6954,10 @@ sub validate_user { $contentpwd = $domdefaults{'auth_arg_def'}; } } - } + } if ($howpwd ne 'nouser') { if($howpwd eq "internal") { # Encrypted is in local password file. - if (length($contentpwd) == 13) { - $validated = (crypt($password,$contentpwd) eq $contentpwd); - if ($validated) { - my %domdefaults = &Apache::lonnet::get_domain_defaults($domain); - if ($domdefaults{'intauth_switch'}) { - my $ncpass = &hash_passwd($domain,$password); - my $saveold; - if ($domdefaults{'intauth_switch'} == 2) { - $saveold = 1; - } - if (&rewrite_password_file($domain,$user,"$howpwd:$ncpass",$saveold)) { - &update_passwd_history($user,$domain,$howpwd,'conversion'); - &logthis("Validated password hashed with bcrypt for $user:$domain"); - } - } - } - } else { - $validated = &check_internal_passwd($password,$contentpwd,$domain,$user); - } + $validated = (crypt($password, $contentpwd) eq $contentpwd); } elsif ($howpwd eq "unix") { # User is a normal unix user. $contentpwd = (getpwnam($user))[1]; @@ -7696,50 +7025,6 @@ sub validate_user { return $validated; } -sub check_internal_passwd { - my ($plainpass,$stored,$domain,$user) = @_; - my (undef,$method,@rest) = split(/!/,$stored); - if ($method eq 'bcrypt') { - my $result = &hash_passwd($domain,$plainpass,@rest); - if ($result ne $stored) { - return 0; - } - my %domdefaults = &Apache::lonnet::get_domain_defaults($domain); - if ($domdefaults{'intauth_check'}) { - # Upgrade to a larger number of rounds if necessary - my $defaultcost = $domdefaults{'intauth_cost'}; - if (($defaultcost eq '') || ($defaultcost =~ /D/)) { - $defaultcost = 10; - } - if (int($rest[0])new(">$passfilename"); if ($pf) { print $pf "$umode:$npass\n"; - &update_passwd_history($uname,$udom,$umode,$action); } else { $result = "pass_file_failed_error"; } } } elsif ($umode eq 'internal') { - my $ncpass = &hash_passwd($udom,$npass); + my $salt=time; + $salt=substr($salt,6,2); + my $ncpass=crypt($npass,$salt); { &Debug("Creating internal auth"); my $pf = IO::File->new(">$passfilename"); if($pf) { print $pf "internal:$ncpass\n"; - &update_passwd_history($uname,$udom,$umode,$action); } else { $result = "pass_file_failed_error"; } @@ -8084,14 +7369,61 @@ sub make_passwd_file { my $pf = IO::File->new(">$passfilename"); if($pf) { print $pf "localauth:$npass\n"; - &update_passwd_history($uname,$udom,$umode,$action); } else { $result = "pass_file_failed_error"; } } } elsif ($umode eq 'unix') { - &logthis(">>>Attempt to create unix account blocked -- unix auth not available for new users."); - $result="no_new_unix_accounts"; + { + # + # Don't allow the creation of privileged accounts!!! that would + # be real bad!!! + # + my $uid = getpwnam($uname); + if((defined $uid) && ($uid == 0)) { + &logthis(">>>Attempt to create privileged account blocked"); + return "no_priv_account_error\n"; + } + + my $execpath ="$perlvar{'lonDaemons'}/"."lcuseradd"; + + my $lc_error_file = $execdir."/tmp/lcuseradd".$$.".status"; + { + &Debug("Executing external: ".$execpath); + &Debug("user = ".$uname.", Password =". $npass); + my $se = IO::File->new("|$execpath > $perlvar{'lonDaemons'}/logs/lcuseradd.log"); + print $se "$uname\n"; + print $se "$udom\n"; + print $se "$npass\n"; + print $se "$npass\n"; + print $se "$lc_error_file\n"; # Status -> unique file. + } + if (-r $lc_error_file) { + &Debug("Opening error file: $lc_error_file"); + my $error = IO::File->new("< $lc_error_file"); + my $useraddok = <$error>; + $error->close; + unlink($lc_error_file); + + chomp $useraddok; + + if($useraddok > 0) { + my $error_text = &lcuseraddstrerror($useraddok); + &logthis("Failed lcuseradd: $error_text"); + $result = "lcuseradd_failed:$error_text"; + } else { + my $pf = IO::File->new(">$passfilename"); + if($pf) { + print $pf "unix:\n"; + } else { + $result = "pass_file_failed_error"; + } + } + } else { + &Debug("Could not locate lcuseradd error: $lc_error_file"); + $result="bug_lcuseradd_no_output_file"; + } + } } elsif ($umode eq 'none') { { my $pf = IO::File->new("> $passfilename"); @@ -8155,19 +7487,235 @@ sub get_usersession_config { return; } -sub get_usersearch_config { - my ($dom,$name) = @_; - my ($usersearchconf,$cached)=&Apache::lonnet::is_cached_new($name,$dom); +# +# releasereqd_check() will determine if a LON-CAPA version (defined in the +# $major,$minor args passed) is not too old to allow use of a role in a +# course ($cnum,$cdom args passed), if at least one of the following applies: +# (a) the course is a Community, (b) the course's home server is *not* the +# current server, or (c) cached course information is not stale. +# +# For the case where none of these apply, the course is added to the +# $homecourse hash ref (keys = courseIDs, values = array of a hash of roles). +# The $homecourse hash ref is for courses for which the current server is the +# home server. LON-CAPA version requirements are checked elsewhere for the +# items in $homecourse. +# + +sub releasereqd_check { + my ($cnum,$cdom,$key,$value,$major,$minor,$homecourses,$ids) = @_; + my $home = &Apache::lonnet::homeserver($cnum,$cdom); + return if ($home eq 'no_host'); + my ($reqdmajor,$reqdminor,$displayrole); + if ($cnum =~ /$LONCAPA::match_community/) { + if ($major eq '' && $minor eq '') { + return unless ((ref($ids) eq 'ARRAY') && + (grep(/^\Q$home\E$/,@{$ids}))); + } else { + $reqdmajor = 2; + $reqdminor = 9; + return unless (&useable_role($reqdmajor,$reqdminor,$major,$minor)); + } + } + my $hashid = $cdom.':'.$cnum; + my ($courseinfo,$cached) = + &Apache::lonnet::is_cached_new('courseinfo',$hashid); if (defined($cached)) { - return $usersearchconf; + if (ref($courseinfo) eq 'HASH') { + if (exists($courseinfo->{'releaserequired'})) { + my ($reqdmajor,$reqdminor) = split(/\./,$courseinfo->{'releaserequired'}); + return unless (&useable_role($reqdmajor,$reqdminor,$major,$minor)); + } + } + } else { + if (ref($ids) eq 'ARRAY') { + if (grep(/^\Q$home\E$/,@{$ids})) { + if (ref($homecourses) eq 'HASH') { + if (ref($homecourses->{$cdom}) eq 'HASH') { + if (ref($homecourses->{$cdom}{$cnum}) eq 'HASH') { + if (ref($homecourses->{$cdom}{$cnum}) eq 'ARRAY') { + push(@{$homecourses->{$cdom}{$cnum}},{$key=>$value}); + } else { + $homecourses->{$cdom}{$cnum} = [{$key=>$value}]; + } + } else { + $homecourses->{$cdom}{$cnum} = [{$key=>$value}]; + } + } else { + $homecourses->{$cdom}{$cnum} = [{$key=>$value}]; + } + } + return; + } + } + my $courseinfo = &get_courseinfo_hash($cnum,$cdom,$home); + if (ref($courseinfo) eq 'HASH') { + if (exists($courseinfo->{'releaserequired'})) { + my ($reqdmajor,$reqdminor) = split(/\./,$courseinfo->{'releaserequired'}); + return unless (&useable_role($reqdmajor,$reqdminor,$major,$minor)); + } + } else { + return; + } + } + return 1; +} + +# +# get_courseinfo_hash() is used to retrieve course information from the db +# file: nohist_courseids.db for a course for which the current server is *not* +# the home server. +# +# A hash of a hash will be retrieved. The outer hash contains a single key -- +# courseID -- for the course for which the data are being requested. +# The contents of the inner hash, for that single item in the outer hash +# are returned (and cached in memcache for 10 minutes). +# + +sub get_courseinfo_hash { + my ($cnum,$cdom,$home) = @_; + my %info; + eval { + local($SIG{ALRM}) = sub { die "timeout\n"; }; + local($SIG{__DIE__})='DEFAULT'; + alarm(3); + %info = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,1,[$home],'.'); + alarm(0); + }; + if ($@) { + if ($@ eq "timeout\n") { + &logthis("WARNING courseiddump for $cnum:$cdom from $home timedout"); + } else { + &logthis("WARNING unexpected error during eval of call for courseiddump from $home"); + } } else { - my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$dom); - &Apache::lonnet::do_cache_new($name,$dom,$domconfig{'directorysrch'},3600); - return $domconfig{'directorysrch'}; + if (ref($info{$cdom.'_'.$cnum}) eq 'HASH') { + my $hashid = $cdom.':'.$cnum; + return &Apache::lonnet::do_cache_new('courseinfo',$hashid,$info{$cdom.'_'.$cnum},600); + } } return; } +# +# check_homecourses() will retrieve course information for those courses which +# are keys of the $homecourses hash ref (first arg). The nohist_courseids.db +# GDBM file is tied and course information for each course retrieved. Last +# visit (lasttime key) is also retrieved for each, and cached values updated +# for any courses last visited less than 24 hours ago. Cached values are also +# updated for any courses included in the $homecourses hash ref. +# +# The reason for the 24 hours constraint is that the cron entry in +# /etc/cron.d/loncapa for /home/httpd/perl/refresh_courseids_db.pl causes +# cached course information to be updated nightly for courses with activity +# within the past 24 hours. +# +# Role information for the user (included in a ref to an array of hashes as the +# value for each key in $homecourses) is appended to the result returned by the +# routine, which will in turn be appended to the string returned to the client +# hosting the user's session. +# + +sub check_homecourses { + my ($homecourses,$regexp,$count,$range,$start,$end,$major,$minor) = @_; + my ($result,%addtocache); + my $yesterday = time - 24*3600; + if (ref($homecourses) eq 'HASH') { + my (%okcourses,%courseinfo,%recent); + foreach my $domain (keys(%{$homecourses})) { + my $hashref = + &tie_domain_hash($domain, "nohist_courseids", &GDBM_WRCREAT()); + if (ref($hashref) eq 'HASH') { + while (my ($key,$value) = each(%$hashref)) { + my $unesc_key = &unescape($key); + if ($unesc_key =~ /^lasttime:(\w+)$/) { + my $cid = $1; + $cid =~ s/_/:/; + if ($value > $yesterday ) { + $recent{$cid} = 1; + } + next; + } + my $items = &Apache::lonnet::thaw_unescape($value); + if (ref($items) eq 'HASH') { + my ($cdom,$cnum) = split(/_/,$unesc_key); + my $hashid = $cdom.':'.$cnum; + $courseinfo{$hashid} = $items; + if (ref($homecourses->{$cdom}{$cnum}) eq 'ARRAY') { + my ($reqdmajor,$reqdminor) = split(/\./,$items->{'releaserequired'}); + if (&useable_role($reqdmajor,$reqdminor,$major,$minor)) { + $okcourses{$hashid} = 1; + } + } + } + } + unless (&untie_domain_hash($hashref)) { + &logthis("Failed to untie tied hash for nohist_courseids.db for $domain"); + } + } else { + &logthis("Failed to tie hash for nohist_courseids.db for $domain"); + } + } + foreach my $hashid (keys(%recent)) { + my ($result,$cached)=&Apache::lonnet::is_cached_new('courseinfo',$hashid); + unless ($cached) { + &Apache::lonnet::do_cache_new('courseinfo',$hashid,$courseinfo{$hashid},600); + } + } + foreach my $cdom (keys(%{$homecourses})) { + if (ref($homecourses->{$cdom}) eq 'HASH') { + foreach my $cnum (keys(%{$homecourses->{$cdom}})) { + my $hashid = $cdom.':'.$cnum; + next if ($recent{$hashid}); + &Apache::lonnet::do_cache_new('courseinfo',$hashid,$courseinfo{$hashid},600); + } + } + } + foreach my $hashid (keys(%okcourses)) { + my ($cdom,$cnum) = split(/:/,$hashid); + if ((ref($homecourses->{$cdom}) eq 'HASH') && + (ref($homecourses->{$cdom}{$cnum}) eq 'ARRAY')) { + foreach my $role (@{$homecourses->{$cdom}{$cnum}}) { + if (ref($role) eq 'HASH') { + while (my ($key,$value) = each(%{$role})) { + if ($regexp eq '.') { + $count++; + if (defined($range) && $count >= $end) { last; } + if (defined($range) && $count < $start) { next; } + $result.=$key.'='.$value.'&'; + } else { + my $unescapeKey = &unescape($key); + if (eval('$unescapeKey=~/$regexp/')) { + $count++; + if (defined($range) && $count >= $end) { last; } + if (defined($range) && $count < $start) { next; } + $result.="$key=$value&"; + } + } + } + } + } + } + } + } + return $result; +} + +# +# useable_role() will compare the LON-CAPA version required by a course with +# the version available on the client server. If the client server's version +# is compatible, 1 will be returned. +# + +sub useable_role { + my ($reqdmajor,$reqdminor,$major,$minor) = @_; + if ($reqdmajor ne '' && $reqdminor ne '') { + return if (($major eq '' && $minor eq '') || + ($major < $reqdmajor) || + (($major == $reqdmajor) && ($minor < $reqdminor))); + } + return 1; +} + sub distro_and_arch { return $dist.':'.$arch; } @@ -8379,7 +7927,7 @@ Place in B stores hash in namespace -=item rolesput +=item rolesputy put a role into a user's environment @@ -8496,6 +8044,8 @@ Authen::Krb5 =head1 COREQUISITES +none + =head1 OSNAMES linux @@ -8583,9 +8133,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 @@ -8704,7 +8254,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 @@ -8733,7 +8283,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 @@ -8817,7 +8367,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 ------ @@ -8831,7 +8381,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. @@ -8842,7 +8392,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 @@ -8892,7 +8442,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.