From b85f8c9e2ad2ea5efa5a9b57df5614f24d8d9fdd Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 11 Jan 2018 15:37:18 -0300 Subject: [PATCH] Bug 19160: Move the code from controller to C4::Auth_with_cas Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart --- C4/Auth.pm | 2 +- C4/Auth_with_cas.pm | 17 +++++++++++++++++ opac/opac-user.pl | 21 ++++----------------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index b0b750e85e..a8b1ea305a 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -86,7 +86,7 @@ BEGIN { } } if ($cas) { - import C4::Auth_with_cas qw(check_api_auth_cas checkpw_cas login_cas logout_cas login_cas_url); + import C4::Auth_with_cas qw(check_api_auth_cas checkpw_cas login_cas logout_cas login_cas_url logout_required); } } diff --git a/C4/Auth_with_cas.pm b/C4/Auth_with_cas.pm index ba683cdd8f..1459bca8d4 100644 --- a/C4/Auth_with_cas.pm +++ b/C4/Auth_with_cas.pm @@ -228,6 +228,23 @@ sub _url_with_get_params { return $uri_base_part . $uri_params_part; } +sub logout_required { + my ( $query ) = @_; + # Check we havent been hit by a logout call + my $xml = $query->param('logoutRequest'); + if ($xml) { + my $dom = XML::LibXML->load_xml(string => $xml); + my $ticket; + foreach my $node ($dom->findnodes('/samlp:LogoutRequest')){ + $ticket = $node->findvalue('./samlp:SessionIndex'); + } + $query->param(-name =>'logout.x', -value => 1); + $query->param(-name =>'cas_ticket', -value => $ticket); + return 1; + } + return 0; +} + 1; __END__ diff --git a/opac/opac-user.pl b/opac/opac-user.pl index c5d6ab7dd2..a247ed795d 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -61,22 +61,9 @@ BEGIN { import C4::External::BakerTaylor qw(&image_url &link_url); } } -my $logout=''; -# CAS Single Sign Out -if (C4::Context->preference('casAuthentication')){ - # Check we havent been hit by a logout call - my $xml = $query->param('logoutRequest'); - if ($xml) { - my $dom = XML::LibXML->load_xml(string => $xml); - my $ticket; - foreach my $node ($dom->findnodes('/samlp:LogoutRequest')){ - $ticket = $node->findvalue('./samlp:SessionIndex'); - } - $query->param(-name =>'logout.x', -value => 1); - $query->param(-name =>'cas_ticket', -value => $ticket); - $logout=1; - } -} + +my $cas_logout_required = C4::Context->preference('casAuthentication') + and C4::Auth_with_ldap::logout_required($query); my ( $template, $borrowernumber, $cookie ) = get_template_and_user( { @@ -88,7 +75,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( } ); -if ($logout){ +if ($cas_logout_required){ print $query->header; exit; } -- 2.39.5