--- loncom/auth/lonlogout.pm 2017/11/03 18:55:16 1.45.2.3.2.1 +++ loncom/auth/lonlogout.pm 2019/08/01 14:30:27 1.45.2.6 @@ -1,7 +1,7 @@ # The LearningOnline Network # Logout Handler # -# $Id: lonlogout.pm,v 1.45.2.3.2.1 2017/11/03 18:55:16 raeburn Exp $ +# $Id: lonlogout.pm,v 1.45.2.6 2019/08/01 14:30:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -115,7 +115,7 @@ sub handler { $ssofile = '/'.&Apache::loncommon::clean_path($r->dir_config("lonSSOUserLogoutHeadFile_$domain")); if ($ssofile eq $r->dir_config("lonSSOUserLogoutHeadFile_$domain")) { if ($ssofile =~ /^\Q$londocroot\E/) { - if (open(my $fh,"<$ssofile")) { + if (open(my $fh,'<',$ssofile)) { $headextra = join('',<$fh>); close($fh); } @@ -127,7 +127,7 @@ sub handler { $ssofile = '/'.&Apache::loncommon::clean_path($r->dir_config('lonSSOUserLogoutHeadFile')); if ($ssofile eq $r->dir_config('lonSSOUserLogoutHeadFile')) { if ($ssofile =~ /^\Q$londocroot\E/) { - if (open(my $fh,"<$ssofile")) { + if (open(my $fh,'<',$ssofile)) { $headextra.= join('',<$fh>); close($fh); } @@ -196,14 +196,14 @@ Due to security reasons in new web brows } if ($env{'request.sso.login'} && defined($r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) { - if (open(my $fh,$r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) { + if (open(my $fh,'<',$r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) { $relogmessage.= join('',<$fh>); close($fh); } } if ($env{'request.sso.login'} && defined($r->dir_config('lonSSOUserLogoutMessageFile'))) { - if (open(my $fh,$r->dir_config('lonSSOUserLogoutMessageFile'))) { + if (open(my $fh,'<',$r->dir_config('lonSSOUserLogoutMessageFile'))) { $relogmessage.= join('',<$fh>); close($fh); } @@ -217,6 +217,13 @@ $windowinfo $relogmessage $end_page ENDDOCUMENT + if ($env{'request.balancercookie'}) { + my ($balancer,$cookie) = split(/:/,$env{'request.balancercookie'}); + if ((&Apache::lonnet::hostname($balancer)) && ($cookie =~ /^[a-f0-9]{32}$/)) { + $cookie = $env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cookie; + &Apache::lonnet::delbalcookie($cookie,$balancer); + } + } $r->register_cleanup(\&flush_course_logs); return OK; }