loncom/lond - diff

Return to lond CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lond between versions 1.446.2.1 and 1.546

-version 1.446.2.1, 2010/11/13 02:21:06
+version 1.546, 2018/08/09 13:27:55
  Line 33  use strict;
  use lib '/home/httpd/lib/perl/';
  use LONCAPA;
  use LONCAPA::Configuration;
+ use LONCAPA::Lond;
+ use Socket;
  use IO::Socket;
  use IO::File;
  #use Apache::File;
  use POSIX;
  use Crypt::IDEA;
- use LWP::UserAgent();
+ use HTTP::Request;
  use Digest::MD5 qw(md5_hex);
  use GDBM_File;
  use Authen::Krb5;
- Line 52  use LONCAPA::lonlocal;
+ Line 54  use LONCAPA::lonlocal;
  use LONCAPA::lonssl;
  use Fcntl qw(:flock);
  use Apache::lonnet;
+ use Mail::Send;
+ use Crypt::Eksblowfish::Bcrypt;
+ use Digest::SHA;
+ use Encode;
+ use LONCAPA::LWPReq;
  my $DEBUG = 0;		       # Non zero to enable debug log entries.
- Line 66  my $currentdomainid;
+ Line 73  my $currentdomainid;
  my $client;
  my $clientip;			# IP address of client.
  my $clientname;			# LonCAPA name of client.
- my $clientversion;              # LonCAPA version running on client
+ my $clientversion;              # LonCAPA version running on client.
+ my $clienthomedom;              # LonCAPA domain of homeID for client.
+ my $clientintdom;               # LonCAPA "internet domain" for client.
+ my $clientsamedom;              # LonCAPA domain same for this host
+                                 # and client.
+ my $clientsameinst;             # LonCAPA "internet domain" same for
+                                 # this host and client.
+ my $clientremoteok;             # Client allowed to host domain's users.
+                                 # (version constraints ignored), not set
+                                 # if this host and client share "internet domain".
+ my %clientprohibited;           # Actions prohibited on client;
  my $server;
  my $keymode;
- Line 88  my %managers;   # Ip -> manager names
+ Line 105  my %managers;   # Ip -> manager names
  my %perlvar;			# Will have the apache conf defined perl vars.
+ my %secureconf;                 # Will have requirements for security
+                                 # of lond connections
+ my %crlchecked;                 # Will contain clients for which the client's SSL
+                                 # has been checked against the cluster's Certificate
+                                 # Revocation List.
+ my $dist;
  #
  #   The hash below is used for command dispatching, and is therefore keyed on the request keyword.
  #    Each element of the hash contains a reference to an array that contains:
- Line 123  my @passwderrors = ("ok",
+ Line 149  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."
  		     );
  #
+ # The %trust hash classifies commands according to type of trust
+ # required for execution of the command.
+ #
+ # When clients from a different institution request execution of a
+ # particular command, the trust settings for that institution set
+ # for this domain (or default domain for a multi-domain server) will
+ # be checked to see if running the command is allowed.
+ #
+ # Trust types which depend on the "Trust" domain configuration
+ # for the machine's default domain are:
+ #
+ # content   ("Access to this domain's content by others")
+ # shared    ("Access to other domain's content by this domain")
+ # enroll    ("Enrollment in this domain's courses by others")
+ # coaurem   ("Co-author roles for this domain's users elsewhere")
+ # domroles  ("Domain roles in this domain assignable to others")
+ # catalog   ("Course Catalog for this domain displayed elsewhere")
+ # reqcrs    ("Requests for creation of courses in this domain by others")
+ # msg       ("Users in other domains can send messages to this domain")
+ #
+ # Trust type which depends on the User Session Hosting (remote)
+ # domain configuration for machine's default domain is: "remote".
+ #
+ # Trust types which depend on contents of manager.tab in
+ # /home/httpd/lonTabs is: "manageronly".
+ #
+ # Trust type which requires client to share the same LON-CAPA
+ # "internet domain" (i.e., same institution as this server) is:
+ # "institutiononly".
+ #
+ my %trust = (
+                auth => {remote => 1},
+                autocreatepassword => {remote => 1},
+                autocrsreqchecks => {remote => 1, reqcrs => 1},
+                autocrsrequpdate => {remote => 1},
+                autocrsreqvalidation => {remote => 1},
+                autogetsections => {remote => 1},
+                autoinstcodedefaults => {remote => 1, catalog => 1},
+                autoinstcodeformat => {remote => 1, catalog => 1},
+                autonewcourse => {remote => 1, reqcrs => 1},
+                autophotocheck => {remote => 1, enroll => 1},
+                autophotochoice => {remote => 1},
+                autophotopermission => {remote => 1, enroll => 1},
+                autopossibleinstcodes => {remote => 1, reqcrs => 1},
+                autoretrieve => {remote => 1, enroll => 1, catalog => 1},
+                autorun => {remote => 1, enroll => 1, reqcrs => 1},
+                autovalidateclass_sec => {catalog => 1},
+                autovalidatecourse => {remote => 1, enroll => 1},
+                autovalidateinstcode => {domroles => 1, remote => 1, enroll => 1},
+                changeuserauth => {remote => 1, domroles => 1},
+                chatretr => {remote => 1, enroll => 1},
+                chatsend => {remote => 1, enroll => 1},
+                courseiddump => {remote => 1, domroles => 1, enroll => 1},
+                courseidput => {remote => 1, domroles => 1, enroll => 1},
+                courseidputhash => {remote => 1, domroles => 1, enroll => 1},
+                courselastaccess => {remote => 1, domroles => 1, enroll => 1},
+                currentauth => {remote => 1, domroles => 1, enroll => 1},
+                currentdump => {remote => 1, enroll => 1},
+                currentversion => {remote=> 1, content => 1},
+                dcmaildump => {remote => 1, domroles => 1},
+                dcmailput => {remote => 1, domroles => 1},
+                del => {remote => 1, domroles => 1, enroll => 1, content => 1},
+                deldom => {remote => 1, domroles => 1}, # not currently used
+                devalidatecache => {institutiononly => 1},
+                domroleput => {remote => 1, enroll => 1},
+                domrolesdump => {remote => 1, catalog => 1},
+                du => {remote => 1, enroll => 1},
+                du2 => {remote => 1, enroll => 1},
+                dump => {remote => 1, enroll => 1, domroles => 1},
+                edit => {institutiononly => 1},  #not used currently
+                eget => {remote => 1, domroles => 1, enroll => 1}, #not used currently
+                egetdom => {remote => 1, domroles => 1, enroll => 1, },
+                ekey => {}, #not used currently
+                exit => {anywhere => 1},
+                fetchuserfile => {remote => 1, enroll => 1},
+                get => {remote => 1, domroles => 1, enroll => 1},
+                getdom => {anywhere => 1},
+                home => {anywhere => 1},
+                iddel => {remote => 1, enroll => 1},
+                idget => {remote => 1, enroll => 1},
+                idput => {remote => 1, domroles => 1, enroll => 1},
+                inc => {remote => 1, enroll => 1},
+                init => {anywhere => 1},
+                inst_usertypes => {remote => 1, domroles => 1, enroll => 1},
+                instemailrules => {remote => 1, domroles => 1},
+                instidrulecheck => {remote => 1, domroles => 1,},
+                instidrules => {remote => 1, domroles => 1,},
+                instrulecheck => {remote => 1, enroll => 1, reqcrs => 1, domroles => 1},
+                instselfcreatecheck => {institutiononly => 1},
+                instuserrules => {remote => 1, enroll => 1, reqcrs => 1, domroles => 1},
+                keys => {remote => 1,},
+                load => {anywhere => 1},
+                log => {anywhere => 1},
+                ls => {remote => 1, enroll => 1, content => 1,},
+                ls2 => {remote => 1, enroll => 1, content => 1,},
+                ls3 => {remote => 1, enroll => 1, content => 1,},
+                makeuser => {remote => 1, enroll => 1, domroles => 1,},
+                mkdiruserfile => {remote => 1, enroll => 1,},
+                newput => {remote => 1, enroll => 1, reqcrs => 1, domroles => 1,},
+                passwd => {remote => 1},
+                ping => {anywhere => 1},
+                pong => {anywhere => 1},
+                pushfile => {manageronly => 1},
+                put => {remote => 1, enroll => 1, domroles => 1, msg => 1, content => 1, shared => 1},
+                putdom => {remote => 1, domroles => 1,},
+                putstore => {remote => 1, enroll => 1},
+                queryreply => {anywhere => 1},
+                querysend => {anywhere => 1},
+                querysend_activitylog => {remote => 1},
+                querysend_allusers => {remote => 1, domroles => 1},
+                querysend_courselog => {remote => 1},
+                querysend_fetchenrollment => {remote => 1},
+                querysend_getinstuser => {remote => 1},
+                querysend_getmultinstusers => {remote => 1},
+                querysend_instdirsearch => {remote => 1, domroles => 1, coaurem => 1},
+                querysend_institutionalphotos => {remote => 1},
+                querysend_portfolio_metadata => {remote => 1, content => 1},
+                querysend_userlog => {remote => 1, domroles => 1},
+                querysend_usersearch => {remote => 1, enroll => 1, coaurem => 1},
+                quit => {anywhere => 1},
+                readlonnetglobal => {institutiononly => 1},
+                reinit => {manageronly => 1}, #not used currently
+                removeuserfile => {remote => 1, enroll => 1},
+                renameuserfile => {remote => 1,},
+                restore => {remote => 1, enroll => 1, reqcrs => 1,},
+                rolesdel => {remote => 1, enroll => 1, domroles => 1, coaurem => 1},
+                rolesput => {remote => 1, enroll => 1, domroles => 1, coaurem => 1},
+                servercerts => {institutiononly => 1},
+                serverdistarch => {anywhere => 1},
+                serverhomeID => {anywhere => 1},
+                serverloncaparev => {anywhere => 1},
+                servertimezone => {remote => 1, enroll => 1},
+                setannounce => {remote => 1, domroles => 1},
+                sethost => {anywhere => 1},
+                store => {remote => 1, enroll => 1, reqcrs => 1,},
+                studentphoto => {remote => 1, enroll => 1},
+                sub => {content => 1,},
+                tmpdel => {anywhere => 1},
+                tmpget => {anywhere => 1},
+                tmpput => {anywhere => 1},
+                tokenauthuserfile => {anywhere => 1},
+                unsub => {content => 1,},
+                update => {shared => 1},
+                updateclickers => {remote => 1},
+                userhassession => {anywhere => 1},
+                userload => {anywhere => 1},
+                version => {anywhere => 1}, #not used
+             );
+ #
  #   Statistics that are maintained and dislayed in the status line.
  #
  my $Transactions = 0;		# Number of attempted transactions.
- Line 266  sub SSLConnection {
+ Line 424  sub SSLConnection {
      Debug("Approving promotion -> ssl");
      #  And do so:
+     my $CRLFile;
+     unless ($crlchecked{$clientname}) {
+         $CRLFile = lonssl::CRLFile();
+         $crlchecked{$clientname} = 1;
+     }
      my $SSLSocket = lonssl::PromoteServerSocket($Socket,
  						$CACertificate,
  						$Certificate,
- 						$KeyFile);
+ 						$KeyFile,
+ 						$clientname,
+                                                 $CRLFile,
+                                                 $clientversion);
      if(! ($SSLSocket) ) {	# SSL socket promotion failed.
  	my $err = lonssl::LastError();
  	&logthis("<font color=\"red\"> CRITICAL "
- Line 309  sub InsecureConnection {
+ Line 476  sub InsecureConnection {
      my $Socket  =  shift;
      #   Don't even start if insecure connections are not allowed.
+     #   return 0 if Insecure connections not allowed.
-     if(! $perlvar{londAllowInsecure}) {	# Insecure connections not allowed.
+     #
+     if (ref($secureconf{'connfrom'}) eq 'HASH') {
+         if ($clientsamedom) {
+             if ($secureconf{'connfrom'}{'dom'} eq 'req') {
+                 return 0;
+             }
+         } elsif ($clientsameinst) {
+             if ($secureconf{'connfrom'}{'intdom'} eq 'req') {
+                 return 0;
+             }
+         } else {
+             if ($secureconf{'connfrom'}{'other'} eq 'req') {
+                 return 0;
+             }
+         }
+     } elsif (!$perlvar{londAllowInsecure}) {
  	return 0;
      }
- Line 417  sub ReadManagerTable {
+ Line 599  sub ReadManagerTable {
     my $tablename = $perlvar{'lonTabDir'}."/managers.tab";
     if (!open (MANAGERS, $tablename)) {
-       logthis('<font color="red">No manager table.  Nobody can manage!!</font>');
+        my $hostname = &Apache::lonnet::hostname($perlvar{'lonHostID'});
-       return;
+        if (&Apache::lonnet::is_LC_dns($hostname)) {
+            &logthis('<font color="red">No manager table.  Nobody can manage!!</font>');
+        }
+        return;
     }
     while(my $host = <MANAGERS>) {
        chomp($host);
- Line 443  sub ReadManagerTable {
+ Line 628  sub ReadManagerTable {
           }
        } else {
           logthis('<font color="green"> existing host'." $host</font>\n");
-          $managers{&Apache::lonnet::get_host_ip($host)} = $host;  # Use info from cluster tab if clumemeber
+          $managers{&Apache::lonnet::get_host_ip($host)} = $host;  # Use info from cluster tab if cluster memeber
        }
     }
  }
- Line 505  sub AdjustHostContents {
+ Line 690  sub AdjustHostContents {
      my $me        = $perlvar{'lonHostID'};
      foreach my $line (split(/\n/,$contents)) {
- 	if(!(($line eq "") || ($line =~ /^ *\#/) || ($line =~ /^ *$/))) {
+ 	if(!(($line eq "") || ($line =~ /^ *\#/) || ($line =~ /^ *$/) ||
+              ($line =~ /^\s*\^/))) {
  	    chomp($line);
  	    my ($id,$domain,$role,$name,$ip,$maxcon,$idleto,$mincon)=split(/:/,$line);
  	    if ($id eq $me) {
- Line 593  sub InstallFile {
+ Line 779  sub InstallFile {
  #
  #   ConfigFileFromSelector: converts a configuration file selector
  #                 into a configuration file pathname.
- #                 It's probably no longer necessary to preserve
+ #                 Supports the following file selectors:
- #                 special handling of hosts or domain as those
+ #                 hosts, domain, dns_hosts, dns_domain
- #                 files have been superceded by dns_hosts, dns_domain.
- #                 The default action is just to prepend the directory
- #                 and append .tab
  #
  #
  #  Parameters:
- Line 610  sub ConfigFileFromSelector {
+ Line 793  sub ConfigFileFromSelector {
      my $tablefile;
      my $tabledir = $perlvar{'lonTabDir'}.'/';
-     if ($selector eq "hosts") {
+     if (($selector eq "hosts") || ($selector eq "domain") ||
- 	$tablefile = $tabledir."hosts.tab";
+         ($selector eq "dns_hosts") || ($selector eq "dns_domain")) {
-     } elsif ($selector eq "domain") {
- 	$tablefile = $tabledir."domain.tab";
-     } else {
  	$tablefile =  $tabledir.$selector.'.tab';
      }
      return $tablefile;
  }
  #
  #   PushFile:  Called to do an administrative push of a file.
- Line 636  sub ConfigFileFromSelector {
+ Line 815  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 644  sub PushFile {
+ Line 823  sub PushFile {
      #  supported:
      #   hosts.tab  ($filename eq host).
      #   domain.tab ($filename eq domain).
+     #   dns_hosts.tab ($filename eq dns_host).
+     #   dns_domain.tab ($filename eq dns_domain).
      # Construct the destination filename or reject the request.
      #
      # lonManage is supposed to ensure this, however this session could be
- Line 664  sub PushFile {
+ Line 845  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 $request=new HTTP::Request('GET',"$clientprotocol://$clienthost$url");
+                 my $response = LONCAPA::LWPReq::makerequest($clientname,$request,'',\%perlvar,60,0);
+                 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 675  sub PushFile {
+ Line 892  sub PushFile {
  	return "error:$!";
      } else {
  	&logthis('<font color="green"> Installed new '.$tablefile
- 		 ."</font>");
+ 		 ." - transaction by: $clientname ($clientip)</font>");
+         my $adminmail = $perlvar{'lonAdmEMail'};
+         my $admindom = &Apache::lonnet::host_domain($perlvar{'lonHostID'});
+         if ($admindom ne '') {
+             my %domconfig =
+                 &Apache::lonnet::get_dom('configuration',['contacts'],$admindom);
+             if (ref($domconfig{'contacts'}) eq 'HASH') {
+                 if ($domconfig{'contacts'}{'adminemail'} ne '') {
+                     $adminmail = $domconfig{'contacts'}{'adminemail'};
+                 }
+             }
+         }
+         if ($adminmail =~ /^[^\@]+\@[^\@]+$/) {
+             my $msg = new Mail::Send;
+             $msg->to($adminmail);
+             $msg->subject('LON-CAPA DNS update on '.$perlvar{'lonHostID'});
+             $msg->add('Content-type','text/plain; charset=UTF-8');
+             if (my $fh = $msg->open()) {
+                 print $fh 'Update to '.$tablefile.' from Cluster Manager '.
+                           "$clientname ($clientip)\n";
+                 $fh->close;
+             }
+         }
      }
      #  Indicate success:
      return "ok";
- Line 1071  sub pong_handler {
+ Line 1308  sub pong_handler {
  #  Implicit Inputs:
  #      $currenthostid - Global variable that carries the name of the host
  #                       known as.
- #      $clientname    - Global variable that carries the name of the hsot we're connected to.
+ #      $clientname    - Global variable that carries the name of the host we're connected to.
  #  Returns:
  #      1       - Ok to continue processing.
  #      0       - Program should exit.
- Line 1110  sub establish_key_handler {
+ Line 1347  sub establish_key_handler {
  #  Implicit Inputs:
  #      $currenthostid - Global variable that carries the name of the host
  #                       known as.
- #      $clientname    - Global variable that carries the name of the hsot we're connected to.
+ #      $clientname    - Global variable that carries the name of the host we're connected to.
  #  Returns:
  #      1       - Ok to continue processing.
  #      0       - Program should exit.
- Line 1119  sub establish_key_handler {
+ Line 1356  sub establish_key_handler {
  sub load_handler {
      my ($cmd, $tail, $replyfd) = @_;
     # Get the load average from /proc/loadavg and calculate it as a percentage of
     # the allowed load limit as set by the perl global variable lonLoadLim
- Line 1147  sub load_handler {
+ Line 1386  sub load_handler {
  #  Implicit Inputs:
  #      $currenthostid - Global variable that carries the name of the host
  #                       known as.
- #      $clientname    - Global variable that carries the name of the hsot we're connected to.
+ #      $clientname    - Global variable that carries the name of the host we're connected to.
  #  Returns:
  #      1       - Ok to continue processing.
  #      0       - Program should exit
- Line 1375  sub du2_handler {
+ Line 1614  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 1396  sub ls_handler {
+ Line 1651  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 1421  sub ls_handler {
+ Line 1685  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 1445  sub ls_handler {
+ Line 1714  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 1465  sub ls2_handler {
+ Line 1750  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 1491  sub ls2_handler {
+ Line 1785  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 1507  sub ls2_handler {
+ Line 1806  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 1546  sub ls3_handler {
+ Line 1864  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 1574  sub ls3_handler {
+ Line 1882  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 1604  sub ls3_handler {
+ Line 1928  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 1616  sub ls3_handler {
+ Line 1947  sub ls3_handler {
  }
  &register_handler("ls3", \&ls3_handler, 0, 1, 0);
+ sub read_lonnet_global {
+     my ($cmd,$tail,$client) = @_;
+     my $userinput = "$cmd:$tail";
+     my $requested = &Apache::lonnet::thaw_unescape($tail);
+     my $result;
+     my %packagevars = (
+                         spareid => \%Apache::lonnet::spareid,
+                         perlvar => \%Apache::lonnet::perlvar,
+                       );
+     my %limit_to = (
+                     perlvar => {
+                                  lonOtherAuthen  => 1,
+                                  lonBalancer     => 1,
+                                  lonVersion      => 1,
+                                  lonAdmEMail     => 1,
+                                  lonSupportEMail => 1,
+                                  lonSysEMail     => 1,
+                                  lonHostID       => 1,
+                                  lonRole         => 1,
+                                  lonDefDomain    => 1,
+                                  lonLoadLim      => 1,
+                                  lonUserLoadLim  => 1,
+                                }
+                   );
+     if (ref($requested) eq 'HASH') {
+         foreach my $what (keys(%{$requested})) {
+             my $response;
+             my $items = {};
+             if (exists($packagevars{$what})) {
+                 if (ref($limit_to{$what}) eq 'HASH') {
+                     foreach my $varname (keys(%{$packagevars{$what}})) {
+                         if ($limit_to{$what}{$varname}) {
+                             $items->{$varname} = $packagevars{$what}{$varname};
+                         }
+                     }
+                 } else {
+                     $items = $packagevars{$what};
+                 }
+                 if ($what eq 'perlvar') {
+                     if (!exists($packagevars{$what}{'lonBalancer'})) {
+                         if ($dist =~ /^(centos|rhes|fedora|scientific)/) {
+                             my $othervarref=LONCAPA::Configuration::read_conf('httpd.conf');
+                             if (ref($othervarref) eq 'HASH') {
+                                 $items->{'lonBalancer'} = $othervarref->{'lonBalancer'};
+                             }
+                         }
+                     }
+                 }
+                 $response = &Apache::lonnet::freeze_escape($items);
+             }
+             $result .= &escape($what).'='.$response.'&';
+         }
+     }
+     $result =~ s/\&$//;
+     &Reply($client,\$result,$userinput);
+     return 1;
+ }
+ &register_handler("readlonnetglobal", \&read_lonnet_global, 0, 1, 0);
+ 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 $result = 'ok';
+     &Reply($client,\$result,$userinput);
+     return 1;
+ }
+ &register_handler("devalidatecache", \&server_devalidatecache_handler, 0, 1, 0);
  sub server_timezone_handler {
      my ($cmd,$tail,$client) = @_;
      my $userinput = "$cmd:$tail";
- Line 1656  sub server_loncaparev_handler {
+ Line 2063  sub server_loncaparev_handler {
  }
  &register_handler("serverloncaparev", \&server_loncaparev_handler, 0, 1, 0);
+ sub server_homeID_handler {
+     my ($cmd,$tail,$client) = @_;
+     my $userinput = "$cmd:$tail";
+     &Reply($client,\$perlvar{'lonHostID'},$userinput);
+     return 1;
+ }
+ &register_handler("serverhomeID", \&server_homeID_handler, 0, 1, 0);
+ sub server_distarch_handler {
+     my ($cmd,$tail,$client) = @_;
+     my $userinput = "$cmd:$tail";
+     my $reply = &distro_and_arch();
+     &Reply($client,\$reply,$userinput);
+     return 1;
+ }
+ &register_handler("serverdistarch", \&server_distarch_handler, 0, 1, 0);
+ sub server_certs_handler {
+     my ($cmd,$tail,$client) = @_;
+     my $userinput = "$cmd:$tail";
+     my $result;
+     my $result = &LONCAPA::Lond::server_certs(\%perlvar);
+     &Reply($client,\$result,$userinput);
+     return;
+ }
+ &register_handler("servercerts", \&server_certs_handler, 0, 1, 0);
  #   Process a reinit request.  Reinit requests that either
  #   lonc or lond be reinitialized so that an updated
  #   host.tab or domain.tab can be processed.
- Line 1765  sub authenticate_handler {
+ Line 2199  sub authenticate_handler {
      #  upass   - User's password.
      #  checkdefauth - Pass to validate_user() to try authentication
      #                 with default auth type(s) if no user account.
+     #  clientcancheckhost - Passed by clients with functionality in lonauth.pm
+     #                       to check if session can be hosted.
-     my ($udom, $uname, $upass, $checkdefauth)=split(/:/,$tail);
+     my ($udom, $uname, $upass, $checkdefauth, $clientcancheckhost)=split(/:/,$tail);
      &Debug(" Authenticate domain = $udom, user = $uname, password = $upass,  checkdefauth = $checkdefauth");
      chomp($upass);
      $upass=&unescape($upass);
      my $pwdcorrect = &validate_user($udom,$uname,$upass,$checkdefauth);
      if($pwdcorrect) {
- 	&Reply( $client, "authorized\n", $userinput);
+         my $canhost = 1;
+         unless ($clientcancheckhost) {
+             my $uprimary_id = &Apache::lonnet::domain($udom,'primary');
+             my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);
+             my @intdoms;
+             my $internet_names = &Apache::lonnet::get_internet_names($clientname);
+             if (ref($internet_names) eq 'ARRAY') {
+                 @intdoms = @{$internet_names};
+             }
+             unless ($uint_dom ne '' && grep(/^\Q$uint_dom\E$/,@intdoms)) {
+                 my ($remote,$hosted);
+                 my $remotesession = &get_usersession_config($udom,'remotesession');
+                 if (ref($remotesession) eq 'HASH') {
+                     $remote = $remotesession->{'remote'};
+                 }
+                 my $hostedsession = &get_usersession_config($clienthomedom,'hostedsession');
+                 if (ref($hostedsession) eq 'HASH') {
+                     $hosted = $hostedsession->{'hosted'};
+                 }
+                 $canhost = &Apache::lonnet::can_host_session($udom,$clientname,
+                                                              $clientversion,
+                                                              $remote,$hosted);
+             }
+         }
+         if ($canhost) {
+             &Reply( $client, "authorized\n", $userinput);
+         } else {
+             &Reply( $client, "not_allowed_to_host\n", $userinput);
+         }
  	#
  	#  Bad credentials: Failed to authorize
  	#
- Line 1845  sub change_password_handler {
+ Line 2309  sub change_password_handler {
  	my ($howpwd,$contentpwd)=split(/:/,$realpasswd);
  	if ($howpwd eq 'internal') {
  	    &Debug("internal auth");
- 	    my $salt=time;
+             my $ncpass = &hash_passwd($udom,$npass);
- 	    $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 "
- Line 1862  sub change_password_handler {
+ Line 2325  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 1884  sub change_password_handler {
+ Line 2350  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 1927  sub add_user_handler {
+ Line 2425  sub add_user_handler {
  		    ."makeuser";
  	    }
  	    unless ($fperror) {
- 		my $result=&make_passwd_file($uname, $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 1988  sub change_authentication_handler {
+ Line 2487  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, $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 2030  sub change_authentication_handler {
+ Line 2523  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 2111  sub update_resource_handler {
+ Line 2615  sub update_resource_handler {
  		my $transname="$fname.in.transfer";
  		my $remoteurl=&Apache::lonnet::reply("sub:$fname","$clientname");
  		my $response;
- 		alarm(120);
+ # FIXME: cannot replicate files that take more than two minutes to transfer -- needs checking now 1200s timeout used
- 		{
+ # for LWP request.
- 		    my $ua=new LWP::UserAgent;
+ 		my $request=new HTTP::Request('GET',"$remoteurl");
- 		    my $request=new HTTP::Request('GET',"$remoteurl");
+                 $response=&LONCAPA::LWPReq::makerequest($clientname,$request,$transname,\%perlvar,1200,0,1);
- 		    $response=$ua->request($request,$transname);
- 		}
- 		alarm(0);
  		if ($response->is_error()) {
- 		    unlink($transname);
+                     my $reply=&Apache::lonnet::reply("unsub:$fname","$clientname");
+                     &devalidate_meta_cache($fname);
+                     if (-e $transname) {
+                         unlink($transname);
+                     }
+                     unlink($fname);
  		    my $message=$response->status_line;
  		    &logthis("LWP GET: $message for $fname ($remoteurl)");
  		} else {
  		    if ($remoteurl!~/\.meta$/) {
- 			alarm(120);
+ 			my $mrequest=new HTTP::Request('GET',$remoteurl.'.meta');
- 			{
+                         my $mresponse = &LONCAPA::LWPReq::makerequest($clientname,$mrequest,$fname.'.meta',\%perlvar,120,0,1);
- 			    my $ua=new LWP::UserAgent;
+ 			if ($mresponse->is_error()) {
- 			    my $mrequest=new HTTP::Request('GET',$remoteurl.'.meta');
+ 			    unlink($fname.'.meta');
- 			    my $mresponse=$ua->request($mrequest,$fname.'.meta');
- 			    if ($mresponse->is_error()) {
- 				unlink($fname.'.meta');
- 			    }
  			}
- 			alarm(0);
  		    }
                      # we successfully transfered, copy file over to real name
  		    rename($transname,$fname);
- Line 2197  sub fetch_user_file_handler {
+ Line 2698  sub fetch_user_file_handler {
  	my $destname=$udir.'/'.$ufile;
  	my $transname=$udir.'/'.$ufile.'.in.transit';
- 	my $remoteurl='http://'.$clientip.'/userfiles/'.$fname;
+         my $clientprotocol=$Apache::lonnet::protocol{$clientname};
+         $clientprotocol = 'http' if ($clientprotocol ne 'https');
+ 	my $clienthost = &Apache::lonnet::hostname($clientname);
+ 	my $remoteurl=$clientprotocol.'://'.$clienthost.'/userfiles/'.$fname;
  	my $response;
  	Debug("Remote URL : $remoteurl Transfername $transname Destname: $destname");
- 	alarm(120);
+ 	my $request=new HTTP::Request('GET',"$remoteurl");
- 	{
+         my $verifycert = 1;
- 	    my $ua=new LWP::UserAgent;
+         my @machine_ids = &Apache::lonnet::current_machine_ids();
- 	    my $request=new HTTP::Request('GET',"$remoteurl");
+         if (grep(/^\Q$clientname\E$/,@machine_ids)) {
- 	    $response=$ua->request($request,$transname);
+             $verifycert = 0;
- 	}
+         }
- 	alarm(0);
+         $response = &LONCAPA::LWPReq::makerequest($clientname,$request,$transname,\%perlvar,1200,$verifycert);
  	if ($response->is_error()) {
  	    unlink($transname);
  	    my $message=$response->status_line;
- Line 2219  sub fetch_user_file_handler {
+ Line 2723  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);
  	    }
  	}
- Line 2255  sub remove_user_file_handler {
+ Line 2777  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 2373  sub user_has_session_handler {
+ Line 2904  sub user_has_session_handler {
      my ($udom, $uname) = map { &unescape($_) } (split(/:/, $tail));
-     &logthis("Looking for $udom $uname");
      opendir(DIR,$perlvar{'lonIDsDir'});
      my $filename;
      while ($filename=readdir(DIR)) {
- Line 2623  sub newput_user_profile_entry {
+ Line 3153  sub newput_user_profile_entry {
      foreach my $pair (@pairs) {
  	my ($key,$value)=split(/=/,$pair);
  	if (exists($hashref->{$key})) {
- 	    &Failure($client, "key_exists: ".$key."\n",$userinput);
+             if (!&untie_user_hash($hashref)) {
- 	    return 1;
+                 &logthis("error: ".($!+0)." untie (GDBM) failed ".
+                          "while attempting newput - early out as key exists");
+             }
+             &Failure($client, "key_exists: ".$key."\n",$userinput);
+             return 1;
  	}
      }
- Line 2874  sub get_profile_entry {
+ Line 3408  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 3026  sub get_profile_keys {
+ Line 3561  sub get_profile_keys {
  sub dump_profile_database {
      my ($cmd, $tail, $client) = @_;
+     my $res = LONCAPA::Lond::dump_profile_database($tail);
+     if ($res =~ /^error:/) {
+         Failure($client, \$res, "$cmd:$tail");
+     } else {
+         Reply($client, \$res, "$cmd:$tail");
+     }
+     return 1;
+     #TODO remove
      my $userinput = "$cmd:$tail";
      my ($udom,$uname,$namespace) = split(/:/,$tail);
- Line 3092  sub dump_profile_database {
+ Line 3638  sub dump_profile_database {
  #                                             that is matched against
  #                                             database keywords to do
  #                                             selective dumps.
+ #                               range       - optional range of entries
+ #                                             e.g., 10-20 would return the
+ #                                             10th to 19th items, etc.
  #   $client                   - Channel open on the client.
  # Returns:
  #    1    - Continue processing.
- Line 3101  sub dump_profile_database {
+ Line 3650  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:/) {
-     my ($udom,$uname,$namespace,$regexp,$range)=split(/:/,$tail);
+         Failure($client, \$res, "$cmd:$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;
- 	while (my ($key,$value) = each(%$hashref)) {
-             if ($namespace eq 'roles') {
-                 if ($key =~ m{^/($LONCAPA::match_domain)/($LONCAPA::match_community)_(cc|co|in|ta|ep|ad|st|cr)}) {
-                     my $cdom = $1;
-                     my $cnum = $2;
-                     if ($clientversion =~ /^['"]?(\d+)\.(\d+)[.\d\-]+['"]?$/) {
-                         my $major = $1;
-                         my $minor = $2;
-                         next if (($major < 2) || (($major == 2) && ($minor < 9)));
-                     } else {
-                         my $homeserver = &Apache::lonnet::homeserver($cnum,$cdom);
-                         next unless ($currenthostid eq $homeserver);
-                     }
-                 }
-             }
- 	    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)) {
- 	    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 3181  sub dump_with_regexp {
+ Line 3672  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 3189  sub dump_with_regexp {
+ Line 3683  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) =split(/:/,$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 3218  sub store_handler {
+ Line 3734  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 3461  sub retrieve_chat_handler {
+ Line 3981  sub retrieve_chat_handler {
  #  serviced.
  #
  #  Parameters:
- #     $cmd       - COmmand keyword that initiated the request.
+ #     $cmd       - Command keyword that initiated the request.
  #     $tail      - Remainder of the command after the keyword.
  #                  For this function, this consists of a query and
  #                  3 arguments that are self-documentingly labelled
- Line 3475  sub retrieve_chat_handler {
+ Line 3995  sub retrieve_chat_handler {
  sub send_query_handler {
      my ($cmd, $tail, $client) = @_;
      my $userinput = "$cmd:$tail";
      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 3734  sub put_course_id_hash_handler {
+ Line 4284  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 3743  sub put_course_id_hash_handler {
+ Line 4295  sub put_course_id_hash_handler {
  #   a reply is written to $client.
  sub dump_course_id_handler {
      my ($cmd, $tail, $client) = @_;
+     my $res = LONCAPA::Lond::dump_course_id_handler($tail);
+     if ($res =~ /^error:/) {
+         Failure($client, \$res, "$cmd:$tail");
+     } else {
+         Reply($client, \$res, "$cmd:$tail");
+     }
+     return 1;
+     #TODO remove
      my $userinput = "$cmd:$tail";
      my ($udom,$since,$description,$instcodefilter,$ownerfilter,$coursefilter,
          $typefilter,$regexp_ok,$rtn_as_hash,$selfenrollonly,$catfilter,$showhidden,
          $caller,$cloner,$cc_clone_list,$cloneonly,$createdbefore,$createdafter,
-         $creationcontext,$domcloner) =split(/:/,$tail);
+         $creationcontext,$domcloner,$hasuniquecode) =split(/:/,$tail);
      my $now = time;
      my ($cloneruname,$clonerudom,%cc_clone);
      if (defined($description)) {
- Line 3821  sub dump_course_id_handler {
+ Line 4384  sub dump_course_id_handler {
      } else {
          $creationcontext = '.';
      }
+     unless ($hasuniquecode) {
+         $hasuniquecode = '.';
+     }
      my $unpack = 1;
-     if ($description eq '.' && $instcodefilter eq '.' && $coursefilter eq '.' &&
+     if ($description eq '.' && $instcodefilter eq '.' && $ownerfilter eq '.' &&
          $typefilter eq '.') {
          $unpack = 0;
      }
- Line 3909  sub dump_course_id_handler {
+ Line 4475  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 4184  sub put_domain_handler {
+ Line 4753  sub put_domain_handler {
  }
  &register_handler("putdom", \&put_domain_handler, 0, 1, 0);
+ # Updates one or more entries in clickers.db file at the domain level
+ #
+ # Parameters:
+ #    $cmd      - The command that got us here.
+ #    $tail     - Tail of the command (remaining parameters).
+ #                In this case a colon separated list containing:
+ #                (a) the domain for which we are updating the entries,
+ #                (b) the action required -- add or del -- and
+ #                (c) a &-separated list of entries to add or delete.
+ #    $client   - File descriptor connected to client.
+ # Returns
+ #     1        - Continue processing.
+ #     0        - Requested to exit, caller should shut down.
+ #  Side effects:
+ #     reply is written to $client.
+ #
+ sub update_clickers {
+     my ($cmd, $tail, $client)  = @_;
+     my $userinput = "$cmd:$tail";
+     my ($udom,$action,$what) =split(/:/,$tail,3);
+     chomp($what);
+     my $hashref = &tie_domain_hash($udom, "clickers", &GDBM_WRCREAT(),
+                                  "U","$action:$what");
+     if (!$hashref) {
+         &Failure( $client, "error: ".($!+0)." tie(GDBM) Failed ".
+                   "while attempting updateclickers\n", $userinput);
+         return 1;
+     }
+     my @pairs=split(/\&/,$what);
+     foreach my $pair (@pairs) {
+         my ($key,$value)=split(/=/,$pair);
+         if ($action eq 'add') {
+             if (exists($hashref->{$key})) {
+                 my @newvals = split(/,/,&unescape($value));
+                 my @currvals = split(/,/,&unescape($hashref->{$key}));
+                 my @merged = sort(keys(%{{map { $_ => 1 } (@newvals,@currvals)}}));
+                 $hashref->{$key}=&escape(join(',',@merged));
+             } else {
+                 $hashref->{$key}=$value;
+             }
+         } elsif ($action eq 'del') {
+             if (exists($hashref->{$key})) {
+                 my %current;
+                 map { $current{$_} = 1; } split(/,/,&unescape($hashref->{$key}));
+                 map { delete($current{$_}); } split(/,/,&unescape($value));
+                 if (keys(%current)) {
+                     $hashref->{$key}=&escape(join(',',sort(keys(%current))));
+                 } else {
+                     delete($hashref->{$key});
+                 }
+             }
+         }
+     }
+     if (&untie_user_hash($hashref)) {
+         &Reply( $client, "ok\n", $userinput);
+     } else {
+         &Failure($client, "error: ".($!+0)." untie(GDBM) failed ".
+                  "while attempting put\n",
+                  $userinput);
+     }
+     return 1;
+ }
+ &register_handler("updateclickers", \&update_clickers, 0, 1, 0);
+ # Deletes one or more entries in a namespace db file at the domain level
+ #
+ # Parameters:
+ #    $cmd      - The command that got us here.
+ #    $tail     - Tail of the command (remaining parameters).
+ #                In this case a colon separated list containing:
+ #                (a) the domain for which we are deleting the entries,
+ #                (b) &-separated list of keys to delete.
+ #    $client   - File descriptor connected to client.
+ # Returns
+ #     1        - Continue processing.
+ #     0        - Requested to exit, caller should shut down.
+ #  Side effects:
+ #     reply is written to $client.
+ #
+ sub del_domain_handler {
+     my ($cmd,$tail,$client) = @_;
+     my $userinput = "$cmd:$tail";
+     my ($udom,$namespace,$what)=split(/:/,$tail,3);
+     chomp($what);
+     my $hashref = &tie_domain_hash($udom,$namespace,&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 deldom\n", $userinput);
+         }
+     } else {
+         &Failure( $client, "error: ".($!+0)." tie(GDBM) Failed ".
+                  "while attempting deldom\n", $userinput);
+     }
+     return 1;
+ }
+ &register_handler("deldom", \&del_domain_handler, 0, 1, 0);
  # Unencrypted get from the namespace database file at the domain level.
  # This function retrieves a keyed item from a specific named database in the
  # domain directory.
- Line 4206  sub put_domain_handler {
+ Line 4891  sub put_domain_handler {
  sub get_domain_handler {
      my ($cmd, $tail, $client) = @_;
-     my $userinput = "$client:$tail";
+     my $userinput = "$cmd:$tail";
+     my ($udom,$namespace,$what)=split(/:/,$tail,3);
+     chomp($what);
+     if ($namespace =~ /^enc/) {
+         &Failure( $client, "refused\n", $userinput);
+     } else {
+         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 {
+             &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
+                      "while attempting getdom\n",$userinput);
+         }
+     }
+     return 1;
+ }
+ &register_handler("getdom", \&get_domain_handler, 0, 1, 0);
+ sub encrypted_get_domain_handler {
+     my ($cmd, $tail, $client) = @_;
+     my $userinput = "$cmd:$tail";
      my ($udom,$namespace,$what)=split(/:/,$tail,3);
      chomp($what);
- Line 4219  sub get_domain_handler {
+ Line 4939  sub get_domain_handler {
          }
          if (&untie_domain_hash($hashref)) {
              $qresult=~s/\&$//;
-             &Reply($client, \$qresult, $userinput);
+             if ($cipher) {
+                 my $cmdlength=length($qresult);
+                 $qresult.="         ";
+                 my $encqresult='';
+                 for (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {
+                     $encqresult.= unpack("H16",
+                                          $cipher->encrypt(substr($qresult,
+                                                                  $encidx,
+)));
+                 }
+                 &Reply( $client, "enc:$cmdlength:$encqresult\n", $userinput);
+             } else {
+                 &Failure( $client, "error:no_key\n", $userinput);
+             }
          } else {
              &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
-                       "while attempting getdom\n",$userinput);
+                       "while attempting egetdom\n",$userinput);
          }
      } else {
          &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
-                  "while attempting getdom\n",$userinput);
+                  "while attempting egetdom\n",$userinput);
      }
      return 1;
  }
- &register_handler("getdom", \&get_domain_handler, 0, 1, 0);
+ &register_handler("egetdom", \&encrypted_get_domain_handler, 1, 1, 0);
  #
  #  Puts an id to a domains id database.
- Line 4330  sub get_id_handler {
+ Line 5062  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 4350  sub get_id_handler {
+ Line 5125  sub get_id_handler {
  sub put_dcmail_handler {
      my ($cmd,$tail,$client) = @_;
      my $userinput = "$cmd:$tail";
      my ($udom,$what)=split(/:/,$tail);
      chomp($what);
      my $hashref = &tie_domain_hash($udom, "nohist_dcmail", &GDBM_WRCREAT());
- Line 4614  sub tmp_put_handler {
+ Line 5390  sub tmp_put_handler {
      }
      my ($id,$store);
      $tmpsnum++;
-     if ($context eq 'resetpw') {
+     if (($context eq 'resetpw') || ($context eq 'createaccount')) {
          $id = &md5_hex(&md5_hex(time.{}.rand().$$));
      } else {
          $id = $$.'_'.$clientip.'_'.$tmpsnum;
- Line 4877  sub validate_instcode_handler {
+ Line 5653  sub validate_instcode_handler {
      my ($dom,$instcode,$owner) = split(/:/, $tail);
      $instcode = &unescape($instcode);
      $owner = &unescape($owner);
-     my ($outcome,$description) =
+     my ($outcome,$description,$credits) =
          &localenroll::validate_instcode($dom,$instcode,$owner);
-     my $result = &escape($outcome).'&'.&escape($description);
+     my $result = &escape($outcome).'&'.&escape($description).'&'.
+                  &escape($credits);
      &Reply($client, \$result, $userinput);
      return 1;
- Line 4932  sub get_sections_handler {
+ Line 5709  sub get_sections_handler {
  sub validate_course_owner_handler {
      my ($cmd, $tail, $client)  = @_;
      my $userinput = "$cmd:$tail";
-     my ($inst_course_id, $owner, $cdom) = split(/:/, $tail);
+     my ($inst_course_id, $owner, $cdom, $coowners) = split(/:/, $tail);
      $owner = &unescape($owner);
-     my $outcome = &localenroll::new_course($inst_course_id,$owner,$cdom);
+     $coowners = &unescape($coowners);
+     my $outcome = &localenroll::new_course($inst_course_id,$owner,$cdom,$coowners);
      &Reply($client, \$outcome, $userinput);
- Line 4981  sub validate_course_section_handler {
+ Line 5759  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 5008  sub validate_class_access_handler {
+ Line 5787  sub validate_class_access_handler {
  &register_handler("autovalidateclass_sec", \&validate_class_access_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 5042  sub create_auto_enroll_password_handler
+ Line 5871  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 5062  sub retrieve_auto_file_handler {
+ Line 5936  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 5094  sub crsreq_checks_handler {
+ Line 5973  sub crsreq_checks_handler {
      my $userinput = "$cmd:$tail";
      my $dom = $tail;
      my $result;
-     my @reqtypes = ('official','unofficial','community');
+     my @reqtypes = ('official','unofficial','community','textbook','placement');
      eval {
          local($SIG{__DIE__})='DEFAULT';
          my %validations;
- Line 5121  sub crsreq_checks_handler {
+ Line 6000  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 5144  sub validate_crsreq_handler {
+ Line 6024  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 5651  sub get_request {
+ Line 6578  sub get_request {
  #
  # Parameters:
  #    user_input   - The request received from the client (lonc).
+ #
  # Returns:
  #    true to keep processing, false if caller should exit.
  #
  sub process_request {
-     my ($userinput) = @_;      # Easier for now to break style than to
+     my ($userinput) = @_; # Easier for now to break style than to
-                                 # fix all the userinput -> user_input.
+                           # fix all the userinput -> user_input.
      my $wasenc    = 0;		# True if request was encrypted.
  # ------------------------------------------------------------ See if encrypted
      # for command
- Line 5736  sub process_request {
+ Line 6664  sub process_request {
  	    Debug("Client not privileged to do this operation");
  	    $ok = 0;
  	}
+         if ($ok) {
+             my $realcommand = $command;
+             if ($command eq 'querysend') {
+                 my ($query,$rest)=split(/\:/,$tail,2);
+                 $query=~s/\n*$//g;
+                 my @possqueries =
+                     qw(userlog courselog fetchenrollment institutionalphotos usersearch instdirsearch getinstuser getmultinstusers);
+                 if (grep(/^\Q$query\E$/,@possqueries)) {
+                     $command .= '_'.$query;
+                 } elsif ($query eq 'prepare activity log') {
+                     $command .= '_activitylog';
+                 }
+             }
+             if (ref($trust{$command}) eq 'HASH') {
+                 my $donechecks;
+                 if ($trust{$command}{'anywhere'}) {
+                    $donechecks = 1;
+                 } elsif ($trust{$command}{'manageronly'}) {
+                     unless (&isManager()) {
+                         $ok = 0;
+                     }
+                     $donechecks = 1;
+                 } elsif ($trust{$command}{'institutiononly'}) {
+                     unless ($clientsameinst) {
+                         $ok = 0;
+                     }
+                     $donechecks = 1;
+                 } elsif ($clientsameinst) {
+                     $donechecks = 1;
+                 }
+                 unless ($donechecks) {
+                     foreach my $rule (keys(%{$trust{$command}})) {
+                         next if ($rule eq 'remote');
+                         if ($trust{$command}{$rule}) {
+                             if ($clientprohibited{$rule}) {
+                                 $ok = 0;
+                             } else {
+                                 $ok = 1;
+                                 $donechecks = 1;
+                                 last;
+                             }
+                         }
+                     }
+                 }
+                 unless ($donechecks) {
+                     if ($trust{$command}{'remote'}) {
+                         if ($clientremoteok) {
+                             $ok = 1;
+                         } else {
+                             $ok = 0;
+                         }
+                     }
+                 }
+             }
+             $command = $realcommand;
+         }
  	if($ok) {
  	    Debug("Dispatching to handler $command $tail");
- Line 5746  sub process_request {
+ Line 6730  sub process_request {
  	    Failure($client, "refused\n", $userinput);
  	    return 1;
  	}
+     }
-     }
      print $client "unknown_cmd\n";
  # -------------------------------------------------------------------- complete
- Line 5851  sub lcpasswdstrerror {
+ Line 6834  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 5923  if (-e $pidfile) {
+ Line 6894  if (-e $pidfile) {
  $server = IO::Socket::INET->new(LocalPort => $perlvar{'londPort'},
                                  Type      => SOCK_STREAM,
                                  Proto     => 'tcp',
-                                 Reuse     => 1,
+                                 ReuseAddr     => 1,
                                  Listen    => 10 )
    or die "making socket: $@\n";
- Line 5986  sub HUPSMAN {                      # sig
+ Line 6957  sub HUPSMAN {                      # sig
  #  a setuid perl script that can be root for us to do this job.
  #
  sub ReloadApache {
-     my $execdir = $perlvar{'lonDaemons'};
+ # --------------------------- Handle case of another apachereload process (locking)
-     my $script  = $execdir."/apachereload";
+     if (&LONCAPA::try_to_lock('/tmp/lock_apachereload')) {
-     system($script);
+         my $execdir = $perlvar{'lonDaemons'};
+         my $script  = $execdir."/apachereload";
+         system($script);
+         unlink('/tmp/lock_apachereload'); #  Remove the lock file.
+     }
  }
  #
- Line 6012  sub UpdateHosts {
+ Line 6987  sub UpdateHosts {
      #  will take care of new and changed hosts as connections come into being.
      &Apache::lonnet::reset_hosts_info();
+     my %active;
      foreach my $child (keys(%children)) {
  	my $childip = $children{$child};
- Line 6021  sub UpdateHosts {
+ Line 6997  sub UpdateHosts {
  		    ." $child for ip $childip </font>");
  	    kill('INT', $child);
  	} else {
+             $active{$child} = $childip;
  	    logthis('<font color="green"> keeping child for ip '
  		    ." $childip (pid=$child) </font>");
  	}
      }
+     my %oldconf = %secureconf;
+     my %connchange;
+     if (lonssl::Read_Connect_Config(\%secureconf,\%crlchecked,\%perlvar) eq 'ok') {
+         logthis('<font color="blue"> Reloaded SSL connection rules and cleared CRL checking history </font>');
+     } else {
+         logthis('<font color="yellow"> Failed to reload SSL connection rules and clear CRL checking history </font>');
+     }
+     if ((ref($oldconf{'connfrom'}) eq 'HASH') && (ref($secureconf{'connfrom'}) eq 'HASH')) {
+         foreach my $type ('dom','intdom','other') {
+             if ((($oldconf{'connfrom'}{$type} eq 'no') && ($secureconf{'connfrom'}{$type} eq 'req')) ||
+                 (($oldconf{'connfrom'}{$type} eq 'req') && ($secureconf{'connfrom'}{$type} eq 'no'))) {
+                 $connchange{$type} = 1;
+             }
+         }
+     }
+     if (keys(%connchange)) {
+         foreach my $child (keys(%active)) {
+             my $childip = $active{$child};
+             if ($childip ne '127.0.0.1') {
+                 my $childhostname  = gethostbyaddr(Socket::inet_aton($childip),AF_INET);
+                 if ($childhostname ne '') {
+                     my $childlonhost = &Apache::lonnet::get_server_homeID($childhostname);
+                     my ($samedom,$sameinst) = &set_client_info($childlonhost);
+                     if ($samedom) {
+                         if ($connchange{'dom'}) {
+                             logthis('<font color="blue"> UpdateHosts killing child '
+                                    ." $child for ip $childip </font>");
+                             kill('INT', $child);
+                         }
+                     } elsif ($sameinst) {
+                         if ($connchange{'intdom'}) {
+                             logthis('<font color="blue"> UpdateHosts killing child '
+                                    ." $child for ip $childip </font>");
+                            kill('INT', $child);
+                         }
+                     } else {
+                         if ($connchange{'other'}) {
+                             logthis('<font color="blue"> UpdateHosts killing child '
+                                    ." $child for ip $childip </font>");
+                             kill('INT', $child);
+                         }
+                     }
+                 }
+             }
+         }
+     }
      ReloadApache;
      &status("Finished reloading hosts.tab");
  }
  sub checkchildren {
      &status("Checking on the children (sending signals)");
      &initnewstatus();
- Line 6099  sub Debug {
+ Line 7122  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)) {
- Line 6161  sub logstatus {
+ Line 7187  sub logstatus {
  sub initnewstatus {
      my $docdir=$perlvar{'lonDocRoot'};
      my $fh=IO::File->new(">$docdir/lon-status/londstatus.txt");
-     my $now=time;
+     my $now=time();
      my $local=localtime($now);
      print $fh "LOND status $local - parent $$\n\n";
      opendir(DIR,"$docdir/lon-status/londchld");
- Line 6250  $SIG{USR2} = \&UpdateHosts;
+ Line 7276  $SIG{USR2} = \&UpdateHosts;
  #  Read the host hashes:
  &Apache::lonnet::load_hosts_tab();
+ my %iphost = &Apache::lonnet::get_iphost(1);
- my $dist=`$perlvar{'lonDaemons'}/distprobe`;
+ $dist=`$perlvar{'lonDaemons'}/distprobe`;
+ my $arch = `uname -i`;
+ chomp($arch);
+ if ($arch eq 'unknown') {
+     $arch = `uname -m`;
+     chomp($arch);
+ }
+ unless (lonssl::Read_Connect_Config(\%secureconf,\%crlchecked,\%perlvar) eq 'ok') {
+     &logthis('<font color="blue">No connectionrules table. Will fallback to loncapa.conf</font>');
+ }
  # --------------------------------------------------------------
  #   Accept connections.  When a connection comes in, it is validated
- Line 6310  sub make_new_child {
+ Line 7348  sub make_new_child {
              or die "Can't unblock SIGINT for fork: $!\n";
          $children{$pid} = $clientip;
          &status('Started child '.$pid);
-         close($client);
+ 	close($client);
          return;
      } else {
          # Child can *not* return from this subroutine.
- Line 6319  sub make_new_child {
+ Line 7357  sub make_new_child {
                                  #don't get intercepted
          $SIG{USR1}= \&logstatus;
          $SIG{ALRM}= \&timeout;
+ 	#
+ 	# Block sigpipe as it gets thrownon socket disconnect and we want to
+ 	# deal with that as a read faiure instead.
+ 	#
+ 	my $blockset = POSIX::SigSet->new(SIGPIPE);
+ 	sigprocmask(SIG_BLOCK, $blockset);
          $lastlog='Forked ';
          $status='Forked';
- Line 6329  sub make_new_child {
+ Line 7374  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;
+         if ($dist =~ /^(?:centos|rhes|scientific)(\d+)$/) {
+             if ($1 >= 7) {
+                 $no_ets = 1;
+             }
+         } elsif ($dist =~ /^suse(\d+\.\d+)$/) {
+             if (($1 eq '9.3') || ($1 >= 12.2)) {
+                 $no_ets = 1;
+             }
+         } elsif ($dist =~ /^sles(\d+)$/) {
+             if ($1 > 11) {
+                 $no_ets = 1;
+             }
+         } elsif ($dist =~ /^fedora(\d+)$/) {
+             if ($1 < 7) {
+                 $no_ets = 1;
+             }
+         }
+         unless ($no_ets) {
  	    &Authen::Krb5::init_ets();
  	}
- Line 6358  sub make_new_child {
+ Line 7421  sub make_new_child {
  	    $ConnectionType = "manager";
  	    $clientname = $managers{$outsideip};
  	}
- 	my $clientok;
+ 	my ($clientok,$clientinfoset);
  	if ($clientrec || $ismanager) {
  	    &status("Waiting for init from $clientip $clientname");
- Line 6376  sub make_new_child {
+ Line 7439  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
  		# insecure (if allowed).
+                 if ($inittype eq "ssl") {
+                     my $context;
+                     if ($clientsamedom) {
+                         $context = 'dom';
+                         if ($secureconf{'connfrom'}{'dom'} eq 'no') {
+                             $inittype = "";
+                         }
+                     } elsif ($clientsameinst) {
+                         $context = 'intdom';
+                         if ($secureconf{'connfrom'}{'intdom'} eq 'no') {
+                             $inittype = "";
+                         }
+                     } else {
+                         $context = 'other';
+                         if ($secureconf{'connfrom'}{'other'} eq 'no') {
+                             $inittype = "";
+                         }
+                     }
+                     if ($inittype eq '') {
+                         &logthis("<font color=\"blue\"> Domain config set "
+                                 ."to no ssl for $clientname (context: $context)"
+                                 ." -- trying insecure auth</font>");
+                     }
+                 }
  		if($inittype eq "ssl") {
  		    my ($ca, $cert) = lonssl::CertificateFile;
  		    my $kfile       = lonssl::KeyFile;
- Line 6413  sub make_new_child {
+ Line 7507  sub make_new_child {
  			close $client;
  		    }
  		} elsif ($inittype eq "ssl") {
- 		    my $key = SSLConnection($client);
+ 		    my $key = SSLConnection($client,$clientname);
  		    if ($key) {
  			$clientok = 1;
  			my $cipherkey = pack("H32", $key);
- Line 6428  sub make_new_child {
+ Line 7522  sub make_new_child {
  		    }
  		} else {
+                     $clientinfoset = &set_client_info();
  		    my $ok = InsecureConnection($client);
  		    if($ok) {
  			$clientok = 1;
- Line 6440  sub make_new_child {
+ Line 7535  sub make_new_child {
  				  ."Attempted insecure connection disallowed </font>");
  			close $client;
  			$clientok = 0;
  		    }
  		}
  	    } else {
- Line 6449  sub make_new_child {
+ Line 7543  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 6467  sub make_new_child {
+ Line 7560  sub make_new_child {
  # ------------------------------------------------------------ Process requests
  	    my $keep_going = 1;
  	    my $user_input;
+             unless ($clientinfoset) {
+                 $clientinfoset = &set_client_info();
+             }
+             $clientremoteok = 0;
+             unless ($clientsameinst) {
+                 $clientremoteok = 1;
+                 my $defdom = &Apache::lonnet::host_domain($perlvar{'lonHostID'});
+                 %clientprohibited = &get_prohibited($defdom);
+                 if ($clientintdom) {
+                     my $remsessconf = &get_usersession_config($defdom,'remotesession');
+                     if (ref($remsessconf) eq 'HASH') {
+                         if (ref($remsessconf->{'remote'}) eq 'HASH') {
+                             if (ref($remsessconf->{'remote'}->{'excludedomain'}) eq 'ARRAY') {
+                                 if (grep(/^\Q$clientintdom\E$/,@{$remsessconf->{'remote'}->{'excludedomain'}})) {
+                                     $clientremoteok = 0;
+                                 }
+                             }
+                             if (ref($remsessconf->{'remote'}->{'includedomain'}) eq 'ARRAY') {
+                                 if (grep(/^\Q$clientintdom\E$/,@{$remsessconf->{'remote'}->{'includedomain'}})) {
+                                     $clientremoteok = 1;
+                                 } else {
+                                     $clientremoteok = 0;
+                                 }
+                             }
+                         }
+                     }
+                 }
+             }
  	    while(($user_input = get_request) && $keep_going) {
  		alarm(120);
  		Debug("Main: Got $user_input\n");
- Line 6482  sub make_new_child {
+ Line 7603  sub make_new_child {
  	    &logthis("<font color='blue'>WARNING: "
  		     ."Rejected client $clientip, closing connection</font>");
  	}
      }
  # =============================================================================
- Line 6496  sub make_new_child {
+ Line 7617  sub make_new_child {
      exit;
  }
+ #
+ #  Used to determine if a particular client is from the same domain
+ #  as the current server, or from the same internet domain.
+ #
+ #  Optional input -- the client to check for domain and internet domain.
+ #  If not specified, defaults to the package variable: $clientname
+ #
+ #  If called in array context will not set package variables, but will
+ #  instead return an array of two values - (a) true if client is in the
+ #  same domain as the server, and (b) true if client is in the same internet
+ #  domain.
+ #
+ #  If called in scalar context, sets package variables for current client:
+ #
+ #  $clienthomedom  - LonCAPA domain of homeID for client.
+ #  $clientsamedom  - LonCAPA domain same for this host and client.
+ #  $clientintdom   - LonCAPA "internet domain" for client.
+ #  $clientsameinst - LonCAPA "internet domain" same for this host & client.
+ #
+ #  returns 1 to indicate package variables have been set for current client.
+ #
+ sub set_client_info {
+     my ($lonhost) = @_;
+     $lonhost ||= $clientname;
+     my $clienthost = &Apache::lonnet::hostname($lonhost);
+     my $clientserverhomeID = &Apache::lonnet::get_server_homeID($clienthost);
+     my $homedom = &Apache::lonnet::host_domain($clientserverhomeID);
+     my $samedom = 0;
+     if ($perlvar{'lonDefDom'} eq $homedom) {
+         $samedom = 1;
+     }
+     my $intdom = &Apache::lonnet::internet_dom($clientserverhomeID);
+     my $sameinst = 0;
+     if ($intdom ne '') {
+         my $internet_names = &Apache::lonnet::get_internet_names($currenthostid);
+         if (ref($internet_names) eq 'ARRAY') {
+             if (grep(/^\Q$intdom\E$/,@{$internet_names})) {
+                 $sameinst = 1;
+             }
+         }
+     }
+     if (wantarray) {
+         return ($samedom,$sameinst);
+     } else {
+         $clienthomedom = $homedom;
+         $clientsamedom = $samedom;
+         $clientintdom = $intdom;
+         $clientsameinst = $sameinst;
+         return 1;
+     }
+ }
  #
  #   Determine if a user is an author for the indicated domain.
  #
- Line 6516  sub is_author {
+ Line 7691  sub is_author {
      #  Author role should show up as a key /domain/_au
-     my $key    = "/$domain/_au";
      my $value;
-     if (defined($hashref)) {
+     if ($hashref) {
- 	$value = $hashref->{$key};
-     }
-     if(defined($value)) {
+ 	my $key    = "/$domain/_au";
- 	&Debug("$user @ $domain is an author");
+ 	if (defined($hashref)) {
+ 	    $value = $hashref->{$key};
+ 	    if(!untie_user_hash($hashref)) {
+ 		return 'error: ' .  ($!+0)." untie (GDBM) Failed";
+ 	    }
+ 	}
+ 	if(defined($value)) {
+ 	    &Debug("$user @ $domain is an author");
+ 	}
+     } else {
+ 	return 'error: '.($!+0)." tie (GDBM) Failed";
      }
      return defined($value);
  }
  #
  #   Checks to see if the input roleput request was to set
- # an author role.  If so, invokes the lchtmldir script to set
+ # an author role.  If so, creates construction space
- # up a correct public_html
  # Parameters:
  #    request   - The request sent to the rolesput subchunk.
  #                We're looking for  /domain/_au
- Line 6541  sub is_author {
+ Line 7723  sub is_author {
  #
  sub manage_permissions {
      my ($request, $domain, $user, $authtype) = @_;
-     &Debug("manage_permissions: $request $domain $user $authtype");
      # See if the request is of the form /$domain/_au
      if($request =~ /^(\/\Q$domain\E\/_au)$/) { # It's an author rolesput...
- 	my $execdir = $perlvar{'lonDaemons'};
+         my $path=$perlvar{'lonDocRoot'}."/priv/$domain";
- 	my $userhome= "/home/$user" ;
+         unless (-e $path) {
- 	&logthis("system $execdir/lchtmldir $userhome $user $authtype");
+            mkdir($path);
- 	&Debug("Setting homedir permissions for $userhome");
+         }
- 	system("$execdir/lchtmldir $userhome $user $authtype");
+         unless (-e $path.'/'.$user) {
+            mkdir($path.'/'.$user);
+         }
      }
  }
- Line 6598  sub password_filename {
+ Line 7779  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 6697  sub validate_user {
+ Line 7888  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 6768  sub validate_user {
+ Line 7977  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 7039  sub subscribe {
+ Line 8292  sub subscribe {
                  # the metadata
  		unless ($fname=~/\.meta$/) { &unsub("$fname.meta",$clientip); }
  		$fname=~s/\/home\/httpd\/html\/res/raw/;
- 		$fname="http://".&Apache::lonnet::hostname($perlvar{'lonHostID'})."/".$fname;
+                 my $protocol = $Apache::lonnet::protocol{$perlvar{'lonHostID'}};
+                 $protocol = 'http' if ($protocol ne 'https');
+ 		$fname=$protocol.'://'.&Apache::lonnet::hostname($perlvar{'lonHostID'})."/".$fname;
  		$result="$fname\n";
  	    }
  	} else {
- Line 7081  sub change_unix_password {
+ Line 8336  sub change_unix_password {
  sub make_passwd_file {
-     my ($uname, $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 7110  sub make_passwd_file {
+ Line 8365  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(">>>Attempted to create privilged 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 "$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 7173  sub make_passwd_file {
+ Line 8382  sub make_passwd_file {
  		$result = "pass_file_failed_error";
  	    }
  	}
+     } elsif ($umode eq 'lti') {
+         my $pf = IO::File->new(">$passfilename");
+         if($pf) {
+             print $pf "lti:\n";
+             &update_passwd_history($uname,$udom,$umode,$action);
+         } else {
+             $result = "pass_file_failed_error";
+         }
      } else {
  	$result="auth_mode_error";
      }
- Line 7212  sub version {
+ Line 8429  sub version {
      return "version:$VERSION";
  }
+ sub get_usersession_config {
+     my ($dom,$name) = @_;
+     my ($usersessionconf,$cached)=&Apache::lonnet::is_cached_new($name,$dom);
+     if (defined($cached)) {
+         return $usersessionconf;
+     } else {
+         my %domconfig = &Apache::lonnet::get_dom('configuration',['usersessions'],$dom);
+         &Apache::lonnet::do_cache_new($name,$dom,$domconfig{'usersessions'},3600);
+         return $domconfig{'usersessions'};
+     }
+     return;
+ }
+ sub get_usersearch_config {
+     my ($dom,$name) = @_;
+     my ($usersearchconf,$cached)=&Apache::lonnet::is_cached_new($name,$dom);
+     if (defined($cached)) {
+         return $usersearchconf;
+     } else {
+         my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$dom);
+         &Apache::lonnet::do_cache_new($name,$dom,$domconfig{'directorysrch'},600);
+         return $domconfig{'directorysrch'};
+     }
+     return;
+ }
+ sub get_prohibited {
+     my ($dom) = @_;
+     my $name = 'trust';
+     my ($trustconfig,$cached)=&Apache::lonnet::is_cached_new($name,$dom);
+     unless (defined($cached)) {
+         my %domconfig = &Apache::lonnet::get_dom('configuration',['trust'],$dom);
+         &Apache::lonnet::do_cache_new($name,$dom,$domconfig{'trust'},3600);
+         $trustconfig = $domconfig{'trust'};
+     }
+     my %prohibited;
+     if (ref($trustconfig)) {
+         foreach my $prefix (keys(%{$trustconfig})) {
+             if (ref($trustconfig->{$prefix}) eq 'HASH') {
+                 my $reject;
+                 if (ref($trustconfig->{$prefix}->{'exc'}) eq 'ARRAY') {
+                     if (grep(/^\Q$clientintdom\E$/,@{$trustconfig->{$prefix}->{'exc'}})) {
+                         $reject = 1;
+                     }
+                 }
+                 if (ref($trustconfig->{$prefix}->{'inc'}) eq 'ARRAY') {
+                     if (grep(/^\Q$clientintdom\E$/,@{$trustconfig->{$prefix}->{'inc'}})) {
+                         $reject = 0;
+                     } else {
+                         $reject = 1;
+                     }
+                 }
+                 if ($reject) {
+                     $prohibited{$prefix} = 1;
+                 }
+             }
+         }
+     }
+     return %prohibited;
+ }
+ sub distro_and_arch {
+     return $dist.':'.$arch;
+ }
  # ----------------------------------- POD (plain old documentation, CPAN style)
- Line 7392  Allow for a password to be set.
+ Line 8673  Allow for a password to be set.
  Make a user.
- =item passwd
+ =item changeuserauth
  Allow for authentication mechanism and password to be changed.
- Line 7420  Place in B<logs/lond.log>
+ Line 8701  Place in B<logs/lond.log>
  stores hash in namespace
- =item rolesputy
+ =item rolesput
  put a role into a user's environment
- Line 7481  for each student, defined perhaps by the
+ Line 8762  for each student, defined perhaps by the
  Returns usernames corresponding to IDs.  (These "IDs" are unique identifiers
  for each student, defined perhaps by the institutional Registrar.)
+ =item iddel
+ Deletes one or more ids in a domain's id database.
  =item tmpput
  Accept and store information in temporary space.
- Line 7530  IO::File
+ Line 8815  IO::File
  Apache::File
  POSIX
  Crypt::IDEA
- LWP::UserAgent()
  GDBM_File
  Authen::Krb4
  Authen::Krb5
  =head1 COREQUISITES
+ none
  =head1 OSNAMES
  linux
- Line 7624  or the CA's certificate in the call to l
+ Line 8910  or the CA's certificate in the call to l
  <error> 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
- Line 7745  Could not rewrite the
+ Line 9031  Could not rewrite the
  internal password file for a user
  =item Result of password change for <user> : <result>
  A unix password change for <user> was attempted
  and the pipe returned <result>
- Line 7774  lond has been asked to exit by its clien
+ Line 9060  lond has been asked to exit by its clien
  client systemand <input> is the full exit command sent to the server.
  =item Red CRITICAL: ABNORMAL EXIT. child <pid> for server <hostname> died through a crass with this error->[<message>].
  A lond child terminated.  NOte that this termination can also occur when the
  child receives the QUIT or DIE signals.  <pid> is the process id of the child,
  <hostname> the host lond is working for, and <message> the reason the child died
- Line 7858  file when sent it's USR1 signal.  That p
+ Line 9144  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 ------
- Line 7872  Started a new child process for <client>
+ Line 9158  Started a new child process for <client>
  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.
- Line 7883  In child process initialization.  The pe
+ Line 9169  In child process initialization.  The pe
  The client address is stored as "Unavailable" and processing continues.
  =item (Yellow) INFO: Connection <ip> <name> connection type = <type>
  In child initialization.  A good connectionw as received from <ip>.
  =over 2
- Line 7933  The client (<client> is the peer's name
+ Line 9219  The client (<client> is the peer's name
  negotiated an SSL connection with this child process.
  =item (Green) Successful insecure authentication with <client>
  The client has successfully negotiated an  insecure connection withthe child process.

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

Removed from v.1.446.2.1
changed lines
	Added in v.1.546