loncom/auth/switchserver.pm - diff

Return to switchserver.pm CVS log

Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/switchserver.pm between versions 1.36 and 1.38

-version 1.36, 2017/02/25 20:00:36
+version 1.38, 2017/11/30 15:14:51
  Line 129  sub handler {
                      $skip_canhost_check = 1;
                  }
              } elsif ($env{'form.role'} =~ m{^[ac]a\./($match_domain)/($match_username)$}) {
-                 if (&Apache::lonnet::homeserver($2,$1) eq $env{'form.otherserver'}) {
+                 my ($audom,$auname) = ($1,$2);
-                     $skip_canhost_check = 1;
+                 if (&Apache::lonnet::homeserver($auname,$audom) eq $env{'form.otherserver'}) {
+                     if ((&Apache::lonnet::will_trust('othcoau',$audom,$env{'user.domain'})) &&
+                         (&Apache::lonnet::will_trust('coremau',$env{'user.domain'},$audom))) {
+                         $skip_canhost_check = 1;
+                     }
                  }
              }
          }
- Line 224  sub handler {
+ Line 228  sub handler {
      if ($env{'request.sso.reloginserver'}) {
          $info{'sso.reloginserver'} = $env{'request.sso.reloginserver'};
      }
+     if ($env{'request.lti.login'}) {
+         $info{'lti.login'} = $env{'request.lti.login'};
+     }
+     if ($env{'request.lti.passbackid'}) {
+         $info{'lti.passbackid'} = $env{'request.lti.passbackid'};
+     }
+     if ($env{'request.lti.passbackurl'}) {
+         $info{'lti.passbackurl'} = $env{'request.lti.passbackurl'};
+     }
+     if ($env{'request.lti.rosterid'}) {
+         $info{'lti.rosterid'} = $env{'request.lti.rosterid'};
+     }
+     if ($env{'request.lti.rosterurl'}) {
+         $info{'lti.rosterurl'} = $env{'request.lti.rosterurl'};
+     }
      my $token = &Apache::lonnet::tmpput(\%info,$env{'form.otherserver'});
      my $url =$protocol.'://'.$switch_to.'/adm/login?'.
  	'domain='.$env{'user.domain'}.

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

Removed from v.1.36
changed lines
	Added in v.1.38