Attachment 70441 Details for Bug 19160 – Bug 19160: Move the code from controller to C4::Auth_with_cas

[patch] Bug 19160: Move the code from controller to C4::Auth_with_cas

Bug-19160-Move-the-code-from-controller-to-C4Authw.patch (text/plain), 2.78 KB, created by Jonathan Druart on 2018-01-11 18:46:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-01-11 18:46:57 UTC

Size: 2.78 KB

patch

obsolete

>From d2cf920a752415892ef5520545385cc1d58801a2 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 11 Jan 2018 15:37:18 -0300
>Subject: [PATCH] Bug 19160: Move the code from controller to C4::Auth_with_cas
>
>---
> 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 97a741f..cdb6e88 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 ba683cd..1459bca 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 2f4b238..f5380ce 100755
>--- a/opac/opac-user.pl
>+++ b/opac/opac-user.pl
>@@ -60,22 +60,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(
>     {
>@@ -87,7 +74,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
>     }
> );
> 
>-if ($logout){
>+if ($cas_logout_required){
>     print $query->header;
>     exit;
> }
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 19160: 66285 | 66306 | 70408 | 70440 | 70441 | 70442 | 71829 | 71830 | 71831 | 71832 | 71833 | 71834 | 71835 | 72358 | 72359 | 72360 | 72361 | 72362 | 72363 | 72364