--- loncom/auth/lonshibauth.pm	2021/05/04 18:47:37	1.4
+++ loncom/auth/lonshibauth.pm	2021/10/07 19:24:25	1.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Redirect Shibboleth authentication to designated URL (/adm/sso).
 #
-# $Id: lonshibauth.pm,v 1.4 2021/05/04 18:47:37 raeburn Exp $
+# $Id: lonshibauth.pm,v 1.9 2021/10/07 19:24:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -74,19 +74,37 @@ use LONCAPA qw(:DEFAULT);
 sub handler {
     my $r = shift;
     my $target = '/adm/sso';
-    if (($r->user eq '') && ($r->uri() ne $target)) {
+    if (&Apache::lonnet::get_saml_landing()) {
+        $target = '/adm/login';
+    }
+    my $uri = $r->uri;
+    if (($r->user eq '') && ($uri ne $target) && ($uri ne '/adm/sso')) {
         my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
         my $hostname = &Apache::lonnet::hostname($lonhost);
         if (!$hostname) { $hostname = $r->hostname(); }
         my $protocol = $Apache::lonnet::protocol{$lonhost};
         unless ($protocol eq 'https') { $protocol = 'http'; }
         my $alias = &Apache::lonnet::use_proxy_alias($r,$lonhost);
-        $hostname = $alias if ($alias ne '');
+        if (($alias ne '') &&
+            (&Apache::lonnet::alias_shibboleth($lonhost))) {
+            $hostname = $alias;
+        }
         my $dest = $protocol.'://'.$hostname.$target;
         $r->subprocess_env;
         if ($ENV{'QUERY_STRING'} ne '') {
             $dest .= '?'.$ENV{'QUERY_STRING'};
         }
+        unless (($uri eq '/adm/roles') || ($uri eq '/adm/logout')) {
+            if ($target eq '/adm/login') {
+                unless ($ENV{'QUERY_STRING'} =~ /firsturl=/) {
+                    $dest.=(($dest=~/\?/)?'&':'?').'firsturl='.$uri;
+                }
+            } else {
+                unless ($ENV{'QUERY_STRING'} =~ /origurl=/) {
+                    $dest.=(($dest=~/\?/)?'&':'?').'origurl='.$uri;
+                }
+            }
+        }
         $r->header_out(Location => $dest);
         return REDIRECT;
     } else {