adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Backport of 3.0 Session API hardening and clear().

Browse source
This commit is contained in:
euromark 2015-01-04 01:40:09 +01:00
parent 4cd2c8fdcb
commit 39e0ce415d
2 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/Cake/Model/Datasource/CakeSession.php
View file

@ -137,7 +137,7 @@ class CakeSession {
/** /**
* Pseudo constructor. * Pseudo constructor.
* *
* @param string $base The base path for the Session * @param string|null $base The base path for the Session
* @return void * @return void
*/ */
public static function init($base = null) { public static function init($base = null) {
@ -160,7 +160,7 @@ class CakeSession {
/** /**
* Setup the Path variable * Setup the Path variable
* *
* @param string $base base path * @param string|null $base base path
* @return void * @return void
*/ */
protected static function _setPath($base = null) { protected static function _setPath($base = null) {
@ -227,7 +227,7 @@ class CakeSession {
* @param string $name Variable name to check for * @param string $name Variable name to check for
* @return bool True if variable is there * @return bool True if variable is there
*/ */
public static function check($name = null) { public static function check($name) {
if (empty($name) || !self::_hasSession() || !self::start()) { if (empty($name) || !self::_hasSession() || !self::start()) {
return false; return false;
} }
@ -246,7 +246,7 @@ class CakeSession {
* within the session id. For example, the file session handler only allows * within the session id. For example, the file session handler only allows
* characters in the range a-z A-Z 0-9 , (comma) and - (minus). * characters in the range a-z A-Z 0-9 , (comma) and - (minus).
* *
* @param string $id Id to replace the current session id * @param string|null $id Id to replace the current session id
* @return string Session id * @return string Session id
*/ */
public static function id($id = null) { public static function id($id = null) {
@ -356,7 +356,7 @@ class CakeSession {
/** /**
* Get / Set the user agent * Get / Set the user agent
* *
* @param string $userAgent Set the user agent * @param string|null $userAgent Set the user agent
* @return string Current user agent * @return string Current user agent
*/ */
public static function userAgent($userAgent = null) { public static function userAgent($userAgent = null) {
@ -372,7 +372,7 @@ class CakeSession {
/** /**
* Returns given session variable, or all of them, if no parameters given. * Returns given session variable, or all of them, if no parameters given.
* *
* @param string|array $name The name of the session variable (or a path as sent to Set.extract) * @param string|null $name The name of the session variable (or a path as sent to Set.extract)
* @return mixed The value of the session variable, null if session not available, * @return mixed The value of the session variable, null if session not available,
* session not started, or provided name not found in the session. * session not started, or provided name not found in the session.
*/ */
@ -468,14 +468,19 @@ class CakeSession {
} }
/** /**
* Clears the session, the session id, and renews the session. * Clears the session.
* *
* Optionally also clears the session id and renews the session.
*
* @param bool $renew If the session should also be renewed. Defaults to false.
* @return void * @return void
*/ */
public static function clear() { public static function clear($renew = false) {
$_SESSION = null; $_SESSION = null;
self::$id = null; if ($renew) {
self::renew(); self::$id = null;
self::renew();
}
} }
/** /**

20
lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
View file

@ -393,11 +393,28 @@ class CakeSessionTest extends CakeTestCase {
$this->assertTrue(TestCakeSession::check('Delete')); $this->assertTrue(TestCakeSession::check('Delete'));
$this->assertTrue(TestCakeSession::write('Clearing.sale', 'everything must go')); $this->assertTrue(TestCakeSession::write('Clearing.sale', 'everything must go'));
$this->assertFalse(TestCakeSession::delete(''));
$this->assertTrue(TestCakeSession::check('Clearing.sale'));
$this->assertFalse(TestCakeSession::delete(null));
$this->assertTrue(TestCakeSession::check('Clearing.sale'));
$this->assertTrue(TestCakeSession::delete('Clearing')); $this->assertTrue(TestCakeSession::delete('Clearing'));
$this->assertFalse(TestCakeSession::check('Clearing.sale')); $this->assertFalse(TestCakeSession::check('Clearing.sale'));
$this->assertFalse(TestCakeSession::check('Clearing')); $this->assertFalse(TestCakeSession::check('Clearing'));
} }
/**
* testClear method
*
* @return void
*/
public function testClear() {
$this->assertTrue(TestCakeSession::write('Delete.me', 'Clearing out'));
TestCakeSession::clear();
$this->assertFalse(TestCakeSession::check('Delete.me'));
$this->assertFalse(TestCakeSession::check('Delete'));
}
/** /**
* testDestroy method * testDestroy method
* *
@ -451,7 +468,8 @@ class CakeSessionTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testCheckEmpty() { public function testCheckEmpty() {
$this->assertFalse(TestCakeSession::check()); $this->assertFalse(TestCakeSession::check(''));
$this->assertFalse(TestCakeSession::check(null));
} }
/** /**