From a660177f51333207165dbdd0795889827adea10b Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <jkowalsk@student.agh.edu.pl>
Date: Sun, 06 Sep 2015 14:39:07 +0000
Subject: [PATCH] Remove finally block to support PHP 5.4 and older
---
uphpCAS.php | 79 ++++++++++++++++++++++++++++++---------
1 files changed, 60 insertions(+), 19 deletions(-)
diff --git a/uphpCAS.php b/uphpCAS.php
index 5ded1ea..77ba8d3 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,16 +91,39 @@
$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 logout($returnUrl = NULL) {
- session_start();
+ @session_start();
if($this->isAuthenticated()) {
unset($_SESSION[$this->sessionName]);
header('Location: '.$this->logoutUrl($returnUrl));
@@ -99,7 +139,7 @@
}
public function authenticate() {
- session_start();
+ @session_start();
if($this->isAuthenticated()) {
return $_SESSION[$this->sessionName];
} elseif(isset($_REQUEST['ticket'])) {
@@ -131,7 +171,7 @@
}
protected function createStreamContext($hostname) {
- $context = stream_context_create(array(
+ $context = array(
'http' => array(
'method' => 'GET',
'user_agent' => 'uphpCAS/'.self::VERSION,
@@ -144,20 +184,19 @@
'allow_self_signed' => FALSE,
'disable_compression' => TRUE,
),
- ));
+ );
- if(version_compare(PHP_VERSION, '5.6', '<')) {
- stream_context_set_option($context, array(
- 'ssl' => array(
- 'cafile' => $this->findCaFile(),
- 'ciphers' => 'ECDH:DH:AES:CAMELLIA:!SSLv2:!aNULL:!eNULL'
- .':!EXPORT:!DES:!3DES:!MD5:!RC4:!ADH:!PSK:!SRP',
- 'CN_match' => $hostname,
- ),
- ));
+ if($this->caFile) {
+ $context['ssl']['cafile'] = $this->caFile;
}
- return $context;
+ 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) {
@@ -189,13 +228,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