Attachment 35553 Details for Bug 12027 – BUG 12027: Added shibboleth authentication to the staff client

[patch] BUG 12027: Added shibboleth authentication to the staff client

BUG-12027-Added-shibboleth-authentication-to-the-s.patch (text/plain), 3.59 KB, created by Martin Renvoize (ashimema) on 2015-01-27 13:37:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2015-01-27 13:37:43 UTC

Size: 3.59 KB

patch

obsolete

>From 9bfd30ce8e6a0f622dc612a8548a7367fbc875b5 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 31 Jul 2014 06:21:55 +0000
>Subject: [PATCH] BUG 12027: Added shibboleth authentication to the staff
> client
>
>- This patch adds shibboleth authentication to the staff client.
>- Depending upon how your url structure works, you may or may not need a
>  second native shibboleth service provider profile configured for this
>  to work.
>
>http://bugs.koha-community.org/show_bug.cgi?id=12026
>---
> C4/Auth.pm                                      |    8 +++-----
> C4/Auth_with_shibboleth.pm                      |   13 +++++++++++--
> koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt |    8 ++++++++
> 3 files changed, 22 insertions(+), 7 deletions(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index e6c121a..2a02c3f 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -800,9 +800,7 @@ sub checkauth {
>             }
> 
>             # If we are in a shibboleth session (shibboleth is enabled, a shibboleth match attribute is set and matches koha matchpoint)
>-            if ( $shib and $shib_login and $shibSuccess and $type eq 'opac' ) {
>-
>-                # (Note: $type eq 'opac' condition should be removed when shibboleth authentication for intranet will be implemented)
>+            if ( $shib and $shib_login and $shibSuccess) {
>                 logout_shib($query);
>             }
>         }
>@@ -887,8 +885,8 @@ sub checkauth {
> 
>             my ( $return, $cardnumber );
> 
>-            # If shib is enabled and we have a shib login, does the login match a valid koha user
>-            if ( $shib && $shib_login && $type eq 'opac' ) {
>+    	    # If shib is enabled and we have a shib login, does the login match a valid koha user
>+            if ( $shib && $shib_login ) {
>                 my $retuserid;
> 
>                 # Do not pass password here, else shib will not be checked in checkpw.
>diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm
>index f30281f..f1ae0fb 100644
>--- a/C4/Auth_with_shibboleth.pm
>+++ b/C4/Auth_with_shibboleth.pm
>@@ -49,6 +49,7 @@ sub shib_ok {
>     return 0;
> }
> 
>+
> # Logout from Shibboleth
> sub logout_shib {
>     my ($query) = @_;
>@@ -116,9 +117,17 @@ sub checkpw_shib {
> sub _get_uri {
> 
>     my $protocol = "https://";
>+    my $interface = C4::Context->interface;
>+    $debug and warn "shibboleth interface: " . $interface;
> 
>-    my $return = $protocol . C4::Context->preference('OPACBaseURL');
>-    return $return;
>+    my $return;
>+    if ( $interface eq 'intranet' ) {
>+        $return = $protocol . C4::Context->preference('staffClientBaseURL');
>+        return $return;
>+    } else {
>+        $return = $protocol . C4::Context->preference('OPACBaseURL');
>+        return $return;
>+    }
> }
> 
> sub _get_shib_config {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>index 5f97758..035c049 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>@@ -42,6 +42,14 @@
> <div id="login_error"><strong>Error: </strong>Invalid username or password</div>
> [% END %]
> 
>+[% IF (shibbolethAuthentication) %]
>+
>+[% IF (invalidShibLogin ) %]
>+<div id="login_error"><Strong>Error: </strong>Shibboleth login failed</div>
>+[% END %]
>+<p>If you have a shibboleth account, please <a href="[% shibbolethLoginUrl %]">click here</a> to login.</p>
>+[% END %]
>+
> 
> <form action="[% url %]" method="post" name="loginform" id="loginform">
>     <input type="hidden" name="koha_login_context" value="intranet" />
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 12027: 30373 | 30374 | 30375 | 30377 | 35553 | 35554 | 43371 | 43372 | 62523 | 62524 | 62823 | 62824 | 62825 | 73152 | 75868 | 79416 | 79417 | 79418 | 79419