[BACK]Return to lond CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom

Diff for /loncom/lond between versions 1.505 and 1.528

version 1.505, 2014/01/01 17:41:37 version 1.528, 2016/09/21 05:39:53
Line 15 Line 15
 #  #
 # LON-CAPA is distributed in the hope that it will be useful,  # LON-CAPA is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of  # but WITHOUT ANY WARRANTY; without even the implied warranty of
   
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.  # GNU General Public License for more details.
 #  #
Line 41  use IO::File; Line 40  use IO::File;
 #use Apache::File;  #use Apache::File;
 use POSIX;  use POSIX;
 use Crypt::IDEA;  use Crypt::IDEA;
 use LWP::UserAgent();  use HTTP::Request;
 use Digest::MD5 qw(md5_hex);  use Digest::MD5 qw(md5_hex);
 use GDBM_File;  use GDBM_File;
 use Authen::Krb5;  use Authen::Krb5;
Line 55  use LONCAPA::lonssl; Line 54  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;
   use LONCAPA::LWPReq;
   
 my $DEBUG = 0;       # Non zero to enable debug log entries.  my $DEBUG = 0;       # Non zero to enable debug log entries.
   
Line 71  my $clientip;   # IP address of client. Line 74  my $clientip;   # IP address of client.
 my $clientname; # LonCAPA name of client.  my $clientname; # LonCAPA name of client.
 my $clientversion;              # LonCAPA version running on client.  my $clientversion;              # LonCAPA version running on client.
 my $clienthomedom;              # LonCAPA domain of homeID for client.   my $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 $server;
   
 my $keymode;  my $keymode;
Line 142  my @installerrors = ("ok", Line 151  my @installerrors = ("ok",
      );       );
   
 #  #
   # 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.  #   Statistics that are maintained and dislayed in the status line.
 #  #
 my $Transactions = 0; # Number of attempted transactions.  my $Transactions = 0; # Number of attempted transactions.
Line 621  sub ConfigFileFromSelector { Line 769  sub ConfigFileFromSelector {
 #     String to send to client ("ok" or "refused" if bad file).  #     String to send to client ("ok" or "refused" if bad file).
 #  #
 sub PushFile {  sub PushFile {
     my $request = shift;          my $request = shift;
     my ($command, $filename, $contents) = split(":", $request, 3);      my ($command, $filename, $contents) = split(":", $request, 3);
     &Debug("PushFile");      &Debug("PushFile");
           
Line 651  sub PushFile { Line 799  sub PushFile {
   
     if($filename eq "host") {      if($filename eq "host") {
  $contents = AdjustHostContents($contents);   $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:      #  Install the new file:
Line 1756  sub server_distarch_handler { Line 1940  sub server_distarch_handler {
 }  }
 &register_handler("serverdistarch", \&server_distarch_handler, 0, 1, 0);  &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  #   Process a reinit request.  Reinit requests that either
 #   lonc or lond be reinitialized so that an updated   #   lonc or lond be reinitialized so that an updated 
 #   host.tab or domain.tab can be processed.  #   host.tab or domain.tab can be processed.
Line 1888  sub authenticate_handler { Line 2082  sub authenticate_handler {
                 my ($remote,$hosted);                  my ($remote,$hosted);
                 my $remotesession = &get_usersession_config($udom,'remotesession');                  my $remotesession = &get_usersession_config($udom,'remotesession');
                 if (ref($remotesession) eq 'HASH') {                  if (ref($remotesession) eq 'HASH') {
                     $remote = $remotesession->{'remote'}                      $remote = $remotesession->{'remote'};
                 }                  }
                 my $hostedsession = &get_usersession_config($clienthomedom,'hostedsession');                  my $hostedsession = &get_usersession_config($clienthomedom,'hostedsession');
                 if (ref($hostedsession) eq 'HASH') {                  if (ref($hostedsession) eq 'HASH') {
Line 1975  sub change_password_handler { Line 2169  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 $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")) {      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 1992  sub change_password_handler { Line 2185  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 2014  sub change_password_handler { Line 2210  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 2057  sub add_user_handler { Line 2289  sub add_user_handler {
     ."makeuser";      ."makeuser";
     }      }
     unless ($fperror) {      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   &Reply($client,\$result, $userinput);     #BUGBUG - could be fail
     } else {      } else {
  &Failure($client, \$fperror, $userinput);   &Failure($client, \$fperror, $userinput);
Line 2126  sub change_authentication_handler { Line 2359  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,$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   #  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 2152  sub change_authentication_handler { Line 2387  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 2238  sub update_resource_handler { Line 2484  sub update_resource_handler {
 # FIXME: this should use the LWP mechanism, not internal alarms.  # FIXME: this should use the LWP mechanism, not internal alarms.
                 alarm(1200);                  alarm(1200);
  {   {
     my $ua=new LWP::UserAgent;  
     my $request=new HTTP::Request('GET',"$remoteurl");      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);   alarm(0);
  if ($response->is_error()) {   if ($response->is_error()) {
Line 2253  sub update_resource_handler { Line 2498  sub update_resource_handler {
 # FIXME: isn't there an internal LWP mechanism for this?  # FIXME: isn't there an internal LWP mechanism for this?
  alarm(120);   alarm(120);
  {   {
     my $ua=new LWP::UserAgent;  
     my $mrequest=new HTTP::Request('GET',$remoteurl.'.meta');      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()) {      if ($mresponse->is_error()) {
  unlink($fname.'.meta');   unlink($fname.'.meta');
     }      }
Line 2330  sub fetch_user_file_handler { Line 2574  sub fetch_user_file_handler {
  my $remoteurl=$clientprotocol.'://'.$clienthost.'/userfiles/'.$fname;   my $remoteurl=$clientprotocol.'://'.$clienthost.'/userfiles/'.$fname;
  my $response;   my $response;
  Debug("Remote URL : $remoteurl Transfername $transname Destname: $destname");   Debug("Remote URL : $remoteurl Transfername $transname Destname: $destname");
  alarm(120);   alarm(1200);
  {   {
     my $ua=new LWP::UserAgent;  
     my $request=new HTTP::Request('GET',"$remoteurl");      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);   alarm(0);
  if ($response->is_error()) {   if ($response->is_error()) {
Line 2403  sub remove_user_file_handler { Line 2651  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 approprate:   #   removed, in which case rmdir is more appropriate.
    #   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 2770  sub newput_user_profile_entry { Line 3027  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})) {
     &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 3284  sub dump_with_regexp { Line 3545  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 3292  sub dump_with_regexp { Line 3556  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 @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"}++;      $hashref->{"version:$rid"}++;
     my $version=$hashref->{"version:$rid"};      my $version=$hashref->{"version:$rid"};
     my $allkeys='';       my $allkeys=''; 
Line 3321  sub store_handler { Line 3607  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)) {
  &Reply($client, "ok\n", $userinput);                  my $msg = 'ok';
                   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 4306  sub put_domain_handler { Line 4596  sub put_domain_handler {
 }  }
 &register_handler("putdom", \&put_domain_handler, 0, 1, 0);  &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.  # Unencrypted get from the namespace database file at the domain level.
 # This function retrieves a keyed item from a specific named database in the  # This function retrieves a keyed item from a specific named database in the
 # domain directory.  # domain directory.
Line 5211  sub create_auto_enroll_password_handler Line 5617  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:
 #    $cmd      - The command that got us dispatched.  #    $cmd      - The command that got us dispatched.
 #    $tail     - The tail of the command.  In our case this is a colon   #    $tail     - The tail of the command.  In our case this is a colon 
 #                separated list that will be split into:  #                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 filename is given as a path relative to
 #                            the LonCAPA temp file directory.  #                            the LonCAPA temp file directory.
 #    $client   - Socket open on the client.  #    $client   - Socket open on the client.
Line 5231  sub retrieve_auto_file_handler { Line 5682  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 ( (-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 = '';   my $reply = '';
  if (open(my $fh,$source)) {   if (open(my $fh,$source)) {
     while (<$fh>) {      while (<$fh>) {
Line 5263  sub crsreq_checks_handler { Line 5719  sub crsreq_checks_handler {
     my $userinput = "$cmd:$tail";      my $userinput = "$cmd:$tail";
     my $dom = $tail;      my $dom = $tail;
     my $result;      my $result;
     my @reqtypes = ('official','unofficial','community');      my @reqtypes = ('official','unofficial','community','textbook','placement');
     eval {      eval {
         local($SIG{__DIE__})='DEFAULT';          local($SIG{__DIE__})='DEFAULT';
         my %validations;          my %validations;
Line 5290  sub crsreq_checks_handler { Line 5746  sub crsreq_checks_handler {
 sub validate_crsreq_handler {  sub validate_crsreq_handler {
     my ($cmd, $tail, $client) = @_;      my ($cmd, $tail, $client) = @_;
     my $userinput = "$cmd:$tail";      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);      $instcode = &unescape($instcode);
     $owner = &unescape($owner);      $owner = &unescape($owner);
     $crstype = &unescape($crstype);      $crstype = &unescape($crstype);
     $inststatuslist = &unescape($inststatuslist);      $inststatuslist = &unescape($inststatuslist);
     $instcode = &unescape($instcode);      $instcode = &unescape($instcode);
     $instseclist = &unescape($instseclist);      $instseclist = &unescape($instseclist);
       my $custominfo = &Apache::lonnet::thaw_unescape($customdata);
     my $outcome;      my $outcome;
     eval {      eval {
         local($SIG{__DIE__})='DEFAULT';          local($SIG{__DIE__})='DEFAULT';
         $outcome = &localenroll::validate_crsreq($dom,$owner,$crstype,          $outcome = &localenroll::validate_crsreq($dom,$owner,$crstype,
                                                  $inststatuslist,$instcode,                                                   $inststatuslist,$instcode,
                                                  $instseclist);                                                   $instseclist,$custominfo);
     };      };
     if (!$@) {      if (!$@) {
         &Reply($client, \$outcome, $userinput);          &Reply($client, \$outcome, $userinput);
Line 5313  sub validate_crsreq_handler { Line 5770  sub validate_crsreq_handler {
 }  }
 &register_handler("autocrsreqvalidation", \&validate_crsreq_handler, 0, 1, 0);  &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).  #   Read and retrieve institutional code format (for support form).
 # Formal Parameters:  # Formal Parameters:
Line 5820  sub get_request { Line 6324  sub get_request {
 #  #
 # Parameters:  # Parameters:
 #    user_input   - The request received from the client (lonc).  #    user_input   - The request received from the client (lonc).
   #
 # Returns:  # Returns:
 #    true to keep processing, false if caller should exit.  #    true to keep processing, false if caller should exit.
 #  #
 sub process_request {  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.      my $wasenc    = 0; # True if request was encrypted.
 # ------------------------------------------------------------ See if encrypted  # ------------------------------------------------------------ See if encrypted
     # for command      # for command
Line 5905  sub process_request { Line 6410  sub process_request {
     Debug("Client not privileged to do this operation");      Debug("Client not privileged to do this operation");
     $ok = 0;      $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) {   if($ok) {
     Debug("Dispatching to handler $command $tail");      Debug("Dispatching to handler $command $tail");
Line 5915  sub process_request { Line 6463  sub process_request {
     Failure($client, "refused\n", $userinput);      Failure($client, "refused\n", $userinput);
     return 1;      return 1;
  }   }
       }
     }      
   
     print $client "unknown_cmd\n";      print $client "unknown_cmd\n";
 # -------------------------------------------------------------------- complete  # -------------------------------------------------------------------- complete
Line 6508  sub make_new_child { Line 7055  sub make_new_child {
 #        my $tmpsnum=0;            # Now global  #        my $tmpsnum=0;            # Now global
 #---------------------------------------------------- kerberos 5 initialization  #---------------------------------------------------- kerberos 5 initialization
         &Authen::Krb5::init_context();          &Authen::Krb5::init_context();
  unless (($dist eq 'fedora5') || ($dist eq 'fedora4') ||    
  ($dist eq 'fedora6') || ($dist eq 'suse9.3') ||          my $no_ets;
                 ($dist eq 'suse12.2') || ($dist eq 'suse12.3') ||          if ($dist =~ /^(?:centos|rhes|scientific)(\d+)$/) {
                 ($dist eq 'suse13.1')) {              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();      &Authen::Krb5::init_ets();
  }   }
   
Line 6556  sub make_new_child { Line 7119  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,
Line 6658  sub make_new_child { Line 7220  sub make_new_child {
             my $clienthost = &Apache::lonnet::hostname($clientname);              my $clienthost = &Apache::lonnet::hostname($clientname);
             my $clientserverhomeID = &Apache::lonnet::get_server_homeID($clienthost);              my $clientserverhomeID = &Apache::lonnet::get_server_homeID($clienthost);
             $clienthomedom = &Apache::lonnet::host_domain($clientserverhomeID);              $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) {      while(($user_input = get_request) && $keep_going) {
  alarm(120);   alarm(120);
  Debug("Main: Got $user_input\n");   Debug("Main: Got $user_input\n");
Line 6673  sub make_new_child { Line 7270  sub make_new_child {
     &logthis("<font color='blue'>WARNING: "      &logthis("<font color='blue'>WARNING: "
      ."Rejected client $clientip, closing connection</font>");       ."Rejected client $clientip, closing connection</font>");
  }   }
     }                  }
           
 # =============================================================================  # =============================================================================
           
Line 6897  sub validate_user { Line 7494  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.
     $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.   elsif ($howpwd eq "unix") { # User is a normal unix user.
     $contentpwd = (getpwnam($user))[1];      $contentpwd = (getpwnam($user))[1];
Line 6965  sub validate_user { Line 7573  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 7280  sub change_unix_password { Line 7921  sub change_unix_password {
   
   
 sub make_passwd_file {  sub make_passwd_file {
     my ($uname,$udom,$umode,$npass,$passfilename)=@_;      my ($uname,$udom,$umode,$npass,$passfilename,$action)=@_;
     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 $salt=time;          my $ncpass = &hash_passwd($udom,$npass);
  $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 7309  sub make_passwd_file { Line 7950  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 7371  sub get_usersession_config { Line 8013  sub get_usersession_config {
         return $usersessionconf;          return $usersessionconf;
     } else {      } else {
         my %domconfig = &Apache::lonnet::get_dom('configuration',['usersessions'],$dom);          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;      return;
 }  }
   
   sub get_prohibited {
       my ($dom) = @_;
       my $name = 'trust';
       my ($trustconfig,$cached)=&Apache::lonnet::is_cached_new($name,$dom);
       unless (defined($cached)) {
           my %domconfig = &Apache::lonnet::get_dom('configuration',['trust'],$dom);
           &Apache::lonnet::do_cache_new($name,$dom,$domconfig{'trust'},3600);
           $trustconfig = $domconfig{'trust'};
       }
       my %prohibited;
       if (ref($trustconfig)) {
           foreach my $prefix (keys(%{$trustconfig})) {
               if (ref($trustconfig->{$prefix}) eq 'HASH') {
                   my $reject;
                   if (ref($trustconfig->{$prefix}->{'exc'}) eq 'ARRAY') {
                       if (grep(/^\Q$clientintdom\E$/,@{$trustconfig->{$prefix}->{'exc'}})) {
                           $reject = 1;
                       }
                   }
                   if (ref($trustconfig->{$prefix}->{'inc'}) eq 'ARRAY') {
                       if (grep(/^\Q$clientintdom\E$/,@{$trustconfig->{$prefix}->{'inc'}})) {
                           $reject = 0;
                       } else {
                           $reject = 1;
                       }
                   }
                   if ($reject) {
                       $prohibited{$prefix} = 1;
                   }
               }
           }
       }
       return %prohibited;
   }
   
 sub distro_and_arch {  sub distro_and_arch {
     return $dist.':'.$arch;      return $dist.':'.$arch;
Line 7565  Allow for a password to be set. Line 8237  Allow for a password to be set.
   
 Make a user.  Make a user.
   
 =item passwd  =item changeuserauth
   
 Allow for authentication mechanism and password to be changed.  Allow for authentication mechanism and password to be changed.
   
Line 7654  for each student, defined perhaps by the Line 8326  for each student, defined perhaps by the
 Returns usernames corresponding to IDs.  (These "IDs" are unique identifiers  Returns usernames corresponding to IDs.  (These "IDs" are unique identifiers
 for each student, defined perhaps by the institutional Registrar.)  for each student, defined perhaps by the institutional Registrar.)
   
   =item iddel
   
   Deletes one or more ids in a domain's id database.
   
 =item tmpput  =item tmpput
   
 Accept and store information in temporary space.  Accept and store information in temporary space.
Removed from v.1.505  
changed lines
  Added in v.1.528

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