--- loncom/auth/lonlogin.pm	2022/06/18 02:10:18	1.199
+++ loncom/auth/lonlogin.pm	2022/08/24 20:58:50	1.202
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.199 2022/06/18 02:10:18 raeburn Exp $
+# $Id: lonlogin.pm,v 1.202 2022/08/24 20:58:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,8 +68,10 @@ sub handler {
             $env{'form.ltoken'} = $info{'ltoken'};
         } elsif ($info{'linkprot'}) {
             $env{'form.linkprot'} = $info{'linkprot'};
-            if ($info{'linkprotuser'} ne '') {
-                $env{'form.linkprotuser'} = $info{'linkprotuser'};
+            foreach my $item ('linkprotuser','linkprotexit') {
+                if ($info{$item} ne '') {
+                    $env{'form.'.$item} = $info{$item};
+                }
             }
         } elsif ($info{'linkkey'} ne '') {
             $env{'form.linkkey'} = $info{'linkkey'};
@@ -184,8 +186,10 @@ sub handler {
                     $link_info{'ltoken'} = $env{'form.ltoken'};
                 } elsif ($env{'form.linkprot'}) {
                     $link_info{'linkprot'} = $env{'form.linkprot'};
-                    if ($env{'form.linkprotuser'} ne '') {
-                        $link_info{'linkprotuser'} = $env{'form.linkprotuser'};
+                    foreach my $item ('linkprotuser','linkprotexit') {
+                        if ($env{'form.'.$item} ne '') {
+                            $link_info{$item} = $env{'form.'.$item};
+                        }
                     }
                 } elsif ($env{'form.linkkey'} ne '') {
                     $link_info{'linkkey'} = $env{'form.linkkey'};
@@ -255,17 +259,20 @@ sub handler {
             $dest = &HTML::Entities::encode($env{'form.firsturl'},'\'"<>&');
         }
         if (($env{'form.ltoken'}) || ($env{'form.linkprot'})) {
-            my ($linkprot,$linkprotuser);
+            my ($linkprot,$linkprotuser,$linkprotexit);
             if ($env{'form.ltoken'}) {
                 my %info = &Apache::lonnet::tmpget($env{'form.ltoken'});
                 $linkprot = $info{'linkprot'};
                 if ($info{'linkprotuser'} ne '') {
                     $linkprotuser = $info{'linkprotuser'};
-                } 
-                my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
+                }
+                if ($info{'linkprotexit'} ne '') {
+                    $linkprotexit = $info{'linkprotexit'};
+                }
             } else {
                 $linkprot = $env{'form.linkprot'};
                 $linkprotuser = $env{'form.linkprotuser'};
+                $linkprotexit = $env{'form.linkprotexit'};
             }
             if ($linkprot) {
                 my ($linkprotector,$deeplink) = split(/:/,$linkprot,2);
@@ -276,7 +283,11 @@ sub handler {
                                           origurl => $deeplink,
                                           linkprot => $linkprot,
                                           linkprotuser => $linkprotuser,
+                                          linkprotexit => $linkprotexit,
                                        );    
+                    if ($env{'form.ltoken'}) {
+                        my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
+                    }
                     &Apache::migrateuser::logout($r,$ip,$handle,undef,undef,\%linkprotinfo);
                     return OK;
                 }
@@ -325,6 +336,9 @@ sub handler {
                 }
             }
         }
+        if ($env{'form.ltoken'}) {
+            my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
+        }
 	$r->print(
                   $start_page
                  .'<p class="LC_warning">'.&mt('You are already logged in!').'</p>'
@@ -450,7 +464,7 @@ sub handler {
 
 # -------------------------------------------------------- Store away log token
     my ($tokenextras,$tokentype,$linkprot_for_login);
-    my @names = ('role','symb','iptoken','ltoken','linkprotuser','linkprot','linkkey');
+    my @names = ('role','symb','iptoken','ltoken','linkprotuser','linkprotexit','linkprot','linkkey');
     foreach my $name (@names) {
         if ($env{'form.'.$name} ne '') {
             if ($name eq 'ltoken') {
@@ -458,8 +472,10 @@ sub handler {
                 if ($info{'linkprot'}) {
                     $linkprot_for_login = $info{'linkprot'};
                     $tokenextras .= '&linkprot='.&escape($info{'linkprot'});
-                    if ($info{'linkprotuser'}) {
-                        $tokenextras .= '&linkprotuser='.&escape($info{'linkprotuser'});
+                    foreach my $item ('linkprotuser','linkprotexit') {
+                        if ($info{$item}) {
+                            $tokenextras .= '&'.$item.'='.&escape($info{$item});
+                        }
                     }
                     $tokentype = 'link';
                     last;
@@ -648,7 +664,8 @@ function enableInput() {
 ENDSCRIPT
 
     my ($lonhost_in_use,@hosts,%defaultdomconf,$saml_prefix,$saml_landing,
-        $samlssotext,$samlnonsso,$samlssoimg,$samlssoalt,$samlssourl,$samltooltip);
+        $samlssotext,$samlnonsso,$samlssoimg,$samlssoalt,$samlssourl,$samltooltip,
+        $samlnoframe,$samlwindow);
     %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
     @hosts = &Apache::lonnet::current_machine_ids();
     $lonhost_in_use = $lonhost;
@@ -669,6 +686,7 @@ ENDSCRIPT
         $samlssoalt = $defaultdomconf{$saml_prefix.'alt_'.$lonhost_in_use};
         $samlssourl = $defaultdomconf{$saml_prefix.'url_'.$lonhost_in_use};
         $samltooltip = $defaultdomconf{$saml_prefix.'title_'.$lonhost_in_use};
+        $samlwindow = $defaultdomconf{$saml_prefix.'window_'.$lonhost_in_use};
     }
     if ($saml_landing) {
        if ($samlssotext eq '') {
@@ -856,6 +874,7 @@ HEADER
 
     my $stdauthformstyle = 'inline-block';
     my $ssoauthstyle = 'none';
+    my $sso_onclick;
     my $logintype;
     $r->print('<div style="float:left;margin-top:0;">');
     if ($saml_landing) {
@@ -866,6 +885,8 @@ HEADER
         if ($samlssourl  ne '') {
             $ssologin = $samlssourl;
         }
+        my $ssologin_for_js = &js_escape($ssologin);
+        my $querystr_for_js;
         if (($logtoken eq 'con_lost') || ($logtoken eq 'no_such_host')) {
             my $querystring;
             if ($env{'form.firsturl'} ne '') {
@@ -886,16 +907,44 @@ HEADER
             }
             if ($querystring ne '') {
                 $ssologin .= (($ssologin=~/\?/)?'&amp;':'?') . $querystring;
+                $querystr_for_js = &js_escape($querystring);
             }
         } elsif ($logtoken ne '') {
             $ssologin .= (($ssologin=~/\?/)?'&amp;':'?') . 'logtoken='.$logtoken;
+            $querystr_for_js = &js_escape('logtoken='.$logtoken);
         }
         my $ssohref;
+        if ($samlwindow) {
+            $sso_onclick = <<"ENDJS";
+if (document.getElementById('LC_sso_login_link')) {
+    var ssoelem = document.getElementById('LC_sso_login_link')
+    ssoelem.addEventListener('click',samlWinFunction,false);
+    var windows = {};
+    function samlWinFunction(evt) {
+        evt.preventDefault();
+        var url = '$ssologin_for_js';
+        var name = 'lcssowin';
+        var querystr = '$querystr_for_js';
+        if (querystr) {
+            url += '?'+querystr+'&lcssowin=1';
+        } else {
+            url += '?lcssowin=1';
+        }
+        if ((typeof windows[name] !== 'undefined') && (!windows[name].closed)) {
+            windows[name].close();
+        }
+        windows[name]=window.open(url,name,'width=350,height=600');
+        windows[name].focus();
+        return false;
+    }
+}
+ENDJS
+        }
         if ($samlssoimg ne '') {
-            $ssohref = '<a href="'.$ssologin.'" title="'.$samltooltip.'">'.
+            $ssohref = '<a href="'.$ssologin.'" title="'.$samltooltip.'" id="LC_sso_login_link">'.
                        '<img src="'.$samlssoimg.'" alt="'.$samlssoalt.'" id="lcssobutton" /></a>';
         } else {
-            $ssohref = '<a href="'.$ssologin.'">'.$samlssotext.'</a>';
+            $ssohref = '<a href="'.$ssologin.'" id="LC_sso_login_link">'.$samlssotext.'</a>';
         }
         if (($env{'form.saml'} eq 'no') ||
             (($env{'form.username'} ne '') && ($env{'form.domain'} ne ''))) {
@@ -950,11 +999,22 @@ ENDTARG
 // <![CDATA[
 if ((window.self !== window.top) && (document.server.target != '_self')) {
     $set_target
+    $sso_onclick
 }
 // ]]>
 </script>
 ENDJS
         }
+    } elsif ($samlwindow) {
+        $in_frame_js = <<ENDJS;
+<script type="text/javascript">
+// <![CDATA[
+if ((window.self !== window.top) && (document.server.target != '_self')) {
+    $sso_onclick
+}
+// ]]>
+</script>
+ENDJS
     }
 
     $r->print(<<ENDLOGIN);
@@ -1149,6 +1209,7 @@ sub redirect_page {
         $path = '/'.$path;
     }
     my $url = $protocol.'://'.$hostname.$path;
+    my $args = {};
     if ($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
         $url = $protocol.'://'.$hostname.$env{'form.firsturl'};
         if (($env{'form.ltoken'}) || ($env{'form.linkprot'} ne '') ||
@@ -1157,11 +1218,15 @@ sub redirect_page {
             if ($env{'form.ltoken'}) {
                 %link_info = &Apache::lonnet::tmpget($env{'form.ltoken'});
                 &Apache::lonnet::tmpdel($env{'form.ltoken'});
+                $args->{'only_body'} = 1;
             } elsif ($env{'form.linkprot'}) {
                 $link_info{'linkprot'} = $env{'form.linkprot'};
-                if ($env{'form.linkprotuser'}) {
-                    $link_info{'linkprotuser'} = $env{'form.linkprotuser'};
+                foreach my $item ('linkprotuser','linkprotexit') {
+                    if ($env{'form.'.$item}) {
+                        $link_info{$item} = $env{'form.'.$item};
+                    }
                 }
+                $args->{'only_body'} = 1;
             } elsif ($env{'form.linkkey'} ne '') {
                 $link_info{'linkkey'} = $env{'form.linkkey'};
             }
@@ -1196,8 +1261,8 @@ sub redirect_page {
         }
         $url .= $querystring;
     }
-    my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,
-                                                    {'redirect' => [0,$url],});
+    $args->{'redirect'} = [0,$url];
+    my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,$args);
     my $end_page   = &Apache::loncommon::end_page();
     return $start_page.$end_page;
 }