From 467a55acd9651c8a9ce7367b7c7f0ee9d653b108 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Wed, 07 Aug 2019 15:12:39 +0000
Subject: [PATCH] Add logoutLocal() method that only clears local session and does not logout from the CAS server.

---
 uphpCAS.php |   88 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 71 insertions(+), 17 deletions(-)

diff --git a/uphpCAS.php b/uphpCAS.php
index c67e7a4..98a3134 100644
--- a/uphpCAS.php
+++ b/uphpCAS.php
@@ -14,6 +14,8 @@
 	protected $serverUrl = '';
 	protected $serviceUrl;
 	protected $sessionName = 'uphpCAS-user';
+	protected $method = 'POST';
+	protected $caFile = NULL;
 	
 	function __construct($serverUrl = NULL, $serviceUrl = NULL, $sessionName = NULL) {
 		if($serverUrl != NULL) {
@@ -28,6 +30,10 @@
 		
 		if($sessionName) {
 			$this->sessionName = $sessionName;
+		}
+		
+		if(version_compare(PHP_VERSION, '5.6', '<')) {
+			$this->caFile = $this->findCaFile();
 		}
 	}
 	
@@ -50,7 +56,18 @@
 		if($port != 0) {
 			$url .= ':'.$port;
 		}
+		
 		$url .= $_SERVER['REQUEST_URI'];
+		
+		if(isset($_GET['ticket'])) {
+			$pos = max(
+				strrpos($url, '?ticket='),
+				strrpos($url, '&ticket=')
+			);
+			$url = substr($url, 0, $pos);
+		}
+		
+		return $url;
 	}
 	
 	public function getServerUrl() {
@@ -74,18 +91,45 @@
 		$this->sessionName = $sessionName;
 	}
 	
+	public function getMethod() {
+		return $this->method;
+	}
+	public function setMethod($method) {
+		if($method != 'GET' && $method != 'POST') {
+			throw new DomainException('Unsupported CAS response'
+				.' method: '.$method);
+		}
+		$this->method = $method;
+	}
+	
+	public function getCaFile() {
+		return $this->caFile;
+	}
+	public function setCaFile($caFile) {
+		if(!is_file($caFile)) {
+			throw new DomainException('Invalid CA file: '.$caFile);
+		}
+		$this->caFile = $caFile;
+	}
+	
 	public function loginUrl() {
-		return $this->serverUrl.'/login?method=POST&service='.urlencode($this->serviceUrl);
+		return $this->serverUrl.'/login?method='.$this->method
+			.'&service='.urlencode($this->serviceUrl);
 	}
 	
 	public function logoutUrl($returnUrl = NULL) {
-		return $this->serverUrl.'/logout'.($returnUrl ? '?service='.urlencode($returnUrl) : '');
+		return $this->serverUrl.'/logout'
+			.($returnUrl ? '?service='.urlencode($returnUrl) : '');
+	}
+	
+	public function logoutLocal() {
+		@session_start();
+		unset($_SESSION[$this->sessionName]);
 	}
 	
 	public function logout($returnUrl = NULL) {
-		session_start();
+		$this->logoutLocal();
 		if($this->isAuthenticated()) {
-			unset($_SESSION[$this->sessionName]);
 			header('Location: '.$this->logoutUrl($returnUrl));
 			die();
 		} elseif($returnUrl) {
@@ -99,7 +143,7 @@
 	}
 	
 	public function authenticate() {
-		session_start();
+		@session_start();
 		if($this->isAuthenticated()) {
 			return $_SESSION[$this->sessionName];
 		} elseif(isset($_REQUEST['ticket'])) {
@@ -130,7 +174,7 @@
 		return $cafile;
 	}
 	
-	public function verifyTicket($ticket) {
+	protected function createStreamContext($hostname) {
 		$context = array(
 			'http' => array(
 				'method' => 'GET',
@@ -146,18 +190,26 @@
 			),
 		);
 		
-		if(version_compare(PHP_VERSION, '5.6', '<')) {
-			$url = parse_url($this->serverUrl);
-			$context['ssl']['cafile'] = $this->findCaFile();
-			$context['ssl']['ciphers'] = 'ECDH:DH:AES:CAMELLIA:!SSLv2:!aNULL'
-					.':!eNULL:!EXPORT:!DES:!3DES:!MD5:!RC4:!ADH:!PSK:!SRP';
-			$context['ssl']['CN_match'] = $url['host'];
+		if($this->caFile) {
+			$context['ssl']['cafile'] = $this->caFile;
 		}
+		
+		if(version_compare(PHP_VERSION, '5.6', '<')) {
+			$context['ssl']['ciphers'] = 'ECDH:DH:AES:CAMELLIA:!SSLv2:!aNULL'
+				.':!eNULL:!EXPORT:!DES:!3DES:!MD5:!RC4:!ADH:!PSK:!SRP';
+			$context['ssl']['CN_match'] = $hostname;
+		}
+		
+		return stream_context_create($context);
+	}
+	
+	public function verifyTicket($ticket) {
+		$url = parse_url($this->serverUrl);
+		$context = $this->createStreamContext($url['host']);
 		
 		$data = file_get_contents($this->serverUrl
 					.'/serviceValidate?service='.urlencode($this->serviceUrl)
-					.'&ticket='.urlencode($ticket),
-				FALSE, stream_context_create($context));
+					.'&ticket='.urlencode($ticket), FALSE, $context);
 		if($data === FALSE) {
 			throw new JasigException('Authentication error: CAS server is unavailable');
 		}
@@ -180,13 +232,15 @@
 				}
 			}
 		} catch(Exception $e) {
-			throw new JasigException('Authentication error: CAS server'
-					.' response invalid - parse error', 0, $e);
-		} finally {
 			libxml_clear_errors();
 			libxml_disable_entity_loader($xmlEntityLoader);
 			libxml_use_internal_errors($xmlInternalErrors);
+			throw new JasigException('Authentication error: CAS server'
+					.' response invalid - parse error', 0, $e);
 		}
+		libxml_clear_errors();
+		libxml_disable_entity_loader($xmlEntityLoader);
+		libxml_use_internal_errors($xmlInternalErrors);
 		
 		$failure = $xml->getElementsByTagName('authenticationFailure');
 		$success = $xml->getElementsByTagName('authenticationSuccess');

--
Gitblit v1.9.1