Attachment 46162 Details for Bug 14034 – Bug 14034: Fix logout on refresh for shibboleth

[patch] Bug 14034: Fix logout on refresh for shibboleth

Bug-14034-Fix-logout-on-refresh-for-shibboleth.patch (text/plain), 1.70 KB, created by Jesse Weaver on 2015-12-31 20:06:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Weaver

Created: 2015-12-31 20:06:08 UTC

Size: 1.70 KB

patch

obsolete

>From 1dcecbaea49fc7988cf262c65b4ae0016d5fe134 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 18 Sep 2015 08:10:27 +0000
>Subject: [PATCH] Bug 14034: Fix logout on refresh for shibboleth
>
>This is similar to bug 12877
>
>Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
>
>While this is missing a detailed test plan, what I did to test was
>
>1/ Login to koha .. it works
>2/ Apply patch
>3/ Login to koha .. it still works, no regressions. I can't test the
>shibboleth part but it doesnt break anything else so I'm happy to sign
>off
>
>Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
>
>We had to implement this fix for one of our customers using Shibboleth.
>Can verify that it fixes the issue (which, incidentally, breaks
>stage-marc-import since that depends on a constant sessionID).
>
>Passing QA (verified with QA tools). Thanks, Martin!
>---
> C4/Auth.pm | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index 3d5aba3..d7be1d8 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -810,7 +810,9 @@ sub checkauth {
>             $sessiontype = $session->param('sessiontype') || '';
>         }
>         if ( ( $query->param('koha_login_context') && ( $q_userid ne $s_userid ) )
>-            || ( $cas && $query->param('ticket') && !C4::Context->userenv->{'id'} ) || ( $shib && $shib_login && !$logout ) ) {
>+            || ( $cas && $query->param('ticket') && !C4::Context->userenv->{'id'} )
>+            || ( $shib && $shib_login && !$logout && !C4::Context->userenv->{'id'} )
>+        ) {
> 
>             #if a user enters an id ne to the id in the current session, we need to log them in...
>             #first we need to clear the anonymous session...
>-- 
>2.6.2

Actions: View | Diff | Splinter Review

Attachments on bug 14034: 42692 | 45961 | 46162