X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FAuth_with_cas.pm;h=69e510f415afe3a996e95ff3558235b3956dc329;hb=de03c263f0579d28a735e3b1261121e439263a82;hp=f9a03a3f17574093857f3b0520c01906c447e763;hpb=e8f654fcd206a98ad1a9222e17bffe2bdb32747d;p=koha_fer

diff --git a/C4/Auth_with_cas.pm b/C4/Auth_with_cas.pm
index f9a03a3f17..69e510f415 100644
--- a/C4/Auth_with_cas.pm
+++ b/C4/Auth_with_cas.pm
@@ -22,43 +22,66 @@ use warnings;
 
 use C4::Debug;
 use C4::Context;
-use C4::Utils qw( :all );
 use Authen::CAS::Client;
 use CGI;
+use FindBin;
 
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug);
 
 BEGIN {
 	require Exporter;
-	$VERSION = 3.03;	# set the version for version checking
+    $VERSION = 3.07.00.049;	# set the version for version checking
 	$debug = $ENV{DEBUG};
 	@ISA    = qw(Exporter);
-	@EXPORT = qw(checkpw_cas login_cas logout_cas login_cas_url);
+	@EXPORT = qw(check_api_auth_cas checkpw_cas login_cas logout_cas login_cas_url);
+}
+my $context = C4::Context->new() or die 'C4::Context->new failed';
+my $defaultcasserver;
+my $casservers;
+my $yamlauthfile = "../C4/Auth_cas_servers.yaml";
+
+
+# If there's a configuration for multiple cas servers, then we get it
+if (multipleAuth()) {
+    ($defaultcasserver, $casservers) = YAML::LoadFile(qq($FindBin::Bin/$yamlauthfile));
+    $defaultcasserver = $defaultcasserver->{'default'};
+} else {
+# Else, we fall back to casServerUrl syspref
+    $defaultcasserver = 'default';
+    $casservers = { 'default' => C4::Context->preference('casServerUrl') };
 }
 
+# Is there a configuration file for multiple cas servers?
+sub multipleAuth {
+    return (-e qq($FindBin::Bin/$yamlauthfile));
+}
 
-my $context = C4::Context->new() 	or die 'C4::Context->new failed';
-my $casserver = C4::Context->preference('casServerUrl');
+# Returns configured CAS servers' list if multiple authentication is enabled
+sub getMultipleAuth {
+   return $casservers; 
+}
 
 # Logout from CAS
 sub logout_cas {
     my ($query) = @_;
-    my $cas = Authen::CAS::Client->new($casserver);
-    print $query->redirect($cas->logout_url(url => $ENV{'SCRIPT_URI'}));
+    my ( $cas, $uri ) = _get_cas_and_service($query);
+    print $query->redirect( $cas->logout_url($uri));
+    print $query->redirect( $cas->logout_url(url => $uri));
 }
 
 # Login to CAS
 sub login_cas {
     my ($query) = @_;
-    my $cas = Authen::CAS::Client->new($casserver);
-    print $query->redirect($cas->login_url($ENV{'SCRIPT_URI'})); 
+    my ( $cas, $uri ) = _get_cas_and_service($query);
+    print $query->redirect( $cas->login_url($uri));
 }
 
 # Returns CAS login URL with callback to the requesting URL
 sub login_cas_url {
-    my $cas = Authen::CAS::Client->new($casserver);
-    return $cas->login_url($ENV{'SCRIPT_URI'});
+    my ( $query, $key ) = @_;
+    my ( $cas, $uri ) = _get_cas_and_service( $query, $key );
+    return $cas->login_url($uri);
 }
 
 # Checks for password correctness
@@ -67,46 +90,128 @@ sub checkpw_cas {
     $debug and warn "checkpw_cas";
     my ($dbh, $ticket, $query) = @_;
     my $retnumber;
-    my $cas = Authen::CAS::Client->new($casserver);
+    my ( $cas, $uri ) = _get_cas_and_service($query);
 
     # If we got a ticket
     if ($ticket) {
-	$debug and warn "Got ticket : $ticket";
-	
-	# We try to validate it
-	my $val = $cas->service_validate($ENV{'SCRIPT_URI'}, $ticket);
-	
-	# If it's valid
-	if( $val->is_success() ) {
-
-	    my $userid = $val->user();
-	    $debug and warn "User CAS authenticated as: $userid";
-
-	    # Does it match one of our users ?
-    	    my $sth = $dbh->prepare("select cardnumber from borrowers where userid=?");
-    	    $sth->execute($userid);
-    	    if ( $sth->rows ) {
-		$retnumber = $sth->fetchrow;
-		return (1, $retnumber, $userid);
-	    }
-	    $sth = $dbh->prepare("select userid from borrowers where cardnumber=?");
-	    $sth->execute($userid);
-	    if ( $sth->rows ) {
-	    	$retnumber = $sth->fetchrow;
-		return (1, $retnumber, $userid);
-	    }
-	    
-	    # If we reach this point, then the user is a valid CAS user, but not a Koha user
-	    $debug and warn "User $userid is not a valid Koha user";
-
-    	} else {
-    	    $debug and warn "Invalid session ticket : $ticket";
-    	    return 0;
-	}
+        $debug and warn "Got ticket : $ticket";
+
+        # We try to validate it
+        my $val = $cas->service_validate($uri, $ticket );
+
+        # If it's valid
+        if ( $val->is_success() ) {
+
+            my $userid = $val->user();
+            $debug and warn "User CAS authenticated as: $userid";
+
+            # Does it match one of our users ?
+            my $sth = $dbh->prepare("select cardnumber from borrowers where userid=?");
+            $sth->execute($userid);
+            if ( $sth->rows ) {
+                $retnumber = $sth->fetchrow;
+                return ( 1, $retnumber, $userid );
+            }
+            $sth = $dbh->prepare("select userid from borrowers where cardnumber=?");
+            $sth->execute($userid);
+            if ( $sth->rows ) {
+                $retnumber = $sth->fetchrow;
+                return ( 1, $retnumber, $userid );
+            }
+
+            # If we reach this point, then the user is a valid CAS user, but not a Koha user
+            $debug and warn "User $userid is not a valid Koha user";
+
+        } else {
+            $debug and warn "Problem when validating ticket : $ticket";
+            $debug and warn "Authen::CAS::Client::Response::Error: " . $val->error() if $val->is_error();
+            $debug and warn "Authen::CAS::Client::Response::Failure: " . $val->message() if $val->is_failure();
+            $debug and warn Data::Dumper::Dumper($@) if $val->is_error() or $val->is_failure();
+            return 0;
+        }
     }
     return 0;
 }
 
+# Proxy CAS auth
+sub check_api_auth_cas {
+    $debug and warn "check_api_auth_cas";
+    my ($dbh, $PT, $query) = @_;
+    my $retnumber;
+    my ( $cas, $uri ) = _get_cas_and_service($query);
+
+    # If we have a Proxy Ticket
+    if ($PT) {
+        my $r = $cas->proxy_validate( $uri, $PT );
+
+        # If the PT is valid
+        if ( $r->is_success ) {
+
+            # We've got a username !
+            $debug and warn "User authenticated as: ", $r->user, "\n";
+            $debug and warn "Proxied through:\n";
+            $debug and warn "  $_\n" for $r->proxies;
+
+            my $userid = $r->user;
+
+            # Does it match one of our users ?
+            my $sth = $dbh->prepare("select cardnumber from borrowers where userid=?");
+            $sth->execute($userid);
+            if ( $sth->rows ) {
+                $retnumber = $sth->fetchrow;
+                return ( 1, $retnumber, $userid );
+            }
+            $sth = $dbh->prepare("select userid from borrowers where cardnumber=?");
+            return $r->user;
+            $sth->execute($userid);
+            if ( $sth->rows ) {
+                $retnumber = $sth->fetchrow;
+                return ( 1, $retnumber, $userid );
+            }
+
+            # If we reach this point, then the user is a valid CAS user, but not a Koha user
+            $debug and warn "User $userid is not a valid Koha user";
+
+        } else {
+            $debug and warn "Proxy Ticket authentication failed";
+            return 0;
+        }
+    }
+    return 0;
+}
+
+# Get CAS handler and service URI
+sub _get_cas_and_service {
+    my $query = shift;
+    my $key   = shift;    # optional
+
+    my $uri = _url_with_get_params($query);
+
+    my $casparam = $defaultcasserver;
+    $casparam = $query->param('cas') if defined $query->param('cas');
+    $casparam = $key if defined $key;
+    my $cas = Authen::CAS::Client->new( $casservers->{$casparam} );
+
+    return ( $cas, $uri );
+}
+
+# Get the current URL with parameters contained directly into URL (GET params)
+# This method replaces $query->url() which will give both GET and POST params
+sub _url_with_get_params {
+    my $query = shift;
+
+    my $uri_base_part = C4::Context->preference('OPACBaseURL') . $query->script_name();
+    my $uri_params_part = '';
+    foreach ( $query->url_param() ) {
+        $uri_params_part .= '&' if $uri_params_part;
+        $uri_params_part .= $_ . '=';
+        $uri_params_part .= URI::Escape::uri_escape( $query->url_param($_) );
+    }
+    $uri_base_part .= '?' if $uri_params_part;
+
+    return $uri_base_part . $uri_params_part;
+}
+
 1;
 __END__