--- loncom/lontrans.pm	2021/01/05 04:23:45	1.29
+++ loncom/lontrans.pm	2021/04/18 02:08:46	1.30
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # URL translation for User Files
 #
-# $Id: lontrans.pm,v 1.29 2021/01/05 04:23:45 raeburn Exp $
+# $Id: lontrans.pm,v 1.30 2021/04/18 02:08:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,8 +29,9 @@
 package Apache::lontrans;
 
 use strict;
-use Apache::Constants qw(:common :remotehost REDIRECT);
+use Apache::Constants qw(:common :remotehost);
 use Apache::lonnet;
+use Apache::loncommon;
 use Apache::File();
 use LONCAPA qw(:DEFAULT :match);
 
@@ -63,9 +64,9 @@ sub handler {
                 $vpnint = $proxyinfo->{'vpnint'};
                 $vpnext = $proxyinfo->{'vpnext'};
             }
-            my $redirect;
+            my ($redirect,$remote_ip);
             if ($hdrhost eq $alias) {
-                my $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP);
+                $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP);
                 if ($vpnext && &Apache::lonnet::ip_match($remote_ip,$vpnext)) {
                     $redirect = $hostname;
                     if ($redirect eq $hdrhost) {
@@ -73,7 +74,7 @@ sub handler {
                     }
                 }
             } elsif ($hdrhost eq $hostname) {
-                my $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP,1);
+                $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP,1);
                 unless (($remote_ip eq '127.0.0.1') || ($remote_ip eq '::1') ||
                         ($remote_ip eq &Apache::lonnet::get_host_ip($lonhost)) ||
                         ($vpnint && &Apache::lonnet::ip_match($remote_ip,$vpnint))) {
@@ -88,14 +89,29 @@ sub handler {
             }
             if ($redirect) {
                 my $uri = $r->uri;
+                unless ($uri eq '/adm/migrateuser') {
+                    my %user;
+                    my $handle = &Apache::lonnet::check_for_valid_session($r,undef,\%user);
+                    if (($handle) && ($user{'name'} ne '') && ($user{'domain'} ne '')) {
+                        my $token = &get_token($r,$remote_ip,\%user);
+                        unless ($token eq '') {
+                            $r->internal_redirect("/adm/migrateuser?token=$token");
+                            $r->set_handlers('PerlHandler'=> undef);
+                            return DECLINED;
+                        }
+                    }
+                }
                 my $protocol = 'http';
                 my $port = $r->get_server_port();
                 if ($port eq '443') {
                     $protocol = 'https';
                 }
-# FIXME should check if logged in, and if so use switchserver/migrateuser approach,
-# possibly moved to Access Handler?
-                $r->header_out(Location => $protocol.'://'.$redirect.$uri);
+                my $querystring = $r->args;
+                my $location = $protocol.'://'.$redirect.$uri;
+                if ($querystring) {
+                    $location .= "?$querystring";
+                }
+                $r->header_out(Location => $location);
                 return REDIRECT;
             }
         }
@@ -171,6 +187,44 @@ sub redirect_raw {
     return $redirect;
 }
 
+sub get_token {
+    my ($r,$remote_ip,$userref) = @_;
+    return unless (ref($userref) eq 'HASH');
+    my %user = %{$userref};
+    my %info = ('ip' => $remote_ip,
+                'domain'    => $user{'domain'},
+                'username'  => $user{'name'},
+                'server'    => $r->dir_config('lonHostID'),
+               );
+    my $query = $r->args;
+    if ($query) {
+        foreach my $pair (split(/&/,$query)) {
+            my ($name,$value) = split(/=/,$pair);
+            $name = &LONCAPA::unescape($name);
+            next unless (($name eq 'role') || ($name eq 'symb'));
+            $value =~ tr/+/ /;
+            $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+            $info{$name} = $value;
+        }
+    }
+    unless ($info{'role'}) {
+        if ($user{'role'} ne '') {
+            $info{'role'} = $user{'role'};
+        }
+    }
+    unless ($info{'symb'}) {
+        unless ($r->uri eq '/adm/roles') {
+             $info{'origurl'} = $r->uri;
+        }
+    }
+    my $token = &Apache::lonnet::tmpput(\%info,$r->dir_config('lonHostID'));
+    unless (($token eq 'con_lost') || ($token eq 'refused') ||
+            ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) {
+        return $token;
+    }
+    return;
+}
+
 1;
 __END__