Attachment 80023 Details for Bug 17776 – Bug 17776: Enable Shibboleth for Plack

[patch] Bug 17776: Enable Shibboleth for Plack

Bug-17776-Enable-Shibboleth-for-Plack.patch (text/plain), 3.36 KB, created by Martin Renvoize (ashimema) on 2018-10-05 10:51:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2018-10-05 10:51:51 UTC

Size: 3.36 KB

patch

obsolete

>From 99de839779b7c4b8c74b78341a6742dfa2f312bd Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 2 Mar 2017 16:40:11 +0000
>Subject: [PATCH] Bug 17776: Enable Shibboleth for Plack
>
>https://bugs.koha-community.org/show_bug.cgi?id=17776
>
>Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> C4/Auth.pm                 | 18 ++++++++----------
> C4/Auth_with_shibboleth.pm | 21 ++++++++++++++++++---
> 2 files changed, 26 insertions(+), 13 deletions(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index 7d330b57bc..303db34019 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -76,16 +76,7 @@ BEGIN {
>           qw(shib_ok checkpw_shib logout_shib login_shib_url get_login_shib);
> 
>         # Check for good config
>-        if ( shib_ok() ) {
>-
>-            # Get shibboleth login attribute
>-            $shib_login = get_login_shib();
>-        }
>-
>-        # Bad config, disable shibboleth
>-        else {
>-            $shib = 0;
>-        }
>+        $shib = 0 unless shib_ok();
>     }
>     if ($cas) {
>         import C4::Auth_with_cas qw(check_api_auth_cas checkpw_cas login_cas logout_cas login_cas_url logout_if_required);
>@@ -161,6 +152,9 @@ sub get_template_and_user {
>     my $in = shift;
>     my ( $user, $cookie, $sessionID, $flags );
> 
>+    # Get shibboleth login attribute
>+    $shib_login = get_login_shib() if $shib;
>+
>     C4::Context->interface( $in->{type} );
> 
>     $in->{'authnotrequired'} ||= 0;
>@@ -790,6 +784,10 @@ sub _timeout_syspref {
> sub checkauth {
>     my $query = shift;
>     $debug and warn "Checking Auth";
>+
>+    # Get shibboleth login attribute
>+    $shib_login = get_login_shib() if $shib;
>+
>     # $authnotrequired will be set for scripts which will run without authentication
>     my $authnotrequired = shift;
>     my $flagsrequired   = shift;
>diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm
>index 421a562d24..371f015721 100644
>--- a/C4/Auth_with_shibboleth.pm
>+++ b/C4/Auth_with_shibboleth.pm
>@@ -27,6 +27,7 @@ use Koha::Patrons;
> use C4::Members::Messaging;
> use Carp;
> use CGI;
>+use List::Util qw(any);
> 
> use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug);
> 
>@@ -82,9 +83,14 @@ sub get_login_shib {
>     my $config = _get_shib_config();
> 
>     my $matchAttribute = $config->{mapping}->{ $config->{matchpoint} }->{is};
>-    $debug and warn $matchAttribute . " value: " . $ENV{$matchAttribute};
> 
>-    return $ENV{$matchAttribute} || '';
>+    if ( any { /(^psgi|^plack)/i } keys %ENV ) {
>+      $debug and warn $matchAttribute . " value: " . $ENV{"HTTP_".uc($matchAttribute)};
>+      return $ENV{"HTTP_".uc($matchAttribute)} || '';
>+    } else {
>+      $debug and warn $matchAttribute . " value: " . $ENV{$matchAttribute};
>+      return $ENV{$matchAttribute} || '';
>+    }
> }
> 
> # Checks for password correctness
>@@ -247,11 +253,20 @@ Map their attributes to what you want to see in koha
> 
> Tell apache that we wish to allow koha to authenticate via shibboleth.
> 
>-This is as simple as adding the below to your virtualhost config:
>+This is as simple as adding the below to your virtualhost config (for CGI running):
>+
>+ <Location />
>+   AuthType shibboleth
>+   Require shibboleth
>+ </Location>
>+
>+Or (for Plack running):
> 
>  <Location />
>    AuthType shibboleth
>    Require shibboleth
>+   ShibUseEnvironment Off
>+   ShibUseHeaders On
>  </Location>
> 
> =item 5.
>-- 
>2.19.0

Actions: View | Diff | Splinter Review

Attachments on bug 17776: 60800 | 60847 | 61426 | 68216 | 79572 | 79573 | 80000 | 80001 | 80002 | 80003 | 80023 | 80024 | 80025 | 80026