loncom/lond - diff

Return to lond CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lond between versions 1.484 and 1.530

-version 1.484, 2011/11/07 18:13:37
+version 1.530, 2016/09/27 15:58:59
  Line 15
  #
  # LON-CAPA is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  # GNU General Public License for more details.
  #
- Line 34  use strict;
+ Line 33  use strict;
  use lib '/home/httpd/lib/perl/';
  use LONCAPA;
  use LONCAPA::Configuration;
+ use LONCAPA::Lond;
  use IO::Socket;
  use IO::File;
  #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 54  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 70  my $clientip;   # IP address of client.
+ Line 74  my $clientip;   # IP address of client.
  my $clientname;			# LonCAPA name of client.
  my $clientversion;              # LonCAPA version running on client.
  my $clienthomedom;              # LonCAPA domain of homeID for client.
-                                 # primary library server.
+ my $clientintdom;               # LonCAPA "internet domain" for 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 129  my @passwderrors = ("ok",
+ Line 139  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
+                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},
+                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 639  sub ConfigFileFromSelector {
+ Line 769  sub ConfigFileFromSelector {
  #     String to send to client ("ok" or "refused" if bad file).
  #
  sub PushFile {
      my $request = shift;
      my ($command, $filename, $contents) = split(":", $request, 3);
      &Debug("PushFile");
- Line 669  sub PushFile {
+ Line 799  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 1402  sub du2_handler {
+ Line 1568  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/res/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:
+ #    /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/
+ #
+ #    the response will be "refused".
+ #
  # Parameters:
  #    $cmd        - The command that dispatched us (ls).
  #    $ulsdir     - The directory path to list... I'm not sure what this
- Line 1423  sub ls_handler {
+ Line 1603  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_username/userfiles/})) {
+                 &Failure($client,"refused\n",$userinput);
+                 return 1;
+             }
  	    if (opendir(LSDIR,$ulsdir)) {
  		while ($ulsfn=readdir(LSDIR)) {
  		    undef($obs);
- Line 1448  sub ls_handler {
+ Line 1637  sub ls_handler {
  		closedir(LSDIR);
  	    }
  	} else {
+             unless ($ulsdir =~ m{/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_username/}) {
+                 &Failure($client,"refused\n",$userinput);
+                 return 1;
+             }
  	    my @ulsstats=stat($ulsdir);
  	    $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
  	}
- Line 1472  sub ls_handler {
+ Line 1665  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/res/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:
+ #    /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/
+ #
+ #    the response will be "refused".
+ #
  # Parameters:
  #    $cmd        - The command that dispatched us (ls).
  #    $ulsdir     - The directory path to list... I'm not sure what this
- Line 1492  sub ls2_handler {
+ Line 1699  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_username/userfiles/})) {
+                 &Failure($client,"refused\n","$userinput");
+                 return 1;
+             }
              if (opendir(LSDIR,$ulsdir)) {
                  while ($ulsfn=readdir(LSDIR)) {
                      undef($obs);
- Line 1518  sub ls2_handler {
+ Line 1734  sub ls2_handler {
                  closedir(LSDIR);
              }
          } else {
+             unless ($ulsdir =~ m{/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_username/}) {
+                 &Failure($client,"refused\n",$userinput);
+                 return 1;
+             }
              my @ulsstats=stat($ulsdir);
              $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
          }
- Line 1534  sub ls2_handler {
+ Line 1754  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/res/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:
+ #    /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/
+ #
+ #    the response will be "refused".
+ #
  # Parameters:
  #    $cmd        - The command that dispatched us (ls).
  #    $tail       - The tail of the request that invoked us.
- Line 1573  sub ls3_handler {
+ Line 1809  sub ls3_handler {
      }
      my $dir_root = $perlvar{'lonDocRoot'};
-     if ($getpropath) {
+     if (($getpropath) || ($getuserdir)) {
          if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) {
              $dir_root = &propath($udom,$uname);
              $dir_root =~ s/\/$//;
          } else {
-             &Failure($client,"refused\n","$cmd:$tail");
+             &Failure($client,"refused\n",$userinput);
-             return 1;
-         }
-     } elsif ($getuserdir) {
-         if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) {
-             my $subdir=$uname.'__';
-             $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
-             $dir_root = $Apache::lonnet::perlvar{'lonUsersDir'}
-                        ."/$udom/$subdir/$uname";
-         } else {
-             &Failure($client,"refused\n","$cmd:$tail");
              return 1;
          }
      } elsif ($alternate_root ne '') {
- Line 1601  sub ls3_handler {
+ Line 1827  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_username/userfiles/}) ||
+                     (($ulsdir =~ m{/home/httpd/html/priv/$LONCAPA::match_domain/}) && ($islocal))) {
+                 &Failure($client,"refused\n",$userinput);
+                 return 1;
+             }
              if (opendir(LSDIR,$ulsdir)) {
                  while ($ulsfn=readdir(LSDIR)) {
                      undef($obs);
- Line 1631  sub ls3_handler {
+ Line 1873  sub ls3_handler {
                  closedir(LSDIR);
              }
          } else {
+             unless (($getpropath) || ($getuserdir) ||
+                     ($ulsdir =~ m{/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_username/})) {
+                 &Failure($client,"refused\n",$userinput);
+                 return 1;
+             }
              my @ulsstats=stat($ulsdir);
              $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
          }
- Line 1703  sub read_lonnet_global {
+ Line 1950  sub read_lonnet_global {
  sub server_devalidatecache_handler {
      my ($cmd,$tail,$client) = @_;
      my $userinput = "$cmd:$tail";
-     my ($name,$id) = map { &unescape($_); } split(/:/,$tail);
+     my $items = &unescape($tail);
-     &Apache::lonnet::devalidate_cache_new($name,$id);
+     my @cached = split(/\&/,$items);
+     foreach my $key (@cached) {
+         if ($key =~ /:/) {
+             my ($name,$id) = map { &unescape($_); } split(/:/,$key);
+             &Apache::lonnet::devalidate_cache_new($name,$id);
+         }
+     }
      my $result = 'ok';
      &Reply($client,\$result,$userinput);
      return 1;
- Line 1768  sub server_distarch_handler {
+ Line 2021  sub server_distarch_handler {
  }
  &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 1900  sub authenticate_handler {
+ Line 2163  sub authenticate_handler {
                  my ($remote,$hosted);
                  my $remotesession = &get_usersession_config($udom,'remotesession');
                  if (ref($remotesession) eq 'HASH') {
-                     $remote = $remotesession->{'remote'}
+                     $remote = $remotesession->{'remote'};
                  }
                  my $hostedsession = &get_usersession_config($clienthomedom,'hostedsession');
                  if (ref($hostedsession) eq 'HASH') {
                      $hosted = $hostedsession->{'hosted'};
                  }
-                 my $loncaparev = $clientversion;
-                 if ($loncaparev eq '') {
-                     $loncaparev = $Apache::lonnet::loncaparevs{$clientname};
-                 }
                  $canhost = &Apache::lonnet::can_host_session($udom,$clientname,
-                                                              $loncaparev,
+                                                              $clientversion,
                                                               $remote,$hosted);
              }
          }
- Line 1991  sub change_password_handler {
+ Line 2250  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 2008  sub change_password_handler {
+ Line 2266  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 2030  sub change_password_handler {
+ Line 2291  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 $defaultcost;
+         my %domconfig =
+             &Apache::lonnet::get_dom('configuration',['password'],$domain);
+         if (ref($domconfig{'password'}) eq 'HASH') {
+             $defaultcost = $domconfig{'password'}{'cost'};
+         }
+         if (($defaultcost eq '') || ($defaultcost =~ /D/)) {
+             $cost = 10;
+         } else {
+             $cost = $defaultcost;
+         }
+         # Generate random 16-octet base64 salt
+         $salt = "";
+         $salt .= pack("C", int rand(256)) for 1..16;
+     }
+     my $hash = &Crypt::Eksblowfish::Bcrypt::bcrypt_hash({
+         key_nul => 1,
+         cost    => $cost,
+         salt    => $salt,
+     }, Digest::SHA::sha512(Encode::encode('UTF-8',$plainpass)));
+     my $result = join("!", "", "bcrypt", sprintf("%02d",$cost),
+                 &Crypt::Eksblowfish::Bcrypt::en_base64($salt).
+                 &Crypt::Eksblowfish::Bcrypt::en_base64($hash));
+     return $result;
+ }
  #
  #   Create a new user.  User in this case means a lon-capa user.
  #   The user must either already exist in some authentication realm
- Line 2073  sub add_user_handler {
+ Line 2370  sub add_user_handler {
  		    ."makeuser";
  	    }
  	    unless ($fperror) {
- 		my $result=&make_passwd_file($uname,$udom,$umode,$npass, $passfilename);
+ 		my $result=&make_passwd_file($uname,$udom,$umode,$npass,
+                                              $passfilename,'makeuser');
  		&Reply($client,\$result, $userinput);     #BUGBUG - could be fail
  	    } else {
  		&Failure($client, \$fperror, $userinput);
- Line 2134  sub change_authentication_handler {
+ Line 2432  sub change_authentication_handler {
  	my $passfilename = &password_path($udom, $uname);
  	if ($passfilename) {	# Not allowed to create a new user!!
  	    # If just changing the unix passwd. need to arrange to run
- 	    # passwd since otherwise make_passwd_file will run
+ 	    # passwd since otherwise make_passwd_file will fail as
- 	    # lcuseradd which fails if an account already exists
+ 	    # creation of unix authenticated users is no longer supported
- 	    # (to prevent an unscrupulous LONCAPA admin from stealing
+             # except from the command line, when running make_domain_coordinator.pl
- 	    # an existing account by overwriting it as a LonCAPA account).
  	    if(($oldauth =~/^unix/) && ($umode eq "unix")) {
  		my $result = &change_unix_password($uname, $npass);
  		&logthis("Result of password change for $uname: ".$result);
  		if ($result eq "ok") {
+                     &update_passwd_history($uname,$udom,$umode,'changeuserauth');
  		    &Reply($client, \$result);
  		} else {
  		    &Failure($client, \$result);
  		}
  	    } else {
- 		my $result=&make_passwd_file($uname,$udom,$umode,$npass,$passfilename);
+ 		my $result=&make_passwd_file($uname,$udom,$umode,$npass,
+                                              $passfilename,'changeuserauth');
  		#
  		#  If the current auth mode is internal, and the old auth mode was
  		#  unix, or krb*,  and the user is an author for this domain,
  		#  re-run manage_permissions for that role in order to be able
  		#  to take ownership of the construction space back to www:www
  		#
- 		if( (($oldauth =~ /^unix/) && ($umode eq "internal")) ||
- 		    (($oldauth =~ /^internal/) && ($umode eq "unix")) ) {
- 		    if(&is_author($udom, $uname)) {
- 			&Debug(" Need to manage author permissions...");
- 			&manage_permissions("/$udom/_au", $udom, $uname, "$umode:");
- 		    }
- 		}
  		&Reply($client, \$result, $userinput);
  	    }
- Line 2176  sub change_authentication_handler {
+ Line 2468  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 2262  sub update_resource_handler {
+ Line 2565  sub update_resource_handler {
  # FIXME: this should use the LWP mechanism, not internal alarms.
                  alarm(1200);
  		{
- 		    my $ua=new LWP::UserAgent;
  		    my $request=new HTTP::Request('GET',"$remoteurl");
- 		    $response=$ua->request($request,$transname);
+                     $response=&LONCAPA::LWPReq::makerequest($clientname,$request,$transname,\%perlvar,1200,0,1);
  		}
  		alarm(0);
  		if ($response->is_error()) {
- Line 2277  sub update_resource_handler {
+ Line 2579  sub update_resource_handler {
  # FIXME: isn't there an internal LWP mechanism for this?
  			alarm(120);
  			{
- 			    my $ua=new LWP::UserAgent;
  			    my $mrequest=new HTTP::Request('GET',$remoteurl.'.meta');
- 			    my $mresponse=$ua->request($mrequest,$fname.'.meta');
+                             my $mresponse = &LONCAPA::LWPReq::makerequest($clientname,$mrequest,$fname.'.meta',\%perlvar,120,0,1);
  			    if ($mresponse->is_error()) {
  				unlink($fname.'.meta');
  			    }
- Line 2350  sub fetch_user_file_handler {
+ Line 2651  sub fetch_user_file_handler {
  	my $transname=$udir.'/'.$ufile.'.in.transit';
          my $clientprotocol=$Apache::lonnet::protocol{$clientname};
          $clientprotocol = 'http' if ($clientprotocol ne 'https');
- 	my $remoteurl=$clientprotocol.'://'.$clientip.'/userfiles/'.$fname;
+ 	my $clienthost = &Apache::lonnet::hostname($clientname);
+ 	my $remoteurl=$clientprotocol.'://'.$clienthost.'/userfiles/'.$fname;
  	my $response;
  	Debug("Remote URL : $remoteurl Transfername $transname Destname: $destname");
- 	alarm(120);
+ 	alarm(1200);
  	{
- 	    my $ua=new LWP::UserAgent;
  	    my $request=new HTTP::Request('GET',"$remoteurl");
- 	    $response=$ua->request($request,$transname);
+             my $verifycert = 1;
+             my @machine_ids = &Apache::lonnet::current_machine_ids();
+             if (grep(/^\Q$clientname\E$/,@machine_ids)) {
+                 $verifycert = 0;
+             }
+             $response = &LONCAPA::LWPReq::makerequest($clientname,$request,$transname,\%perlvar,1200,$verifycert);
  	}
  	alarm(0);
  	if ($response->is_error()) {
- Line 2372  sub fetch_user_file_handler {
+ Line 2678  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 2408  sub remove_user_file_handler {
+ Line 2732  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 2775  sub newput_user_profile_entry {
+ Line 3108  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 3178  sub get_profile_keys {
+ Line 3515  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 3244  sub dump_profile_database {
+ Line 3592  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 3253  sub dump_profile_database {
+ Line 3604  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,$extra)=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());
-     my $skipcheck;
-     if ($hashref) {
-         my $qresult='';
- 	my $count=0;
-         if ($extra ne '') {
-             $extra = &Apache::lonnet::thaw_unescape($extra);
-             $skipcheck = $extra->{'skipcheck'};
-         }
-         my @ids = &Apache::lonnet::current_machine_ids();
-         my (%homecourses,$major,$minor,$now);
-         if (($namespace eq 'roles') && (!$skipcheck)) {
-             my $loncaparev = $clientversion;
-             if ($loncaparev eq '') {
-                 $loncaparev = $Apache::lonnet::loncaparevs{$clientname};
-             }
-             if ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?/) {
-                 $major = $1;
-                 $minor = $2;
-             }
-             $now = time;
-         }
- 	while (my ($key,$value) = each(%$hashref)) {
-             if ($namespace eq 'roles') {
-                 if ($key =~ m{^/($LONCAPA::match_domain)/($LONCAPA::match_courseid)(/?[^_]*)_(cc|co|in|ta|ep|ad|st|cr)$}) {
-                     my $cdom = $1;
-                     my $cnum = $2;
-                     unless ($skipcheck) {
-                         my ($role,$end,$start) = split(/\_/,$value);
-                         if (!$end || $end > $now) {
-                             next unless (&releasereqd_check($cnum,$cdom,$key,$value,$major,
-                                                             $minor,\%homecourses,\@ids));
-                         }
-                     }
-                 }
-             }
- 	    if ($regexp eq '.') {
- 		$count++;
- 		if (defined($range) && $count >= $end)   { last; }
- 		if (defined($range) && $count <  $start) { next; }
- 		$qresult.=$key.'='.$value.'&';
- 	    } else {
- 		my $unescapeKey = &unescape($key);
- 		if (eval('$unescapeKey=~/$regexp/')) {
- 		    $count++;
- 		    if (defined($range) && $count >= $end)   { last; }
- 		    if (defined($range) && $count <  $start) { next; }
- 		    $qresult.="$key=$value&";
- 		}
- 	    }
- 	}
- 	if (&untie_user_hash($hashref)) {
-             if (($namespace eq 'roles') && (!$skipcheck)) {
-                 if (keys(%homecourses) > 0) {
-                     $qresult .= &check_homecourses(\%homecourses,$udom,$regexp,$count,
-                                                    $range,$start,$end,$major,$minor);
-                 }
-             }
- 	    chop($qresult);
- 	    &Reply($client, \$qresult, $userinput);
- 	} else {
- 	    &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
- 		     "while attempting dump\n", $userinput);
- 	}
      } else {
- 	&Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
+         Reply($client, \$res, "$cmd:$tail");
- 		"while attempting dump\n", $userinput);
      }
      return 1;
- Line 3356  sub dump_with_regexp {
+ Line 3626  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 3364  sub dump_with_regexp {
+ Line 3637  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 3393  sub store_handler {
+ Line 3688  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 3909  sub put_course_id_hash_handler {
+ Line 4208  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 3918  sub put_course_id_hash_handler {
+ Line 4219  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 3996  sub dump_course_id_handler {
+ Line 4308  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 4084  sub dump_course_id_handler {
+ Line 4399  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 4359  sub put_domain_handler {
+ Line 4677  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 4506  sub get_id_handler {
+ Line 4940  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 5054  sub validate_instcode_handler {
+ Line 5531  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 5220  sub create_auto_enroll_password_handler
+ Line 5698  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 5240  sub retrieve_auto_file_handler {
+ Line 5763  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 5272  sub crsreq_checks_handler {
+ Line 5800  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 5299  sub crsreq_checks_handler {
+ Line 5827  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 5322  sub validate_crsreq_handler {
+ Line 5851  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 5829  sub get_request {
+ Line 6405  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 5914  sub process_request {
+ Line 6491  sub process_request {
  	    Debug("Client not privileged to do this operation");
  	    $ok = 0;
  	}
+         if ($ok) {
+             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;
+                         }
+                     }
+                 }
+             }
+         }
  	if($ok) {
  	    Debug("Dispatching to handler $command $tail");
- Line 5924  sub process_request {
+ Line 6544  sub process_request {
  	    Failure($client, "refused\n", $userinput);
  	    return 1;
  	}
+     }
-     }
      print $client "unknown_cmd\n";
  # -------------------------------------------------------------------- complete
- Line 6029  sub lcpasswdstrerror {
+ Line 6648  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 6281  sub Debug {
+ Line 6888  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 6526  sub make_new_child {
+ Line 7136  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 6573  sub make_new_child {
+ Line 7201  sub make_new_child {
  		#  If the remote is attempting a local init... give that a try:
  		#
  		(my $i, my $inittype, $clientversion) = split(/:/, $remotereq);
+         # For LON-CAPA 2.9, the  client session will have sent its LON-CAPA
+         # version when initiating the connection. For LON-CAPA 2.8 and older,
+         # the version is retrieved from the global %loncaparevs in lonnet.pm.
+         # $clientversion contains path to keyfile if $inittype eq 'local'
+         # it's overridden below in this case
+         $clientversion ||= $Apache::lonnet::loncaparevs{$clientname};
  		# If the connection type is ssl, but I didn't get my
  		# certificate files yet, then I'll drop  back to
- Line 6667  sub make_new_child {
+ Line 7301  sub make_new_child {
              my $clienthost = &Apache::lonnet::hostname($clientname);
              my $clientserverhomeID = &Apache::lonnet::get_server_homeID($clienthost);
              $clienthomedom = &Apache::lonnet::host_domain($clientserverhomeID);
+             $clientintdom = &Apache::lonnet::internet_dom($clientserverhomeID);
+             $clientsameinst = 0;
+             if ($clientintdom ne '') {
+                 my $internet_names = &Apache::lonnet::get_internet_names($currenthostid);
+                 if (ref($internet_names) eq 'ARRAY') {
+                     if (grep(/^\Q$clientintdom\E$/,@{$internet_names})) {
+                         $clientsameinst = 1;
+                     }
+                 }
+             }
+             $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 6682  sub make_new_child {
+ Line 7351  sub make_new_child {
  	    &logthis("<font color='blue'>WARNING: "
  		     ."Rejected client $clientip, closing connection</font>");
  	}
      }
  # =============================================================================
- Line 6716  sub is_author {
+ Line 7385  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);
- Line 6898  sub validate_user {
+ Line 7575  sub validate_user {
      }
      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 $ncpass = &hash_passwd($domain,$password);
+                     if (&rewrite_password_file($domain,$user,"$howpwd:$ncpass")) {
+                         &update_passwd_history($user,$domain,$howpwd,'conversion');
+                         &logthis("Validated password hashed with bcrypt for $user:$domain");
+                     }
+                 }
+             } else {
+                 $validated = &check_internal_passwd($password,$contentpwd,$domain);
+             }
  	}
  	elsif ($howpwd eq "unix") { # User is a normal unix user.
  	    $contentpwd = (getpwnam($user))[1];
- Line 6966  sub validate_user {
+ Line 7654  sub validate_user {
      return $validated;
  }
+ sub check_internal_passwd {
+     my ($plainpass,$stored,$domain) = @_;
+     my (undef,$method,@rest) = split(/!/,$stored);
+     if ($method eq "bcrypt") {
+         my $result = &hash_passwd($domain,$plainpass,@rest);
+         if ($result ne $stored) {
+             return 0;
+         }
+         # Upgrade to a larger number of rounds if necessary
+         my $defaultcost;
+         my %domconfig =
+             &Apache::lonnet::get_dom('configuration',['password'],$domain);
+         if (ref($domconfig{'password'}) eq 'HASH') {
+             $defaultcost = $domconfig{'password'}{'cost'};
+         }
+         if (($defaultcost eq '') || ($defaultcost =~ /D/)) {
+             $defaultcost = 10;
+         }
+         return 1 unless($rest[0]<$defaultcost);
+     }
+     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 7281  sub change_unix_password {
+ Line 8002  sub change_unix_password {
  sub make_passwd_file {
-     my ($uname,$udom,$umode,$npass,$passfilename)=@_;
+     my ($uname,$udom,$umode,$npass,$passfilename,$action)=@_;
      my $result="ok";
      if ($umode eq 'krb4' or $umode eq 'krb5') {
  	{
  	    my $pf = IO::File->new(">$passfilename");
  	    if ($pf) {
  		print $pf "$umode:$npass\n";
+                 &update_passwd_history($uname,$udom,$umode,$action);
  	    } else {
  		$result = "pass_file_failed_error";
  	    }
  	}
      } elsif ($umode eq 'internal') {
- 	my $salt=time;
+         my $ncpass = &hash_passwd($udom,$npass);
- 	$salt=substr($salt,6,2);
- 	my $ncpass=crypt($npass,$salt);
  	{
  	    &Debug("Creating internal auth");
  	    my $pf = IO::File->new(">$passfilename");
  	    if($pf) {
  		print $pf "internal:$ncpass\n";
+                 &update_passwd_history($uname,$udom,$umode,$action);
  	    } else {
  		$result = "pass_file_failed_error";
  	    }
- Line 7310  sub make_passwd_file {
+ Line 8031  sub make_passwd_file {
  	    my $pf = IO::File->new(">$passfilename");
  	    if($pf) {
  		print $pf "localauth:$npass\n";
+                 &update_passwd_history($uname,$udom,$umode,$action);
  	    } else {
  		$result = "pass_file_failed_error";
  	    }
  	}
      } elsif ($umode eq 'unix') {
- 	{
+ 	&logthis(">>>Attempt to create unix account blocked -- unix auth not available for new users.");
- 	    #
+ 	$result="no_new_unix_accounts";
- 	    #  Don't allow the creation of privileged accounts!!! that would
- 	    #  be real bad!!!
- 	    #
- 	    my $uid = getpwnam($uname);
- 	    if((defined $uid) && ($uid == 0)) {
- 		&logthis(">>>Attempt to create privileged account blocked");
- 		return "no_priv_account_error\n";
- 	    }
- 	    my $execpath       ="$perlvar{'lonDaemons'}/"."lcuseradd";
- 	    my $lc_error_file  = $execdir."/tmp/lcuseradd".$$.".status";
- 	    {
- 		&Debug("Executing external: ".$execpath);
- 		&Debug("user  = ".$uname.", Password =". $npass);
- 		my $se = IO::File->new("|$execpath > $perlvar{'lonDaemons'}/logs/lcuseradd.log");
- 		print $se "$uname\n";
-                 print $se "$udom\n";
- 		print $se "$npass\n";
- 		print $se "$npass\n";
- 		print $se "$lc_error_file\n"; # Status -> unique file.
- 	    }
- 	    if (-r $lc_error_file) {
- 		&Debug("Opening error file: $lc_error_file");
- 		my $error = IO::File->new("< $lc_error_file");
- 		my $useraddok = <$error>;
- 		$error->close;
- 		unlink($lc_error_file);
- 		chomp $useraddok;
- 		if($useraddok > 0) {
- 		    my $error_text = &lcuseraddstrerror($useraddok);
- 		    &logthis("Failed lcuseradd: $error_text");
- 		    $result = "lcuseradd_failed:$error_text";
- 		}  else {
- 		    my $pf = IO::File->new(">$passfilename");
- 		    if($pf) {
- 			print $pf "unix:\n";
- 		    } else {
- 			$result = "pass_file_failed_error";
- 		    }
- 		}
- 	    }  else {
- 		&Debug("Could not locate lcuseradd error: $lc_error_file");
- 		$result="bug_lcuseradd_no_output_file";
- 	    }
- 	}
      } elsif ($umode eq 'none') {
  	{
  	    my $pf = IO::File->new("> $passfilename");
- Line 7420  sub get_usersession_config {
+ Line 8094  sub get_usersession_config {
          return $usersessionconf;
      } else {
          my %domconfig = &Apache::lonnet::get_dom('configuration',['usersessions'],$dom);
-         if (ref($domconfig{'usersessions'}) eq 'HASH') {
+         &Apache::lonnet::do_cache_new($name,$dom,$domconfig{'usersessions'},3600);
-             &Apache::lonnet::do_cache_new($name,$dom,$domconfig{'usersessions'},3600);
+         return $domconfig{'usersessions'};
-             return $domconfig{'usersessions'};
-         }
-     }
-     return;
- }
- sub releasereqd_check {
-     my ($cnum,$cdom,$key,$value,$major,$minor,$homecourses,$ids) = @_;
-     my $home = &Apache::lonnet::homeserver($cnum,$cdom);
-     return if ($home eq 'no_host');
-     my ($reqdmajor,$reqdminor,$displayrole);
-     if ($cnum =~ /$LONCAPA::match_community/) {
-         if ($major eq '' && $minor eq '') {
-             return unless ((ref($ids) eq 'ARRAY') &&
-                            (grep(/^\Q$home\E$/,@{$ids})));
-         } else {
-             $reqdmajor = 2;
-             $reqdminor = 9;
-             return unless (&useable_role($reqdmajor,$reqdminor,$major,$minor));
-         }
-     }
-     my $hashid = $cdom.':'.$cnum;
-     my ($courseinfo,$cached) =
-         &Apache::lonnet::is_cached_new('courseinfo',$hashid);
-     if (defined($cached)) {
-         if (ref($courseinfo) eq 'HASH') {
-             if (exists($courseinfo->{'releaserequired'})) {
-                 my ($reqdmajor,$reqdminor) = split(/\./,$courseinfo->{'releaserequired'});
-                 return unless (&useable_role($reqdmajor,$reqdminor,$major,$minor));
-             }
-         }
-     } else {
-         if (ref($ids) eq 'ARRAY') {
-             if (grep(/^\Q$home\E$/,@{$ids})) {
-                 if (ref($homecourses) eq 'HASH') {
-                     if (ref($homecourses->{$hashid}) eq 'ARRAY') {
-                         push(@{$homecourses->{$hashid}},{$key=>$value});
-                     } else {
-                         $homecourses->{$hashid} = [{$key=>$value}];
-                     }
-                 }
-                 return;
-             }
-         }
-         my $courseinfo = &get_courseinfo_hash($cnum,$cdom,$home);
-         if (ref($courseinfo) eq 'HASH') {
-             if (exists($courseinfo->{'releaserequired'})) {
-                 my ($reqdmajor,$reqdminor) = split(/\./,$courseinfo->{'releaserequired'});
-                 return unless (&useable_role($reqdmajor,$reqdminor,$major,$minor));
-             }
-         } else {
-             return;
-         }
-     }
-     return 1;
- }
- sub get_courseinfo_hash {
-     my ($cnum,$cdom,$home) = @_;
-     my %info;
-     eval {
-         local($SIG{ALRM}) = sub { die "timeout\n"; };
-         local($SIG{__DIE__})='DEFAULT';
-         alarm(3);
-         %info = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,1,[$home],'.');
-         alarm(0);
-     };
-     if ($@) {
-         if ($@ eq "timeout\n") {
-             &logthis("<font color='blue'>WARNING courseiddump for $cnum:$cdom from $home timedout</font>");
-         } else {
-             &logthis("<font color='yellow'>WARNING unexpected error during eval of call for courseiddump from $home</font>");
-         }
-     } else {
-         if (ref($info{$cdom.'_'.$cnum}) eq 'HASH') {
-             my $hashid = $cdom.':'.$cnum;
-             return &Apache::lonnet::do_cache_new('courseinfo',$hashid,$info{$cdom.'_'.$cnum},600);
-         }
      }
      return;
  }
- sub check_homecourses {
+ sub get_prohibited {
-     my ($homecourses,$udom,$regexp,$count,$range,$start,$end,$major,$minor) = @_;
+     my ($dom) = @_;
-     my ($result,%addtocache);
+     my $name = 'trust';
-     my $yesterday = time - 24*3600;
+     my ($trustconfig,$cached)=&Apache::lonnet::is_cached_new($name,$dom);
-     if (ref($homecourses) eq 'HASH') {
+     unless (defined($cached)) {
-         my (%okcourses,%courseinfo,%recent);
+         my %domconfig = &Apache::lonnet::get_dom('configuration',['trust'],$dom);
-         my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());
+         &Apache::lonnet::do_cache_new($name,$dom,$domconfig{'trust'},3600);
-         if ($hashref) {
+         $trustconfig = $domconfig{'trust'};
-             while (my ($key,$value) = each(%$hashref)) {
+     }
-                 my $unesc_key = &unescape($key);
+     my %prohibited;
-                 if ($unesc_key =~ /^lasttime:(\w+)$/) {
+     if (ref($trustconfig)) {
-                     my $cid = $1;
+         foreach my $prefix (keys(%{$trustconfig})) {
-                     $cid =~ s/_/:/;
+             if (ref($trustconfig->{$prefix}) eq 'HASH') {
-                     if ($value > $yesterday ) {
+                 my $reject;
-                         $recent{$cid} = 1;
+                 if (ref($trustconfig->{$prefix}->{'exc'}) eq 'ARRAY') {
+                     if (grep(/^\Q$clientintdom\E$/,@{$trustconfig->{$prefix}->{'exc'}})) {
+                         $reject = 1;
                      }
-                     next;
                  }
-                 my $items = &Apache::lonnet::thaw_unescape($value);
+                 if (ref($trustconfig->{$prefix}->{'inc'}) eq 'ARRAY') {
-                 if (ref($items) eq 'HASH') {
+                     if (grep(/^\Q$clientintdom\E$/,@{$trustconfig->{$prefix}->{'inc'}})) {
-                     my $hashid = $unesc_key;
+                         $reject = 0;
-                     $hashid =~ s/_/:/;
+                     } else {
-                     $courseinfo{$hashid} = $items;
+                         $reject = 1;
-                     if (ref($homecourses->{$hashid}) eq 'ARRAY') {
-                         my ($reqdmajor,$reqdminor) = split(/\./,$items->{'releaserequired'});
-                         if (&useable_role($reqdmajor,$reqdminor,$major,$minor)) {
-                             $okcourses{$hashid} = 1;
-                         }
                      }
                  }
-             }
+                 if ($reject) {
-             unless (&untie_domain_hash($hashref)) {
+                     $prohibited{$prefix} = 1;
-                 &logthis('Failed to untie tied hash for nohist_courseids.db');
-             }
-         } else {
-             &logthis('Failed to tie hash for nohist_courseids.db');
-             return;
-         }
-         foreach my $hashid (keys(%recent)) {
-             my ($result,$cached)=&Apache::lonnet::is_cached_new('courseinfo',$hashid);
-             unless ($cached) {
-                 &Apache::lonnet::do_cache_new('courseinfo',$hashid,$courseinfo{$hashid},600);
-             }
-         }
-         foreach my $hashid (keys(%{$homecourses})) {
-             next if ($recent{$hashid});
-             &Apache::lonnet::do_cache_new('courseinfo',$hashid,$courseinfo{$hashid},600);
-         }
-         foreach my $hashid (keys(%okcourses)) {
-             if (ref($homecourses->{$hashid}) eq 'ARRAY') {
-                 foreach my $role (@{$homecourses->{$hashid}}) {
-                     if (ref($role) eq 'HASH') {
-                         while (my ($key,$value) = each(%{$role})) {
-                             if ($regexp eq '.') {
-                                 $count++;
-                                 if (defined($range) && $count >= $end)   { last; }
-                                 if (defined($range) && $count <  $start) { next; }
-                                 $result.=$key.'='.$value.'&';
-                             } else {
-                                 my $unescapeKey = &unescape($key);
-                                 if (eval('$unescapeKey=~/$regexp/')) {
-                                     $count++;
-                                     if (defined($range) && $count >= $end)   { last; }
-                                     if (defined($range) && $count <  $start) { next; }
-                                     $result.="$key=$value&";
-                                 }
-                             }
-                         }
-                     }
                  }
              }
          }
      }
-     return $result;
+     return %prohibited;
- }
- sub useable_role {
-     my ($reqdmajor,$reqdminor,$major,$minor) = @_;
-     if ($reqdmajor ne '' && $reqdminor ne '') {
-         return if (($major eq '' && $minor eq '') ||
-                    ($major < $reqdmajor) ||
-                    (($major == $reqdmajor) && ($minor < $reqdminor)));
-     }
-     return 1;
  }
  sub distro_and_arch {
- Line 7773  Allow for a password to be set.
+ Line 8318  Allow for a password to be set.
  Make a user.
- =item passwd
+ =item changeuserauth
  Allow for authentication mechanism and password to be changed.
- Line 7801  Place in B<logs/lond.log>
+ Line 8346  Place in B<logs/lond.log>
  stores hash in namespace
- =item rolesputy
+ =item rolesput
  put a role into a user's environment
- Line 7862  for each student, defined perhaps by the
+ Line 8407  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 7918  Authen::Krb5
+ Line 8467  Authen::Krb5
  =head1 COREQUISITES
+ none
  =head1 OSNAMES
  linux
- Line 8005  or the CA's certificate in the call to l
+ Line 8556  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 8126  Could not rewrite the
+ Line 8677  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 8155  lond has been asked to exit by its clien
+ Line 8706  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 8239  file when sent it's USR1 signal.  That p
+ Line 8790  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 8253  Started a new child process for <client>
+ Line 8804  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 8264  In child process initialization.  The pe
+ Line 8815  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 8314  The client (<client> is the peer's name
+ Line 8865  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.484
changed lines
	Added in v.1.530