Diff for /loncom/lond between versions 1.489.2.23 and 1.511

version 1.489.2.23, 2016/09/24 19:16:57 version 1.511, 2014/06/29 03:22:43
Line 55  use LONCAPA::lonssl; Line 55  use LONCAPA::lonssl;
 use Fcntl qw(:flock);  use Fcntl qw(:flock);
 use Apache::lonnet;  use Apache::lonnet;
 use Mail::Send;  use Mail::Send;
 use Crypt::Eksblowfish::Bcrypt;  
 use Digest::SHA;  
 use Encode;  
   
 my $DEBUG = 0;       # Non zero to enable debug log entries.  my $DEBUG = 0;       # Non zero to enable debug log entries.
   
Line 1425  sub du2_handler { Line 1422  sub du2_handler {
 #    selected directory the filename followed by the full output of  #    selected directory the filename followed by the full output of
 #    the stat function is returned.  The returned info for each  #    the stat function is returned.  The returned info for each
 #    file are separated by ':'.  The stat fields are separated by &'s.  #    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:  # Parameters:
 #    $cmd        - The command that dispatched us (ls).  #    $cmd        - The command that dispatched us (ls).
 #    $ulsdir     - The directory path to list... I'm not sure what this  #    $ulsdir     - The directory path to list... I'm not sure what this
Line 1460  sub ls_handler { Line 1443  sub ls_handler {
     my $rights;      my $rights;
     my $ulsout='';      my $ulsout='';
     my $ulsfn;      my $ulsfn;
     if ($ulsdir =~m{/\.\./}) {  
         &Failure($client,"refused\n",$userinput);  
         return 1;  
     }  
     if (-e $ulsdir) {      if (-e $ulsdir) {
  if(-d $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)) {      if (opendir(LSDIR,$ulsdir)) {
  while ($ulsfn=readdir(LSDIR)) {   while ($ulsfn=readdir(LSDIR)) {
     undef($obs);      undef($obs);
Line 1494  sub ls_handler { Line 1468  sub ls_handler {
  closedir(LSDIR);   closedir(LSDIR);
     }      }
  } else {   } 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);      my @ulsstats=stat($ulsdir);
     $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';      $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
  }   }
Line 1522  sub ls_handler { Line 1492  sub ls_handler {
 #    selected directory the filename followed by the full output of  #    selected directory the filename followed by the full output of
 #    the stat function is returned.  The returned info for each  #    the stat function is returned.  The returned info for each
 #    file are separated by ':'.  The stat fields are separated by &'s.  #    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:  # Parameters:
 #    $cmd        - The command that dispatched us (ls).  #    $cmd        - The command that dispatched us (ls).
 #    $ulsdir     - The directory path to list... I'm not sure what this  #    $ulsdir     - The directory path to list... I'm not sure what this
Line 1556  sub ls2_handler { Line 1512  sub ls2_handler {
     my $rights;      my $rights;
     my $ulsout='';      my $ulsout='';
     my $ulsfn;      my $ulsfn;
     if ($ulsdir =~m{/\.\./}) {  
         &Failure($client,"refused\n",$userinput);  
         return 1;  
     }  
     if (-e $ulsdir) {      if (-e $ulsdir) {
         if(-d $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)) {              if (opendir(LSDIR,$ulsdir)) {
                 while ($ulsfn=readdir(LSDIR)) {                  while ($ulsfn=readdir(LSDIR)) {
                     undef($obs);                      undef($obs);
Line 1591  sub ls2_handler { Line 1538  sub ls2_handler {
                 closedir(LSDIR);                  closedir(LSDIR);
             }              }
         } else {          } 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);              my @ulsstats=stat($ulsdir);
             $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';              $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
         }          }
Line 1611  sub ls2_handler { Line 1554  sub ls2_handler {
 #    selected directory the filename followed by the full output of  #    selected directory the filename followed by the full output of
 #    the stat function is returned.  The returned info for each  #    the stat function is returned.  The returned info for each
 #    file are separated by ':'.  The stat fields are separated by &'s.  #    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:  # Parameters:
 #    $cmd        - The command that dispatched us (ls).  #    $cmd        - The command that dispatched us (ls).
 #    $tail       - The tail of the request that invoked us.  #    $tail       - The tail of the request that invoked us.
Line 1666  sub ls3_handler { Line 1593  sub ls3_handler {
     }      }
   
     my $dir_root = $perlvar{'lonDocRoot'};      my $dir_root = $perlvar{'lonDocRoot'};
     if (($getpropath) || ($getuserdir)) {      if ($getpropath) {
         if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) {          if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) {
             $dir_root = &propath($udom,$uname);              $dir_root = &propath($udom,$uname);
             $dir_root =~ s/\/$//;              $dir_root =~ s/\/$//;
         } else {          } else {
             &Failure($client,"refused\n",$userinput);              &Failure($client,"refused\n","$cmd:$tail");
               return 1;
           }
       } elsif ($getuserdir) {
           if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) {
               my $subdir=$uname.'__';
               $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
               $dir_root = $Apache::lonnet::perlvar{'lonUsersDir'}
                          ."/$udom/$subdir/$uname";
           } else {
               &Failure($client,"refused\n","$cmd:$tail");
             return 1;              return 1;
         }          }
     } elsif ($alternate_root ne '') {      } elsif ($alternate_root ne '') {
Line 1684  sub ls3_handler { Line 1621  sub ls3_handler {
             $ulsdir = $dir_root.'/'.$ulsdir;              $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 $obs;
     my $rights;      my $rights;
     my $ulsout='';      my $ulsout='';
     my $ulsfn;      my $ulsfn;
     if (-e $ulsdir) {      if (-e $ulsdir) {
         if(-d $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)) {              if (opendir(LSDIR,$ulsdir)) {
                 while ($ulsfn=readdir(LSDIR)) {                  while ($ulsfn=readdir(LSDIR)) {
                     undef($obs);                      undef($obs);
Line 1730  sub ls3_handler { Line 1651  sub ls3_handler {
                 closedir(LSDIR);                  closedir(LSDIR);
             }              }
         } else {          } 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);              my @ulsstats=stat($ulsdir);
             $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';              $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
         }          }
Line 2016  sub authenticate_handler { Line 1932  sub authenticate_handler {
                 if (ref($hostedsession) eq 'HASH') {                  if (ref($hostedsession) eq 'HASH') {
                     $hosted = $hostedsession->{'hosted'};                      $hosted = $hostedsession->{'hosted'};
                 }                  }
                 my $loncaparev = $clientversion;  
                 if ($loncaparev eq '') {  
                     $loncaparev = $Apache::lonnet::loncaparevs{$clientname};  
                 }  
                 $canhost = &Apache::lonnet::can_host_session($udom,$clientname,                  $canhost = &Apache::lonnet::can_host_session($udom,$clientname,
                                                              $loncaparev,                                                               $clientversion,
                                                              $remote,$hosted);                                                               $remote,$hosted);
             }              }
         }          }
Line 2101  sub change_password_handler { Line 2013  sub change_password_handler {
  my ($howpwd,$contentpwd)=split(/:/,$realpasswd);   my ($howpwd,$contentpwd)=split(/:/,$realpasswd);
  if ($howpwd eq 'internal') {   if ($howpwd eq 'internal') {
     &Debug("internal auth");      &Debug("internal auth");
             my $ncpass = &hash_passwd($udom,$npass);      my $salt=time;
       $salt=substr($salt,6,2);
       my $ncpass=crypt($npass,$salt);
     if(&rewrite_password_file($udom, $uname, "internal:$ncpass")) {      if(&rewrite_password_file($udom, $uname, "internal:$ncpass")) {
  my $msg="Result of password change for $uname: pwchange_success";   my $msg="Result of password change for $uname: pwchange_success";
                 if ($lonhost) {                  if ($lonhost) {
                     $msg .= " - request originated from: $lonhost";                      $msg .= " - request originated from: $lonhost";
                 }                  }
                 &logthis($msg);                  &logthis($msg);
                 &update_passwd_history($uname,$udom,$howpwd,$context);  
  &Reply($client, "ok\n", $userinput);   &Reply($client, "ok\n", $userinput);
     } else {      } else {
  &logthis("Unable to open $uname passwd "                  &logthis("Unable to open $uname passwd "               
Line 2117  sub change_password_handler { Line 2030  sub change_password_handler {
     }      }
  } elsif ($howpwd eq 'unix' && $context ne 'reset_by_email') {   } elsif ($howpwd eq 'unix' && $context ne 'reset_by_email') {
     my $result = &change_unix_password($uname, $npass);      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: ".      &logthis("Result of password change for $uname: ".
      $result);       $result);
     &Reply($client, \$result, $userinput);      &Reply($client, \$result, $userinput);
Line 2142  sub change_password_handler { Line 2052  sub change_password_handler {
 }  }
 &register_handler("passwd", \&change_password_handler, 1, 1, 0);  &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.  #   Create a new user.  User in this case means a lon-capa user.
 #   The user must either already exist in some authentication realm  #   The user must either already exist in some authentication realm
Line 2221  sub add_user_handler { Line 2095  sub add_user_handler {
     ."makeuser";      ."makeuser";
     }      }
     unless ($fperror) {      unless ($fperror) {
  my $result=&make_passwd_file($uname,$udom,$umode,$npass,   my $result=&make_passwd_file($uname,$udom,$umode,$npass, $passfilename);
                                              $passfilename,'makeuser');  
  &Reply($client,\$result, $userinput);     #BUGBUG - could be fail   &Reply($client,\$result, $userinput);     #BUGBUG - could be fail
     } else {      } else {
  &Failure($client, \$fperror, $userinput);   &Failure($client, \$fperror, $userinput);
Line 2291  sub change_authentication_handler { Line 2164  sub change_authentication_handler {
  my $result = &change_unix_password($uname, $npass);   my $result = &change_unix_password($uname, $npass);
  &logthis("Result of password change for $uname: ".$result);   &logthis("Result of password change for $uname: ".$result);
  if ($result eq "ok") {   if ($result eq "ok") {
                     &update_passwd_history($uname,$udom,$umode,'changeuserauth');  
     &Reply($client, \$result);      &Reply($client, \$result);
  } else {   } else {
     &Failure($client, \$result);      &Failure($client, \$result);
  }   }
     } else {      } else {
  my $result=&make_passwd_file($uname,$udom,$umode,$npass,   my $result=&make_passwd_file($uname,$udom,$umode,$npass,$passfilename);
                                              $passfilename,'changeuserauth');  
  #   #
  #  If the current auth mode is internal, and the old auth mode was   #  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,   #  unix, or krb*,  and the user is an author for this domain,
Line 2319  sub change_authentication_handler { Line 2190  sub change_authentication_handler {
 }  }
 &register_handler("changeuserauth", \&change_authentication_handler, 1,1, 0);  &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  #   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  #   for a user will have his/her lon-capa passwd file.  Therefore all we need
Line 2581  sub remove_user_file_handler { Line 2441  sub remove_user_file_handler {
     if (-e $file) {      if (-e $file) {
  #   #
  #   If the file is a regular file unlink is fine...   #   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 appropriate   #   removed, in which case rmdir is more approprate:
         #   Note: rmdir will only remove an empty directory.  
  #   #
         if (-f $file){          if (-f $file){
     unlink($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) {   } elsif(-d $file) {
     rmdir($file);      rmdir($file);
  }   }
Line 2957  sub newput_user_profile_entry { Line 2808  sub newput_user_profile_entry {
     foreach my $pair (@pairs) {      foreach my $pair (@pairs) {
  my ($key,$value)=split(/=/,$pair);   my ($key,$value)=split(/=/,$pair);
  if (exists($hashref->{$key})) {   if (exists($hashref->{$key})) {
             if (!&untie_user_hash($hashref)) {  
                 &logthis("error: ".($!+0)." untie (GDBM) failed ".  
                          "while attempting newput - early out as key exists");  
             }  
     &Failure($client, "key_exists: ".$key."\n",$userinput);      &Failure($client, "key_exists: ".$key."\n",$userinput);
     return 1;      return 1;
  }   }
Line 3364  sub get_profile_keys { Line 3211  sub get_profile_keys {
 sub dump_profile_database {  sub dump_profile_database {
     my ($cmd, $tail, $client) = @_;      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 $userinput = "$cmd:$tail";
         
     my ($udom,$uname,$namespace) = split(/:/,$tail);      my ($udom,$uname,$namespace) = split(/:/,$tail);
Line 3443  sub dump_with_regexp { Line 3301  sub dump_with_regexp {
     my ($cmd, $tail, $client) = @_;      my ($cmd, $tail, $client) = @_;
   
     my $res = LONCAPA::Lond::dump_with_regexp($tail, $clientversion);      my $res = LONCAPA::Lond::dump_with_regexp($tail, $clientversion);
       
     if ($res =~ /^error:/) {      if ($res =~ /^error:/) {
         &Failure($client, \$res, "$cmd:$tail");          Failure($client, \$res, "$cmd:$tail");
     } else {      } else {
         &Reply($client, \$res, "$cmd:$tail");          Reply($client, \$res, "$cmd:$tail");
     }      }
   
     return 1;      return 1;
Line 3464  sub dump_with_regexp { Line 3322  sub dump_with_regexp {
 #                          namespace   - Name of the database being modified  #                          namespace   - Name of the database being modified
 #                          rid         - Resource keyword to modify.  #                          rid         - Resource keyword to modify.
 #                          what        - new value associated with rid.  #                          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.  #    $client             - Socket open on the client.
 #  #
Line 3475  sub dump_with_regexp { Line 3330  sub dump_with_regexp {
 #      1 (keep on processing).  #      1 (keep on processing).
 #  Side-Effects:  #  Side-Effects:
 #    Writes to the client  #    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 {  sub store_handler {
     my ($cmd, $tail, $client) = @_;      my ($cmd, $tail, $client) = @_;
     
     my $userinput = "$cmd:$tail";      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') {      if ($namespace ne 'roles') {
   
    chomp($what);
  my @pairs=split(/\&/,$what);   my @pairs=split(/\&/,$what);
  my $hashref  = &tie_user_hash($udom, $uname, $namespace,   my $hashref  = &tie_user_hash($udom, $uname, $namespace,
        &GDBM_WRCREAT(), "S",         &GDBM_WRCREAT(), "S",
        "$rid:$what");         "$rid:$what");
  if ($hashref) {   if ($hashref) {
     my $now = time;      my $now = time;
             my $numtrans;      my @previouskeys=split(/&/,$hashref->{"keys:$rid"});
             if ($laststore) {      my $key;
                 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"}++;      $hashref->{"version:$rid"}++;
     my $version=$hashref->{"version:$rid"};      my $version=$hashref->{"version:$rid"};
     my $allkeys='';       my $allkeys=''; 
Line 3528  sub store_handler { Line 3359  sub store_handler {
     $allkeys.='timestamp';      $allkeys.='timestamp';
     $hashref->{"$version:keys:$rid"}=$allkeys;      $hashref->{"$version:keys:$rid"}=$allkeys;
     if (&untie_user_hash($hashref)) {      if (&untie_user_hash($hashref)) {
                 my $msg = 'ok';   &Reply($client, "ok\n", $userinput);
                 if ($numtrans) {  
                     $msg = 'delay:'.$numtrans;  
                 }  
                 &Reply($client, "$msg\n", $userinput);  
     } else {      } else {
  &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".   &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
  "while attempting store\n", $userinput);   "while attempting store\n", $userinput);
Line 4049  sub put_course_id_hash_handler { Line 3876  sub put_course_id_hash_handler {
 #  #
 #                 domcloner - flag to indicate if user can create CCs in course's domain.  #                 domcloner - flag to indicate if user can create CCs in course's domain.
 #                             If so, ability to clone course is automatic.  #                             If so, ability to clone course is automatic.
 #                 hasuniquecode - filter by courses for which a six character unique code has  #                 hasuniquecode - filter by courses for which a six character unique code has 
 #                                 been set.  #                                 been set.
 #  #
 #     $client  - The socket open on the client.  #     $client  - The socket open on the client.
Line 4059  sub put_course_id_hash_handler { Line 3886  sub put_course_id_hash_handler {
 #   a reply is written to $client.  #   a reply is written to $client.
 sub dump_course_id_handler {  sub dump_course_id_handler {
     my ($cmd, $tail, $client) = @_;      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 $userinput = "$cmd:$tail";
   
     my ($udom,$since,$description,$instcodefilter,$ownerfilter,$coursefilter,      my ($udom,$since,$description,$instcodefilter,$ownerfilter,$coursefilter,
Line 4665  sub get_id_handler { Line 4503  sub get_id_handler {
 # Returns:  # Returns:
 #     1   - Continue processing  #     1   - Continue processing
 #     0   - Exit server.  #     0   - Exit server.
 #  #     
 #  #
   
 sub del_id_handler {  sub del_id_handler {
Line 5411  sub create_auto_enroll_password_handler Line 5249  sub create_auto_enroll_password_handler
 &register_handler("autocreatepassword", \&create_auto_enroll_password_handler,   &register_handler("autocreatepassword", \&create_auto_enroll_password_handler, 
   0, 1, 0);    0, 1, 0);
   
 sub auto_export_grades_handler {  
     my ($cmd, $tail, $client) = @_;  
     my $userinput = "$cmd:$tail";  
     my ($cdom,$cnum,$info,$data) = split(/:/,$tail);  
     my $inforef = &Apache::lonnet::thaw_unescape($info);  
     my $dataref = &Apache::lonnet::thaw_unescape($data);  
     my ($outcome,$result);;  
     eval {  
         local($SIG{__DIE__})='DEFAULT';  
         my %rtnhash;  
         $outcome=&localenroll::export_grades($cdom,$cnum,$inforef,$dataref,\%rtnhash);  
         if ($outcome eq 'ok') {  
             foreach my $key (keys(%rtnhash)) {  
                 $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rtnhash{$key}).'&';  
             }  
             $result =~ s/\&$//;  
         }  
     };  
     if (!$@) {  
         if ($outcome eq 'ok') {  
             if ($cipher) {  
                 my $cmdlength=length($result);  
                 $result.="         ";  
                 my $encresult='';  
                 for (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {  
                     $encresult.= unpack("H16",  
                                         $cipher->encrypt(substr($result,  
                                                                 $encidx,  
                                                                 8)));  
                 }  
                 &Reply( $client, "enc:$cmdlength:$encresult\n", $userinput);  
             } else {  
                 &Failure( $client, "error:no_key\n", $userinput);  
             }  
         } else {  
             &Reply($client, "$outcome\n", $userinput);  
         }  
     } else {  
         &Failure($client,"export_error\n",$userinput);  
     }  
     return 1;  
 }  
 &register_handler("autoexportgrades", \&auto_export_grades_handler,  
                   0, 1, 0);  
   
   
 #   Retrieve and remove temporary files created by/during autoenrollment.  #   Retrieve and remove temporary files created by/during autoenrollment.
 #  #
 # Formal Parameters:  # Formal Parameters:
Line 5477  sub retrieve_auto_file_handler { Line 5269  sub retrieve_auto_file_handler {
     my ($filename)   = split(/:/, $tail);      my ($filename)   = split(/:/, $tail);
   
     my $source = $perlvar{'lonDaemons'}.'/tmp/'.$filename;      my $source = $perlvar{'lonDaemons'}.'/tmp/'.$filename;
     if ($filename =~m{/\.\./}) {      if ( (-e $source) && ($filename ne '') ) {
         &Failure($client, "refused\n", $userinput);  
     } elsif ( (-e $source) && ($filename ne '') ) {  
  my $reply = '';   my $reply = '';
  if (open(my $fh,$source)) {   if (open(my $fh,$source)) {
     while (<$fh>) {      while (<$fh>) {
Line 5587  sub crsreq_update_handler { Line 5377  sub crsreq_update_handler {
                                                 $title,$code,$accessstart,$accessend,                                                  $title,$code,$accessstart,$accessend,
                                                 $incoming,\%rtnhash);                                                  $incoming,\%rtnhash);
         if ($outcome eq 'ok') {          if ($outcome eq 'ok') {
             my @posskeys = qw(createdweb createdmsg createdcustomized createdactions queuedweb queuedmsg formitems reviewweb validationjs onload javascript);              my @posskeys = qw(createdweb createdmsg queuedweb queuedmsg formitems reviewweb);
             foreach my $key (keys(%rtnhash)) {              foreach my $key (keys(%rtnhash)) {
                 if (grep(/^\Q$key\E/,@posskeys)) {                  if (grep(/^\Q$key\E/,@posskeys)) {
                     $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rtnhash{$key}).'&';                      $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rtnhash{$key}).'&';
Line 6556  sub Debug { Line 6346  sub Debug {
 #     reply   - Text to send to client.  #     reply   - Text to send to client.
 #     request - Original request from 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 {  sub Reply {
     my ($fd, $reply, $request) = @_;      my ($fd, $reply, $request) = @_;
     if (ref($reply)) {      if (ref($reply)) {
Line 6803  sub make_new_child { Line 6596  sub make_new_child {
         &Authen::Krb5::init_context();          &Authen::Krb5::init_context();
   
         my $no_ets;          my $no_ets;
         if ($dist =~ /^(?:centos|rhes|scientific)(\d+)$/) {          if ($dist =~ /^(?:centos|rhes)(\d+)$/) {
             if ($1 >= 7) {              if ($1 >= 7) {
                 $no_ets = 1;                  $no_ets = 1;
             }              }
         } elsif ($dist =~ /^suse(\d+\.\d+)$/) {          } elsif ($dist =~ /^suse(\d+\.\d+)$/) {
             if (($1 eq '9.3') || ($1 >= 12.2)) {              if (($1 eq '9.3') || ($1 >= 12.2)) {
                 $no_ets = 1;                  $no_ets = 1; 
             }  
         } elsif ($dist =~ /^sles(\d+)$/) {  
             if ($1 > 11) {  
                 $no_ets = 1;  
             }              }
         } elsif ($dist =~ /^fedora(\d+)$/) {          } elsif ($dist =~ /^fedora(\d+)$/) {
             if ($1 < 7) {              if ($1 < 7) {
Line 6821  sub make_new_child { Line 6610  sub make_new_child {
             }              }
         }          }
         unless ($no_ets) {          unless ($no_ets) {
             &Authen::Krb5::init_ets();      &Authen::Krb5::init_ets();
         }   }
   
  &status('Accepted connection');   &status('Accepted connection');
 # =============================================================================  # =============================================================================
Line 6865  sub make_new_child { Line 6654  sub make_new_child {
  #   #
  #  If the remote is attempting a local init... give that a try:   #  If the remote is attempting a local init... give that a try:
  #   #
           logthis("remotereq: $remotereq");
  (my $i, my $inittype, $clientversion) = split(/:/, $remotereq);   (my $i, my $inittype, $clientversion) = split(/:/, $remotereq);
                 # For LON-CAPA 2.9, the  client session will have sent its LON-CAPA          # 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,          # version when initiating the connection. For LON-CAPA 2.8 and older,
                 # the version is retrieved from the global %loncaparevs in lonnet.pm.          # the version is retrieved from the global %loncaparevs in lonnet.pm.            
                 # $clientversion contains path to keyfile if $inittype eq 'local'          # $clientversion contains path to keyfile if $inittype eq 'local'
                 # it's overridden below in this case          # it's overridden below in this case
                 $clientversion ||= $Apache::lonnet::loncaparevs{$clientname};          $clientversion ||= $Apache::lonnet::loncaparevs{$clientname};
   
  # If the connection type is ssl, but I didn't get my   # If the connection type is ssl, but I didn't get my
  # certificate files yet, then I'll drop  back to    # certificate files yet, then I'll drop  back to 
Line 7205  sub validate_user { Line 6995  sub validate_user {
     }       } 
     if ($howpwd ne 'nouser') {      if ($howpwd ne 'nouser') {
  if($howpwd eq "internal") { # Encrypted is in local password file.   if($howpwd eq "internal") { # Encrypted is in local password file.
             if (length($contentpwd) == 13) {      $validated = (crypt($password, $contentpwd) eq $contentpwd);
                 $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.   elsif ($howpwd eq "unix") { # User is a normal unix user.
     $contentpwd = (getpwnam($user))[1];      $contentpwd = (getpwnam($user))[1];
Line 7284  sub validate_user { Line 7063  sub validate_user {
     return $validated;      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 {  sub krb4_authen {
     my ($password,$null,$user,$contentpwd) = @_;      my ($password,$null,$user,$contentpwd) = @_;
     my $validated = 0;      my $validated = 0;
Line 7632  sub change_unix_password { Line 7378  sub change_unix_password {
   
   
 sub make_passwd_file {  sub make_passwd_file {
     my ($uname,$udom,$umode,$npass,$passfilename,$action)=@_;      my ($uname,$udom,$umode,$npass,$passfilename)=@_;
     my $result="ok";      my $result="ok";
     if ($umode eq 'krb4' or $umode eq 'krb5') {      if ($umode eq 'krb4' or $umode eq 'krb5') {
  {   {
     my $pf = IO::File->new(">$passfilename");      my $pf = IO::File->new(">$passfilename");
     if ($pf) {      if ($pf) {
  print $pf "$umode:$npass\n";   print $pf "$umode:$npass\n";
                 &update_passwd_history($uname,$udom,$umode,$action);  
     } else {      } else {
  $result = "pass_file_failed_error";   $result = "pass_file_failed_error";
     }      }
  }   }
     } elsif ($umode eq 'internal') {      } elsif ($umode eq 'internal') {
         my $ncpass = &hash_passwd($udom,$npass);   my $salt=time;
    $salt=substr($salt,6,2);
    my $ncpass=crypt($npass,$salt);
  {   {
     &Debug("Creating internal auth");      &Debug("Creating internal auth");
     my $pf = IO::File->new(">$passfilename");      my $pf = IO::File->new(">$passfilename");
     if($pf) {      if($pf) {
  print $pf "internal:$ncpass\n";    print $pf "internal:$ncpass\n"; 
                 &update_passwd_history($uname,$udom,$umode,$action);  
     } else {      } else {
  $result = "pass_file_failed_error";   $result = "pass_file_failed_error";
     }      }
Line 7661  sub make_passwd_file { Line 7407  sub make_passwd_file {
     my $pf = IO::File->new(">$passfilename");      my $pf = IO::File->new(">$passfilename");
     if($pf) {      if($pf) {
  print $pf "localauth:$npass\n";   print $pf "localauth:$npass\n";
                 &update_passwd_history($uname,$udom,$umode,$action);  
     } else {      } else {
  $result = "pass_file_failed_error";   $result = "pass_file_failed_error";
     }      }
Line 7733  sub get_usersession_config { Line 7478  sub get_usersession_config {
 }  }
   
   
   
   
 sub distro_and_arch {  sub distro_and_arch {
     return $dist.':'.$arch;      return $dist.':'.$arch;
 }  }
Line 8061  Authen::Krb5 Line 7808  Authen::Krb5
   
 =head1 COREQUISITES  =head1 COREQUISITES
   
   none
   
 =head1 OSNAMES  =head1 OSNAMES
   
 linux  linux
Line 8148  or the CA's certificate in the call to l Line 7897  or the CA's certificate in the call to l
 <error> is the textual reason this failed.  Usual reasons:  <error> is the textual reason this failed.  Usual reasons:
   
 =over 2  =over 2
          
 =item Apache config file for loncapa  incorrect:  =item Apache config file for loncapa  incorrect:
    
 one of the variables   one of the variables 
 lonCertificateDirectory, lonnetCertificateAuthority, or lonnetCertificate  lonCertificateDirectory, lonnetCertificateAuthority, or lonnetCertificate
 undefined or incorrect  undefined or incorrect
Line 8269  Could not rewrite the Line 8018  Could not rewrite the
 internal password file for a user  internal password file for a user
   
 =item Result of password change for <user> : <result>  =item Result of password change for <user> : <result>
                                                                        
 A unix password change for <user> was attempted   A unix password change for <user> was attempted 
 and the pipe returned <result>    and the pipe returned <result>  
   
Line 8298  lond has been asked to exit by its clien Line 8047  lond has been asked to exit by its clien
 client systemand <input> is the full exit command sent to the server.  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>].  =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  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,  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  <hostname> the host lond is working for, and <message> the reason the child died
Line 8382  file when sent it's USR1 signal.  That p Line 8131  file when sent it's USR1 signal.  That p
 assumed to be hung in some un-fixable way.  assumed to be hung in some un-fixable way.
   
 =item Finished checking children                     =item Finished checking children                   
    
 Master processs's USR1 processing is cojmplete.  Master processs's USR1 processing is cojmplete.
   
 =item (Red) CRITICAL: ------- Starting ------              =item (Red) CRITICAL: ------- Starting ------            
Line 8396  Started a new child process for <client> Line 8145  Started a new child process for <client>
 connected to the child.  This was as a result of a TCP/IP connection from a 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  =item Unable to determine who caller was, getpeername returned nothing
                                                     
 In child process initialization.  either getpeername returned undef or  In child process initialization.  either getpeername returned undef or
 a zero sized object was returned.  Processing continues, but in my opinion,  a zero sized object was returned.  Processing continues, but in my opinion,
 this should be cause for the child to exit.  this should be cause for the child to exit.
Line 8407  In child process initialization.  The pe Line 8156  In child process initialization.  The pe
 The client address is stored as "Unavailable" and processing continues.  The client address is stored as "Unavailable" and processing continues.
   
 =item (Yellow) INFO: Connection <ip> <name> connection type = <type>  =item (Yellow) INFO: Connection <ip> <name> connection type = <type>
                                                     
 In child initialization.  A good connectionw as received from <ip>.  In child initialization.  A good connectionw as received from <ip>.
   
 =over 2  =over 2
Line 8457  The client (<client> is the peer's name Line 8206  The client (<client> is the peer's name
 negotiated an SSL connection with this child process.  negotiated an SSL connection with this child process.
   
 =item (Green) Successful insecure authentication with <client>  =item (Green) Successful insecure authentication with <client>
                                                      
   
 The client has successfully negotiated an  insecure connection withthe child process.  The client has successfully negotiated an  insecure connection withthe child process.
   

Removed from v.1.489.2.23  
changed lines
  Added in v.1.511


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