Diff for /loncom/auth/lonauth.pm between versions 1.143 and 1.146

version 1.143, 2017/02/25 20:00:36 version 1.146, 2017/08/08 18:12:18
Line 32  use strict; Line 32  use strict;
 use LONCAPA qw(:DEFAULT :match);  use LONCAPA qw(:DEFAULT :match);
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use CGI qw(:standard);  use CGI qw(:standard);
 use DynaLoader; # for Crypt::DES version  
 use Crypt::DES;  
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::lonmenu();  use Apache::lonmenu();
Line 336  sub handler { Line 334  sub handler {
   
 # split user logging in and "su"-user  # split user logging in and "su"-user
   
     ($form{'uname'},$form{'suname'})=split(/\:/,$form{'uname'});      ($form{'uname'},$form{'suname'},$form{'sudom'})=split(/\:/,$form{'uname'});
     $form{'uname'} = &LONCAPA::clean_username($form{'uname'});      $form{'uname'} = &LONCAPA::clean_username($form{'uname'});
     $form{'suname'}= &LONCAPA::clean_username($form{'suname'});      $form{'suname'}= &LONCAPA::clean_username($form{'suname'});
     $form{'udom'}  = &LONCAPA::clean_domain(  $form{'udom'});      $form{'udom'}  = &LONCAPA::clean_domain($form{'udom'});
       $form{'sudom'} = &LONCAPA::clean_domain($form{'sudom'});
   
     my $role   = $r->dir_config('lonRole');      my $role   = $r->dir_config('lonRole');
     my $domain = $r->dir_config('lonDefDomain');      my $domain = $r->dir_config('lonDefDomain');
Line 464  sub handler { Line 463  sub handler {
   
 # --------------------------------- Are we attempting to login as somebody else?  # --------------------------------- Are we attempting to login as somebody else?
     if ($form{'suname'}) {      if ($form{'suname'}) {
           my ($suname,$sudom,$sudomref);
           $suname = $form{'suname'};
           $sudom = $form{'udom'};
           if ($form{'sudom'}) {
               unless ($sudom eq $form{'sudom'}) {
                   if (&Apache::lonnet::domain($form{'sudom'})) {
                       $sudomref = [$form{'sudom'}];
                       $sudom = $form{'sudom'};
                   }
               }
           }
 # ------------ see if the original user has enough privileges to pull this stunt  # ------------ see if the original user has enough privileges to pull this stunt
  if (&Apache::lonnet::privileged($form{'uname'},$form{'udom'})) {   if (&Apache::lonnet::privileged($form{'uname'},$form{'udom'},$sudomref)) {
 # ---------------------------------------------------- see if the su-user exists  # ---------------------------------------------------- see if the su-user exists
     unless (&Apache::lonnet::homeserver($form{'suname'},$form{'udom'})      unless (&Apache::lonnet::homeserver($suname,$sudom) eq 'no_host') {
  eq 'no_host') {  
  &Apache::lonnet::logthis(&Apache::lonnet::homeserver($form{'suname'},$form{'udom'}));  
 # ------------------------------ see if the su-user is not too highly privileged  # ------------------------------ see if the su-user is not too highly privileged
  unless (&Apache::lonnet::privileged($form{'suname'},$form{'udom'})) {   if (&Apache::lonnet::privileged($suname,$sudom)) {
                       &Apache::lonnet::logthis('Attempted switch user to privileged user');
                   } else {
                       my $noprivswitch;
   #
   # su-user's home server and user's home server must have one of:
   # (a) same internet dom
   # (b) same primary library server for home server's domain
   # (c) same "internet domain" for primary library server for home server's domain
   #
                       my $uprim = &Apache::lonnet::domain($sudom,'primary');
                       my $uintdom = &Apache::lonnet::internet_dom($uprim);
                       unless ($sudom eq $form{'udom'}) {
                           my $suprim = &Apache::lonnet::domain($sudom,'primary');
                           my $suintdom = &Apache::lonnet::internet_dom($suprim);
                           unless ($suprim eq $uprim) {
                               unless ($suintdom eq $uintdom) {
                                   &Apache::lonnet::logthis('Attempted switch user '
                                      .'to user with different "internet domain".');                        
                                   $noprivswitch = 1;
                               }
                           }
                       }
   
                       unless ($noprivswitch) {
   #
   # server where log-in occurs must have same "internet domain" as su-user's home
   # server
   #
                           my $lonhost = $r->dir_config('lonHostID');
                           my $hostintdom = &Apache::lonnet::internet_dom($lonhost);
                           if ($hostintdom ne $uintdom) {
                               &Apache::lonnet::logthis('Attempted switch user on a '
                                   .'server with a different "internet domain".');
                           } else {
   
 # -------------------------------------------------------- actually switch users  # -------------------------------------------------------- actually switch users
     &Apache::lonnet::logperm('User '.$form{'uname'}.' at '.$form{'udom'}.  
  ' logging in as '.$form{'suname'});              &Apache::lonnet::logperm('User '.$form{'uname'}.' at '.
     $form{'uname'}=$form{'suname'};                                $form{'udom'}.' logging in as '.$suname.':'.$sudom);
  } else {              $form{'uname'}=$suname;
     &Apache::lonnet::logthis('Attempted switch user to privileged user');                              if ($form{'udom'} ne $sudom) {
                                   $form{'udom'}=$sudom;
                               }
                           }
                       }
  }   }
     }      }
  } else {   } else {

Removed from v.1.143  
changed lines
  Added in v.1.146


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