From 634a496d01950b9ff791d3bc99accece43a3dd4f Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Mon, 05 Oct 2020 15:46:45 +0000
Subject: [PATCH] Fix session handling die to changes in PHP 7.1
---
uphpCAS.php | 199 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 146 insertions(+), 53 deletions(-)
diff --git a/uphpCAS.php b/uphpCAS.php
index b757153..bfb2b69 100644
--- a/uphpCAS.php
+++ b/uphpCAS.php
@@ -13,8 +13,12 @@
const VERSION = '1.0';
protected $serverUrl = '';
protected $serviceUrl;
+ protected $sessionName = 'uphpCAS-user';
+ protected $sessionStarted = FALSE;
+ protected $method = 'POST';
+ protected $caFile = NULL;
- function __construct($serverUrl = NULL, $serviceUrl = NULL) {
+ function __construct($serverUrl = NULL, $serviceUrl = NULL, $sessionName = NULL) {
if($serverUrl != NULL) {
$this->serverUrl = rtrim($serverUrl, '/');
}
@@ -22,28 +26,49 @@
if($serviceUrl != NULL) {
$this->serviceUrl = $serviceUrl;
} else {
- $url = 'http://';
- $port = 0;
- if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
- $url = 'https://';
- if(isset($_SERVER['SERVER_PORT'])
- && $_SERVER['SERVER_PORT'] != '443') {
- $port = $_SERVER['SERVER_PORT'];
- }
- } elseif(isset($_SERVER['SERVER_PORT'])
- && $_SERVER['SERVER_PORT'] != '80') {
+ $this->serviceUrl = $this->getCurrentUrl();
+ }
+
+ if($sessionName) {
+ $this->sessionName = $sessionName;
+ }
+
+ if(version_compare(PHP_VERSION, '5.6', '<')) {
+ $this->caFile = $this->findCaFile();
+ }
+ }
+
+ public function getCurrentUrl() {
+ $url = 'http://';
+ $port = 0;
+ if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+ $url = 'https://';
+ if(isset($_SERVER['SERVER_PORT'])
+ && $_SERVER['SERVER_PORT'] != '443') {
$port = $_SERVER['SERVER_PORT'];
}
-
- $url .= $_SERVER['SERVER_NAME'];
-
- if($port != 0) {
- $url .= ':'.$port;
- }
- $url .= $_SERVER['REQUEST_URI'];
-
- $this->serviceUrl = $url;
+ } elseif(isset($_SERVER['SERVER_PORT'])
+ && $_SERVER['SERVER_PORT'] != '80') {
+ $port = $_SERVER['SERVER_PORT'];
}
+
+ $url .= $_SERVER['SERVER_NAME'];
+
+ 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() {
@@ -60,18 +85,69 @@
$this->serviceUrl = $serviceUrl;
}
+ public function getSessionName() {
+ return $this->sessionName;
+ }
+ public function setSessionName($sessionName) {
+ $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 session_start() {
+ if($this->sessionStarted) {
+ return TRUE;
+ }
+ if(version_compare(PHP_VERSION, '7.1.0', '<')) {
+ @session_start();
+ } else {
+ if(!isset($_SESSION)) {
+ if(!session_start()) {
+ throw new RuntimeException('Cannot start session');
+ }
+ }
+ }
+ $this->sessionStarted = TRUE;
+ return TRUE;
+ }
+
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() {
+ $this->session_start();
+ unset($_SESSION[$this->sessionName]);
}
public function logout($returnUrl = NULL) {
- session_start();
+ $this->logoutLocal();
if($this->isAuthenticated()) {
- unset($_SESSION['uphpCAS-user']);
header('Location: '.$this->logoutUrl($returnUrl));
die();
} elseif($returnUrl) {
@@ -81,16 +157,18 @@
}
public function isAuthenticated() {
- return isset($_SESSION['uphpCAS-user']);
+ $this->session_start();
+ return isset($_SESSION[$this->sessionName]);
}
public function authenticate() {
- session_start();
+ $this->session_start();
if($this->isAuthenticated()) {
- return $_SESSION['uphpCAS-user'];
+ return $_SESSION[$this->sessionName];
} elseif(isset($_REQUEST['ticket'])) {
$user = $this->verifyTicket($_REQUEST['ticket']);
- $_SESSION['uphpCAS-user'] = $user;
+ session_regenerate_id();
+ $_SESSION[$this->sessionName] = $user;
return $user;
} else {
header('Location: '.$this->loginUrl());
@@ -98,7 +176,25 @@
}
}
- public function verifyTicket($ticket) {
+ protected function findCaFile() {
+ $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;
+ }
+ }
+
+ return $cafile;
+ }
+
+ protected function createStreamContext($hostname) {
$context = array(
'http' => array(
'method' => 'GET',
@@ -114,31 +210,26 @@
),
);
- 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'];
+ 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');
}
@@ -161,13 +252,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