From 7107939d1228f1066cdfc478297127856c2ad49a Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <jkowalsk@student.agh.edu.pl>
Date: Thu, 03 Sep 2015 17:13:09 +0000
Subject: [PATCH] Extract hardcoded session variable name to separate field

---
 uphpCAS.php |  129 ++++++++++++++++++++++++++++++------------
 1 files changed, 92 insertions(+), 37 deletions(-)

diff --git a/uphpCAS.php b/uphpCAS.php
index bce5aab..bf6ab6a 100644
--- a/uphpCAS.php
+++ b/uphpCAS.php
@@ -1,7 +1,7 @@
 <?php
 // Thrown when internal error occurs
 class JasigException extends Exception {}
-// Thrown when CAS server return authentication error
+// Thrown when CAS server returns authentication error
 class JasigAuthException extends JasigException {}
 
 class JasigUser {
@@ -13,8 +13,9 @@
 	const VERSION = '1.0';
 	protected $serverUrl = '';
 	protected $serviceUrl;
+	protected $sessionName = 'uphpCAS-user';
 	
-	function __construct($serverUrl = NULL, $serviceUrl = NULL) {
+	function __construct($serverUrl = NULL, $serviceUrl = NULL, $sessionName = NULL) {
 		if($serverUrl != NULL) {
 			$this->serverUrl = rtrim($serverUrl, '/');
 		}
@@ -26,10 +27,12 @@
 			$port = 0;
 			if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
 				$url = 'https://';
-				if(isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != '443') {
+				if(isset($_SERVER['SERVER_PORT'])
+						&& $_SERVER['SERVER_PORT'] != '443') {
 					$port = $_SERVER['SERVER_PORT'];
 				}
-			} elseif(isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != '80') {
+			} elseif(isset($_SERVER['SERVER_PORT'])
+					&& $_SERVER['SERVER_PORT'] != '80') {
 				$port = $_SERVER['SERVER_PORT'];
 			}
 			
@@ -42,40 +45,64 @@
 			
 			$this->serviceUrl = $url;
 		}
+		
+		if($sessionName) {
+			$this->sessionName = $sessionName;
+		}
 	}
 	
+	public function getServerUrl() {
+		return $this->serverUrl;
+	}
 	public function setServerUrl($serverUrl) {
 		$this->serverUrl = $serverUrl;
 	}
 	
+	public function getServiceUrl() {
+		return $this->serviceUrl;
+	}
 	public function setServiceUrl($serviceUrl) {
 		$this->serviceUrl = $serviceUrl;
 	}
 	
+	public function getSessionName($sessionName) {
+		return $this->sessionName;
+	}
+	public function setSessionName($sessionName) {
+		$this->sessionName = $sessionName;
+	}
+	
 	public function loginUrl() {
-		return $this->serverUrl.'/login?service='.urlencode($this->serviceUrl);
+		return $this->serverUrl.'/login?method=POST&service='.urlencode($this->serviceUrl);
 	}
 	
-	public function logoutUrl() {
-		return $this->serverUrl.'/logout';
+	public function logoutUrl($returnUrl = NULL) {
+		return $this->serverUrl.'/logout'.($returnUrl ? '?service='.urlencode($returnUrl) : '');
 	}
 	
-	public function logout() {
+	public function logout($returnUrl = NULL) {
 		session_start();
-		if(isset($_SESSION['uphpCAS-user'])) {
-			unset($_SESSION['uphpCAS-user']);
+		if($this->isAuthenticated()) {
+			unset($_SESSION[$this->sessionName]);
+			header('Location: '.$this->logoutUrl($returnUrl));
+			die();
+		} elseif($returnUrl) {
+			header('Location: '.$returnUrl);
+			die();
 		}
-		header('Location: '.$this->logoutUrl());
-		die();
+	}
+	
+	public function isAuthenticated() {
+		return isset($_SESSION[$this->sessionName]);
 	}
 	
 	public function authenticate() {
 		session_start();
-		if(isset($_SESSION['uphpCAS-user'])) {
-			return $_SESSION['uphpCAS-user'];
-		} elseif(isset($_GET['ticket'])) {
-			$user = $this->verifyTicket($_GET['ticket']);
-			$_SESSION['uphpCAS-user'] = $user;
+		if($this->isAuthenticated()) {
+			return $_SESSION[$this->sessionName];
+		} elseif(isset($_REQUEST['ticket'])) {
+			$user = $this->verifyTicket($_REQUEST['ticket']);
+			$_SESSION[$this->sessionName] = $user;
 			return $user;
 		} else {
 			header('Location: '.$this->loginUrl());
@@ -92,13 +119,37 @@
 			),
 			'ssl' => array(
 				'verify_peer' => TRUE,
-				'allow_self_signed' => FALSE,
+				'verify_peer_name' => TRUE,
 				'verify_depth' => 5,
-				'ciphers' => 'HIGH:-MD5:-aNULL:-DES',
+				'allow_self_signed' => FALSE,
+				'disable_compression' => TRUE,
 			),
 		);
 		
-		$data = file_get_contents($this->serverUrl.'/serviceValidate?service='.urlencode($this->serviceUrl).'&ticket='.urlencode($ticket),
+		if(version_compare(PHP_VERSION, '5.6', '<')) {
+			$cafiles = array(
+				'/etc/ssl/certs/ca-certificates.crt',
+				'/etc/ssl/certs/ca-bundle.crt',
+				'/etc/pki/tls/certs/ca-bundle.crt',
+			);
+			$cafile = NULL;
+			foreach($cafiles as $file) {
+				if(is_file($file)) {
+					$cafile = $file;
+					break;
+				}
+			}
+			
+			$url = parse_url($this->serverUrl);
+			$context['ssl']['cafile'] = $cafile;
+			$context['ssl']['ciphers'] = 'ECDH:DH:AES:CAMELLIA:!SSLv2:!aNULL'
+					.':!eNULL:!EXPORT:!DES:!3DES:!MD5:!RC4:!ADH:!PSK:!SRP';
+			$context['ssl']['CN_match'] = $url['host'];
+		}
+		
+		$data = file_get_contents($this->serverUrl
+					.'/serviceValidate?service='.urlencode($this->serviceUrl)
+					.'&ticket='.urlencode($ticket),
 				FALSE, stream_context_create($context));
 		if($data === FALSE) {
 			throw new JasigException('Authentication error: CAS server is unavailable');
@@ -111,19 +162,19 @@
 			$xml->loadXML($data);
 			
 			foreach(libxml_get_errors() as $error) {
-				$e = new ErrorException($error->message, $error->code, 1, $error->file, $error->line);
+				$e = new ErrorException($error->message, $error->code, 1,
+						$error->file, $error->line);
 				switch ($error->level) {
 					case LIBXML_ERR_ERROR:
-						throw new Exception('Fatal error during XML parsing', 0, $e);
-						break;
 					case LIBXML_ERR_FATAL:
-						throw new Exception('Fatal error during XML parsing', 0, $e);
+						throw new Exception('Fatal error during XML parsing',
+								0, $e);
 						break;
 				}
 			}
-		}
-		catch(Exception $e) {
-			throw new JasigException('Authentication error: CAS server response invalid - parse error', 0, $e);
+		} 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);
@@ -136,23 +187,28 @@
 		if($failure->length > 0) {
 			$failure = $failure->item(0);
 			if(!($failure instanceof DOMElement)) {
-				throw new JasigException('Authentication error: CAS server response invalid - authenticationFailure');
+				throw new JasigException('Authentication error: CAS server'
+						.' response invalid - authenticationFailure');
 			}
-			throw new JasigAuthException('Authentication error: '.$failure->textContent);
+			throw new JasigAuthException('Authentication error: '
+					.$failure->textContent);
 		} elseif($success->length > 0) {
 			$success = $success->item(0);
 			if(!($success instanceof DOMElement)) {
-				throw new JasigException('Authentication error: CAS server response invalid - authenticationSuccess');
+				throw new JasigException('Authentication error: CAS server'
+						.' response invalid - authenticationSuccess');
 			}
 			
 			$user = $success->getElementsByTagName('user');
 			if($user->length == 0) {
-				throw new JasigException('Authentication error: CAS server response invalid - user');
+				throw new JasigException('Authentication error: CAS server'
+						.' response invalid - user');
 			}
 			
 			$user = trim($user->item(0)->textContent);
-			if(strlen($user)<1) {
-				throw new JasigException('Authentication error: CAS server response invalid - user value');
+			if(strlen($user) < 1) {
+				throw new JasigException('Authentication error: CAS server'
+						.' response invalid - user value');
 			}
 			
 			$jusr = new JasigUser();
@@ -167,10 +223,9 @@
 			}
 			
 			return $jusr;
-		}
-		else
-		{
-			throw new JasigException('Authentication error: CAS server response invalid - required tag not found');
+		} else {
+			throw new JasigException('Authentication error: CAS server'
+					.' response invalid - required tag not found');
 		}
 	}
 }

--
Gitblit v1.9.1