loncom/lond - diff - 1.489.2.43

Return to lond CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lond between versions 1.489.2.3 and 1.489.2.43

-version 1.489.2.3, 2013/03/02 03:31:10
+version 1.489.2.43, 2021/12/21 16:22:14
  Line 15
  #
  # 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.
  #
- Line 34  use strict;
+ Line 33  use strict;
  use lib '/home/httpd/lib/perl/';
  use LONCAPA;
  use LONCAPA::Configuration;
+ use LONCAPA::Lond;
  use IO::Socket;
  use IO::File;
  Line 54  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.
- Line 129  my @passwderrors = ("ok",
+ Line 132  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 file name does not exist",
+ 		     "Source filename does not exist",
- 		     "Destination file name does not exist",
+ 		     "Destination filename does not exist",
  		     "Some file operation failed",
  		     "Invalid table filename."
  		     );
- Line 639  sub ConfigFileFromSelector {
+ Line 623  sub ConfigFileFromSelector {
  #     String to send to client ("ok" or "refused" if bad file).
  #
  sub PushFile {
      my $request = shift;
      my ($command, $filename, $contents) = split(":", $request, 3);
      &Debug("PushFile");
- Line 669  sub PushFile {
+ Line 653  sub PushFile {
      if($filename eq "host") {
  	$contents = AdjustHostContents($contents);
+     } elsif ($filename eq 'dns_host' || $filename eq 'dns_domain') {
+         if ($contents eq '') {
+             &logthis('<font color="red"> Pushfile: unable to install '
+                     .$tablefile." - no data received from push. </font>");
+             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('<font color="red"> Pushfile: unable to install '
+                             .$tablefile." - error attempting to pull data. </font>");
+                     return 'error: pull failed';
+                 } else {
+                     my $result = $response->content;
+                     chomp($result);
+                     unless ($result eq $contents) {
+                         &logthis('<font color="red"> Pushfile: unable to install '
+                                 .$tablefile." - pushed data and pulled data differ. </font>");
+                         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:
- Line 1402  sub du2_handler {
+ Line 1424  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/<domain>
+ #        (b) /home/httpd/html/userfiles/
+ #        (c) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/userfiles
+ #    or is:
+ #
+ #    2. for a file, and the path (after prepending) does not begin with one of:
+ #        (a) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/
+ #        (b) /home/httpd/html/res/<domain>/<username>/
+ #        (c) /home/httpd/html/userfiles/<domain>/<username>/
+ #
+ #    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
- Line 1423  sub ls_handler {
+ Line 1461  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);
- Line 1448  sub ls_handler {
+ Line 1495  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).':';
  	}
- Line 1472  sub ls_handler {
+ Line 1524  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/<domain>
+ #        (b) /home/httpd/html/userfiles/
+ #        (c) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/userfiles
+ #    or is:
+ #
+ #    2. for a file, and the path (after prepending) does not begin with one of:
+ #        (a) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/
+ #        (b) /home/httpd/html/res/<domain>/<username>/
+ #        (c) /home/httpd/html/userfiles/<domain>/<username>/
+ #
+ #    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
- Line 1492  sub ls2_handler {
+ Line 1560  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);
- Line 1518  sub ls2_handler {
+ Line 1595  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).':';
          }
- Line 1534  sub ls2_handler {
+ Line 1616  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/<domain>
+ #        (b) /home/httpd/html/userfiles/
+ #        (c) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/userfiles
+ #        (d) /home/httpd/html/priv/<domain> 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/<domain>/<1>/<2>/<3>/<username>/
+ #        (b) /home/httpd/html/res/<domain>/<username>/
+ #        (c) /home/httpd/html/userfiles/<domain>/<username>/
+ #        (d) /home/httpd/html/priv/<domain>/<username>/ 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.
- Line 1573  sub ls3_handler {
+ Line 1674  sub ls3_handler {
      }
      my $dir_root = $perlvar{'lonDocRoot'};
-     if ($getpropath) {
+     if (($getpropath) || ($getuserdir)) {
          if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) {
              $dir_root = &propath($udom,$uname);
              $dir_root =~ s/\/$//;
          } else {
-             &Failure($client,"refused\n","$cmd:$tail");
+             &Failure($client,"refused\n",$userinput);
-             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 '') {
- Line 1601  sub ls3_handler {
+ Line 1692  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);
- Line 1631  sub ls3_handler {
+ Line 1738  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).':';
          }
- Line 1681  sub read_lonnet_global {
+ Line 1795  sub read_lonnet_global {
                  }
                  if ($what eq 'perlvar') {
                      if (!exists($packagevars{$what}{'lonBalancer'})) {
-                         if ($dist =~ /^(centos|rhes|fedora|scientific)/) {
+                         if ($dist =~ /^(centos|rhes|fedora|scientific|oracle|rocky|alma)/) {
                              my $othervarref=LONCAPA::Configuration::read_conf('httpd.conf');
                              if (ref($othervarref) eq 'HASH') {
                                  $items->{'lonBalancer'} = $othervarref->{'lonBalancer'};
- Line 1703  sub read_lonnet_global {
+ Line 1817  sub read_lonnet_global {
  sub server_devalidatecache_handler {
      my ($cmd,$tail,$client) = @_;
      my $userinput = "$cmd:$tail";
-     my ($name,$id) = map { &unescape($_); } split(/:/,$tail);
+     my $items = &unescape($tail);
-     &Apache::lonnet::devalidate_cache_new($name,$id);
+     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 $result = 'ok';
      &Reply($client,\$result,$userinput);
      return 1;
- Line 1900  sub authenticate_handler {
+ Line 2020  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') {
- Line 1987  sub change_password_handler {
+ Line 2107  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 $salt=time;
+             my $ncpass = &hash_passwd($udom,$npass);
- 	    $salt=substr($salt,6,2);
+             my (undef,$method,@rest) = split(/!/,$contentpwd);
- 	    my $ncpass=crypt($npass,$salt);
+             if ($method eq 'bcrypt') {
- 	    if(&rewrite_password_file($udom, $uname, "internal:$ncpass")) {
+                 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 $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 "
- Line 2008  sub change_password_handler {
+ Line 2199  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);
- Line 2018  sub change_password_handler {
+ Line 2212  sub change_password_handler {
  	    #
  	    &Failure( $client, "auth_mode_error\n", $userinput);
  	}
      } else {
  	if ($failure eq '') {
  	    $failure = 'non_authorized';
- Line 2030  sub change_password_handler {
+ Line 2223  sub change_password_handler {
  }
  &register_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
- Line 2073  sub add_user_handler {
+ Line 2298  sub add_user_handler {
  		    ."makeuser";
  	    }
  	    unless ($fperror) {
- 		my $result=&make_passwd_file($uname,$udom,$umode,$npass, $passfilename);
+ 		my $result=&make_passwd_file($uname,$udom,$umode,$npass,
+                                              $passfilename,'makeuser');
  		&Reply($client,\$result, $userinput);     #BUGBUG - could be fail
  	    } else {
  		&Failure($client, \$fperror, $userinput);
- Line 2134  sub change_authentication_handler {
+ Line 2360  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 run
+ 	    # passwd since otherwise make_passwd_file will fail as
- 	    # lcuseradd which fails if an account already exists
+ 	    # creation of unix authenticated users is no longer supported
- 	    # (to prevent an unscrupulous LONCAPA admin from stealing
+             # except from the command line, when running make_domain_coordinator.pl
- 	    # 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);
+ 		my $result=&make_passwd_file($uname,$udom,$umode,$npass,
+                                              $passfilename,'changeuserauth');
  		#
  		#  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);
  	    }
- Line 2176  sub change_authentication_handler {
+ Line 2396  sub change_authentication_handler {
  }
  &register_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
- Line 2268  sub update_resource_handler {
+ Line 2499  sub update_resource_handler {
  		}
  		alarm(0);
  		if ($response->is_error()) {
- # FIXME: we should probably clean up here instead of just whine
+                     my $reply=&Apache::lonnet::reply("unsub:$fname","$clientname");
- 		    unlink($transname);
+                     &devalidate_meta_cache($fname);
+                     if (-e $transname) {
+                         unlink($transname);
+                     }
+                     unlink($fname);
  		    my $message=$response->status_line;
  		    &logthis("LWP GET: $message for $fname ($remoteurl)");
  		} else {
- Line 2427  sub remove_user_file_handler {
+ Line 2662  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.
+ 		#   However it's possible the client wants a dir
- 		#   removed, in which case rmdir is more approprate:
+ 		#   removed, in which case rmdir is more appropriate
+ 	        #   Note: rmdir will only remove an empty directory.
  		#
  	        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);
  		}
- Line 2794  sub newput_user_profile_entry {
+ Line 3038  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;
  	}
- Line 3045  sub get_profile_entry {
+ Line 3293  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
- Line 3275  sub dump_profile_database {
+ Line 3524  sub dump_profile_database {
  sub dump_with_regexp {
      my ($cmd, $tail, $client) = @_;
+     my $res = LONCAPA::Lond::dump_with_regexp($tail, $clientversion);
-     my $userinput = "$cmd:$tail";
+     if ($res =~ /^error:/) {
+         &Failure($client, \$res, "$cmd:$tail");
-     my ($udom,$uname,$namespace,$regexp,$range)=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());
-     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 do not require version checking, as that occurs
- # on the server hosting the user session, when constructing the roles/courses
- # screen).
- #
-         my $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') {
-             my $loncaparev = $clientversion;
-             if ($loncaparev eq '') {
-                 $loncaparev = $Apache::lonnet::loncaparevs{$clientname};
-             }
-             if ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?/) {
-                 $major = $1;
-                 $minor = $2;
-             }
-             if (($major > 2) || (($major == 2) && ($minor > 9))) {
-                 $skipcheck = 1;
-             }
-             $now = time;
-         }
- 	while (my ($key,$value) = each(%$hashref)) {
-             if (($namespace eq 'roles') && (!$skipcheck)) {
-                 if ($key =~ m{^/($LONCAPA::match_domain)/($LONCAPA::match_courseid)(/?[^_]*)_(cc|co|in|ta|ep|ad|st|cr)$}) {
-                     my $cdom = $1;
-                     my $cnum = $2;
-                     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 ".
+         &Reply($client, \$res, "$cmd:$tail");
- 		"while attempting dump\n", $userinput);
      }
      return 1;
- Line 3406  sub dump_with_regexp {
+ Line 3546  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.
  #
- Line 3414  sub dump_with_regexp {
+ Line 3557  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";
-     my ($udom,$uname,$namespace,$rid,$what) =split(/:/,$tail);
+     chomp($tail);
+     my ($udom,$uname,$namespace,$rid,$what,$laststore) =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 @previouskeys=split(/&/,$hashref->{"keys:$rid"});
+             my $numtrans;
- 	    my $key;
+             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;
+                 }
+             }
  	    $hashref->{"version:$rid"}++;
  	    my $version=$hashref->{"version:$rid"};
  	    my $allkeys='';
- Line 3443  sub store_handler {
+ Line 3610  sub store_handler {
  	    $allkeys.='timestamp';
  	    $hashref->{"$version:keys:$rid"}=$allkeys;
  	    if (&untie_user_hash($hashref)) {
- 		&Reply($client, "ok\n", $userinput);
+                 my $msg = 'ok';
+                 if ($numtrans) {
+                     $msg = 'delay:'.$numtrans;
+                 }
+                 &Reply($client, "$msg\n", $userinput);
  	    } else {
  		&Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
  			"while attempting store\n", $userinput);
- Line 3705  sub send_query_handler {
+ Line 3876  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);
- Line 3959  sub put_course_id_hash_handler {
+ Line 4161  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.
  #
  #     $client  - The socket open on the client.
  # Returns:
- Line 3973  sub dump_course_id_handler {
+ Line 4177  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) =split(/:/,$tail);
+         $creationcontext,$domcloner,$hasuniquecode) =split(/:/,$tail);
      my $now = time;
      my ($cloneruname,$clonerudom,%cc_clone);
      if (defined($description)) {
- Line 4046  sub dump_course_id_handler {
+ Line 4250  sub dump_course_id_handler {
      } else {
          $creationcontext = '.';
      }
+     unless ($hasuniquecode) {
+         $hasuniquecode = '.';
+     }
      my $unpack = 1;
      if ($description eq '.' && $instcodefilter eq '.' && $ownerfilter eq '.' &&
          $typefilter eq '.') {
- Line 4134  sub dump_course_id_handler {
+ Line 4341  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)) {
- Line 4366  sub course_lastaccess_handler {
+ Line 4576  sub course_lastaccess_handler {
  }
  &register_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;
+ }
+ &register_handler("coursesessions",\&course_sessions_handler, 0, 1, 0);
  #
  # Puts an unencrypted entry in a namespace db file at the domain level
  #
- Line 4414  sub put_domain_handler {
+ Line 4662  sub put_domain_handler {
  # domain directory.
  #
  # Parameters:
- #   $cmd             - Command request keyword (get).
+ #   $cmd             - Command request keyword (getdom).
  #   $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,
- Line 4431  sub put_domain_handler {
+ Line 4679  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);
-     chomp($what);
+     my $res = LONCAPA::Lond::get_dom($userinput);
-     my @queries=split(/\&/,$what);
+     if ($res =~ /^error:/) {
-     my $qresult='';
+         &Failure($client, \$res, $userinput);
-     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 {
-         &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
+         &Reply($client, \$res, $userinput);
-                  "while attempting getdom\n",$userinput);
      }
      return 1;
- Line 4556  sub get_id_handler {
+ Line 4790  sub get_id_handler {
  }
  &register_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;
+ }
+ &register_handler("iddel", \&del_id_handler, 0, 1, 0);
  #
  # Puts broadcast e-mail sent by Domain Coordinator in nohist_dcmail database
  #
- Line 4841  sub tmp_put_handler {
+ Line 5118  sub tmp_put_handler {
      }
      my ($id,$store);
      $tmpsnum++;
-     if (($context eq 'resetpw') || ($context eq 'createaccount')) {
+     my $numtries = 0;
-         $id = &md5_hex(&md5_hex(time.{}.rand().$$));
+     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 ++;
+         }
      } else {
          $id = $$.'_'.$clientip.'_'.$tmpsnum;
      }
      $id=~s/\W/\_/g;
      $record=~s/\n//g;
-     my $execdir=$perlvar{'lonDaemons'};
+     if (($id ne '') &&
-     if ($store=IO::File->new(">$execdir/tmp/$id.tmp")) {
+         ($store=IO::File->new(">$execdir/tmp/$id.tmp"))) {
  	print $store $record;
  	close $store;
  	&Reply($client, \$id, $userinput);
- Line 4932  sub tmp_del_handler {
+ Line 5217  sub tmp_del_handler {
  &register_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;
+ }
+ &register_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;
+ }
+ &register_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
- Line 5114  sub validate_instcode_handler {
+ Line 5509  sub validate_instcode_handler {
  }
  &register_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;
+ }
+ &register_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.
- Line 5210  sub validate_course_section_handler {
+ Line 5638  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 words that will be split into:
+ #               set of values that will be split into:
  #               $inst_class  - Institutional code for the specific class section
- #               $courseowner - The escaped username:domain of the course owner
+ #               $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.
  #    $client  - The socket open on the client.
- Line 5237  sub validate_class_access_handler {
+ Line 5666  sub validate_class_access_handler {
  &register_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;
+ }
+ &register_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;
+ }
+ &register_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
  #
- Line 5271  sub create_auto_enroll_password_handler
+ Line 5806  sub create_auto_enroll_password_handler
  &register_handler("autocreatepassword", \&create_auto_enroll_password_handler,
 , 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,
+)));
+                 }
+                 &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;
+ }
+ &register_handler("autoexportgrades", \&auto_export_grades_handler,
+, 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 remove.
+ #                $filename - The name of the file to retrieve.
  #                            The filename is given as a path relative to
  #                            the LonCAPA temp file directory.
  #    $client   - Socket open on the client.
- Line 5291  sub retrieve_auto_file_handler {
+ Line 5872  sub retrieve_auto_file_handler {
      my ($filename)   = split(/:/, $tail);
      my $source = $perlvar{'lonDaemons'}.'/tmp/'.$filename;
-     if ( (-e $source) && ($filename ne '') ) {
+     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 '') ) {
  	my $reply = '';
  	if (open(my $fh,$source)) {
  	    while (<$fh>) {
- Line 5323  sub crsreq_checks_handler {
+ Line 5908  sub crsreq_checks_handler {
      my $userinput = "$cmd:$tail";
      my $dom = $tail;
      my $result;
-     my @reqtypes = ('official','unofficial','community');
+     my @reqtypes = ('official','unofficial','community','textbook');
      eval {
          local($SIG{__DIE__})='DEFAULT';
          my %validations;
- Line 5350  sub crsreq_checks_handler {
+ Line 5935  sub crsreq_checks_handler {
  sub validate_crsreq_handler {
      my ($cmd, $tail, $client) = @_;
      my $userinput = "$cmd:$tail";
-     my ($dom,$owner,$crstype,$inststatuslist,$instcode,$instseclist) = split(/:/, $tail);
+     my ($dom,$owner,$crstype,$inststatuslist,$instcode,$instseclist,$customdata) = 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);
+                                                  $instseclist,$custominfo);
      };
      if (!$@) {
          &Reply($client, \$outcome, $userinput);
- Line 5373  sub validate_crsreq_handler {
+ Line 5959  sub validate_crsreq_handler {
  }
  &register_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;
+ }
+ &register_handler("autocrsrequpdate", \&crsreq_update_handler, 0, 1, 0);
  #
  #   Read and retrieve institutional code format (for support form).
  # Formal Parameters:
- Line 6080  sub lcpasswdstrerror {
+ Line 6713  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)=@_;
- Line 6128  my $wwwid=getpwnam('www');
+ Line 6749  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.' |\
+    system("echo 'User ID mismatch.  lond must be run as user www.' |".
-  mailto $emailto -s '$subj' > /dev/null");
+           " mail -s '$subj' $emailto > /dev/null");
     exit 1;
  }
- Line 6577  sub make_new_child {
+ Line 7198  sub make_new_child {
  #        my $tmpsnum=0;            # Now global
  #---------------------------------------------------- kerberos 5 initialization
          &Authen::Krb5::init_context();
- 	unless (($dist eq 'fedora5') || ($dist eq 'fedora4') ||
- 		($dist eq 'fedora6') || ($dist eq 'suse9.3') ||
+         my $no_ets;
-                 ($dist eq 'suse12.2')) {
+         if ($dist =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
- 	    &Authen::Krb5::init_ets();
+             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();
+         }
  	&status('Accepted connection');
  # =============================================================================
- Line 6625  sub make_new_child {
+ Line 7263  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
- Line 6689  sub make_new_child {
+ Line 7333  sub make_new_child {
  				  ."Attempted insecure connection disallowed </font>");
  			close $client;
  			$clientok = 0;
  		    }
  		}
  	    } else {
- Line 6698  sub make_new_child {
+ Line 7341  sub make_new_child {
  			 ."$clientip failed to initialize: >$remotereq< </font>");
  		&status('No init '.$clientip);
  	    }
  	} else {
  	    &logthis(
  		     "<font color='blue'>WARNING: Unknown client $clientip</font>");
- Line 6724  sub make_new_child {
+ Line 7366  sub make_new_child {
  		Debug("Main: Got $user_input\n");
  		$keep_going = &process_request($user_input);
  		alarm(0);
  		&status('Listening to '.$clientname." ($keymode)");
  	    }
  # --------------------------------------------- client unknown or fishy, refuse
- Line 6740  sub make_new_child {
+ Line 7382  sub make_new_child {
      &logthis("<font color='red'>CRITICAL: "
  	     ."Disconnect from $clientip ($clientname)</font>");
      # this exit is VERY important, otherwise the child will become
      # a producer of more and more children, forking yourself into
      # process death.
- Line 6856  sub password_filename {
+ Line 7498  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) = @_;
+     my ($domain, $user, $contents, $saveold) = @_;
      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";
- Line 6955  sub validate_user {
+ Line 7607  sub validate_user {
                  $contentpwd = $domdefaults{'auth_arg_def'};
              }
          }
      }
      if ($howpwd ne 'nouser') {
  	if($howpwd eq "internal") { # Encrypted is in local password file.
- 	    $validated = (crypt($password, $contentpwd) eq $contentpwd);
+             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);
+             }
  	}
  	elsif ($howpwd eq "unix") { # User is a normal unix user.
  	    $contentpwd = (getpwnam($user))[1];
- Line 7026  sub validate_user {
+ Line 7696  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])<int($defaultcost)) {
+                 if ($domdefaults{'intauth_check'} == 1) {
+                     my $ncpass = &hash_passwd($domain,$plainpass);
+                     if (&rewrite_password_file($domain,$user,"internal:$ncpass")) {
+                         &update_passwd_history($user,$domain,'internal','update cost');
+                         &logthis("Validated password hashed with bcrypt for $user:$domain");
+                     }
+                     return 1;
+                 } elsif ($domdefaults{'intauth_check'} == 2) {
+                     return 0;
+                 }
+             }
+         } else {
+             return 1;
+         }
+     }
+     return 0;
+ }
+ sub get_last_authchg {
+     my ($domain,$user) = @_;
+     my $lastmod;
+     my $logname = &propath($domain,$user).'/passwd.log';
+     if (-e "$logname") {
+         $lastmod = (stat("$logname"))[9];
+     }
+     return $lastmod;
+ }
  sub krb4_authen {
      my ($password,$null,$user,$contentpwd) = @_;
      my $validated = 0;
- Line 7341  sub change_unix_password {
+ Line 8055  sub change_unix_password {
  sub make_passwd_file {
-     my ($uname,$udom,$umode,$npass,$passfilename)=@_;
+     my ($uname,$udom,$umode,$npass,$passfilename,$action)=@_;
      my $result="ok";
      if ($umode eq 'krb4' or $umode eq 'krb5') {
  	{
  	    my $pf = IO::File->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 $salt=time;
+         my $ncpass = &hash_passwd($udom,$npass);
- 	$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";
  	    }
- Line 7370  sub make_passwd_file {
+ Line 8084  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");
- Line 7488  sub get_usersession_config {
+ Line 8155  sub get_usersession_config {
      return;
  }
- #
+ sub get_usersearch_config {
- # releasereqd_check() will determine if a LON-CAPA version (defined in the
+     my ($dom,$name) = @_;
- # $major,$minor args passed) is not too old to allow use of a role in a
+     my ($usersearchconf,$cached)=&Apache::lonnet::is_cached_new($name,$dom);
- # 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)) {
-         if (ref($courseinfo) eq 'HASH') {
+         return $usersearchconf;
-             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("<font color='blue'>WARNING courseiddump for $cnum:$cdom from $home timedout</font>");
-         } else {
-             &logthis("<font color='yellow'>WARNING unexpected error during eval of call for courseiddump from $home</font>");
-         }
      } else {
-         if (ref($info{$cdom.'_'.$cnum}) eq 'HASH') {
+         my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$dom);
-             my $hashid = $cdom.':'.$cnum;
+         &Apache::lonnet::do_cache_new($name,$dom,$domconfig{'directorysrch'},3600);
-             return &Apache::lonnet::do_cache_new('courseinfo',$hashid,$info{$cdom.'_'.$cnum},600);
+         return $domconfig{'directorysrch'};
-         }
      }
      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;
  }

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

Removed from v.1.489.2.3
changed lines
	Added in v.1.489.2.43