[BACK]Return to lonauth.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonauth.pm between versions 1.121.2.17 and 1.121.2.19

version 1.121.2.17, 2019/08/01 00:42:34 version 1.121.2.19, 2020/05/02 15:29:40
Line 40  use Fcntl qw(:flock); Line 40  use Fcntl qw(:flock);
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::File();  use Apache::File();
 use HTML::Entities;  use HTML::Entities;
   use Digest::MD5;
     
 # ------------------------------------------------------------ Successful login  # ------------------------------------------------------------ Successful login
 sub success {  sub success {
     my ($r, $username, $domain, $authhost, $lowerurl, $extra_env,      my ($r, $username, $domain, $authhost, $lowerurl, $extra_env,
  $form) = @_;   $form,$cid) = @_;
   
 # ------------------------------------------------------------ Get cookie ready  # ------------------------------------------------------------ Get cookie ready
     my $cookie =      my $cookie =
Line 70  sub success { Line 71  sub success {
         }          }
     }      }
   
 # ------------------------------------------------------------ Get cookie ready  # ------------------------------------------------------------ Get cookies ready
     $cookie="lonID=$cookie; path=/; HttpOnly";      my ($securecookie,$defaultcookie);
       my $ssl = $r->subprocess_env('https');
       if ($ssl) {
           $securecookie="lonSID=$cookie; path=/; HttpOnly; secure";
           my $lonidsdir=$r->dir_config('lonIDsDir');
           if (($lonidsdir) && (-e "$lonidsdir/$cookie.id")) {
               my $linkname=substr(Digest::MD5::md5_hex(Digest::MD5::md5_hex(time(). {}. rand(). $$)), 0, 32).'_linked';
               if (-e "$lonidsdir/$linkname.id") {
                   unlink("$lonidsdir/$linkname.id");
               }
               my $made_symlink = eval { symlink("$lonidsdir/$cookie.id",
                                                 "$lonidsdir/$linkname.id"); 1 };
               if ($made_symlink) {
                   $defaultcookie = "lonLinkID=$linkname; path=/; HttpOnly;";
                   &Apache::lonnet::appenv({'user.linkedenv' => $linkname});
               }
           }
       } else {
           $defaultcookie = "lonID=$cookie; path=/; HttpOnly;";
       }
 # -------------------------------------------------------- Menu script and info  # -------------------------------------------------------- Menu script and info
     my $destination = $lowerurl;      my $destination = $lowerurl;
   
Line 97  sub success { Line 117  sub success {
     }      }
     if (defined($form->{symb})) {      if (defined($form->{symb})) {
         my $destsymb = $form->{symb};          my $destsymb = $form->{symb};
           my $encrypted;
           if ($destsymb =~ m{^/enc/}) {
               $encrypted = 1;
               if ($cid) {
                   $destsymb = &Apache::lonenc::unencrypted($destsymb,$cid);
               }
           }
         $destination  .= ($destination =~ /\?/) ? '&' : '?';          $destination  .= ($destination =~ /\?/) ? '&' : '?';
         if ($destsymb =~ /___/) {          if ($destsymb =~ /___/) {
             # FIXME Need to deal with encrypted symbs and urls as needed.  
             my ($map,$resid,$desturl)=split(/___/,$destsymb);              my ($map,$resid,$desturl)=split(/___/,$destsymb);
             $desturl = &Apache::lonnet::clutter($desturl);              $desturl = &Apache::lonnet::clutter($desturl);
               if ($encrypted) {
                   $desturl = &Apache::lonenc::encrypted($desturl,1,$cid);
                   $destsymb = $form->{symb};
               }
             $desturl = &HTML::Entities::encode($desturl,'"<>&');              $desturl = &HTML::Entities::encode($desturl,'"<>&');
             $destsymb = &HTML::Entities::encode($destsymb,'"<>&');              $destsymb = &HTML::Entities::encode($destsymb,'"<>&');
             $destination .= 'destinationurl='.$desturl.              $destination .= 'destinationurl='.$desturl.
                             '&destsymb='.$destsymb;                              '&destsymb='.$destsymb;
         } else {          } elsif (!$encrypted) {
             $destsymb = &HTML::Entities::encode($destsymb,'"<>&');              $destsymb = &HTML::Entities::encode($destsymb,'"<>&');
             $destination .= 'destinationurl='.$destsymb;              $destination .= 'destinationurl='.$destsymb;
         }          }
Line 136  sub success { Line 166  sub success {
 # ------------------------------------------------- Output for successful login  # ------------------------------------------------- Output for successful login
   
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->header_out('Set-cookie' => $cookie);      if ($securecookie) {
           $r->headers_out->add('Set-cookie' => $securecookie);
       }
       if ($defaultcookie) {
           $r->headers_out->add('Set-cookie' => $defaultcookie);
       }
     $r->send_http_header;      $r->send_http_header;
   
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
Removed from v.1.121.2.17  
changed lines
  Added in v.1.121.2.19

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