adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[1294]

Browse source 
Author: phpnut
Date: 12:11:27 PM, Tuesday, November 01, 2005
Message:
Uncommented a line I commented out for testing

[1293]
Author: phpnut
Date: 12:09:54 PM, Tuesday, November 01, 2005
Message:
Fixed bug found while chatting on IRC.
Removed duplicate code that has been moved to CakeSession class.

[1292]
Author: phpnut
Date: 11:16:49 AM, Tuesday, November 01, 2005
Message:
Changing the CakeSession class.       
It is no longer a singleton class.                              
This is being done to correct problems with sessions and requestAction();

[1291]
Author: phpnut
Date: 10:24:56 AM, Tuesday, November 01, 2005
Message:
Added fix from [1218]

[1290]
Author: phpnut
Date: 10:09:36 AM, Tuesday, November 01, 2005
Message:
Added fixed to a bug reported in IRC channel.
Added skeleton methods to Security class for for authentication using a generated key in a hidden form tag.

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1299 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2005-11-01 21:39:45 +00:00
parent 5091d9c82e
commit 42fc8a355f
6 changed files with 112 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cake/dispatcher.php
View file

@ -206,14 +206,7 @@ class Dispatcher extends Object
$controller->privateAction = $params['action']; $controller->privateAction = $params['action'];
$params['action'] = 'privateAction'; $params['action'] = 'privateAction';
} }
if(!defined('AUTO_SESSION') || AUTO_SESSION == true)
{
if (function_exists('session_write_close'))
{
session_write_close();
}
$session = CakeSession::getInstance($this->base);
}
return $this->_invoke($controller, $params ); return $this->_invoke($controller, $params );
} }

13
cake/libs/controller/components/session.php
View file

@ -48,6 +48,7 @@ class SessionComponent extends Object
*/ */
function __construct () function __construct ()
{ {
$this->CakeSession = New CakeSession();
parent::__construct(); parent::__construct();
} }
@ -62,7 +63,7 @@ class SessionComponent extends Object
*/ */
function write($name, $value) function write($name, $value)
{ {
return CakeSession::writeSessionVar($name, $value); return $this->CakeSession->writeSessionVar($name, $value);
} }
/** /**
@ -75,7 +76,7 @@ class SessionComponent extends Object
*/ */
function read($name) function read($name)
{ {
return CakeSession::readSessionVar($name); return $this->CakeSession->readSessionVar($name);
} }
/** /**
@ -88,7 +89,7 @@ class SessionComponent extends Object
*/ */
function del($name) function del($name)
{ {
return CakeSession::delSessionVar($name); return $this->CakeSession->delSessionVar($name);
} }
/** /**
@ -101,7 +102,7 @@ class SessionComponent extends Object
*/ */
function check($name) function check($name)
{ {
return CakeSession::checkSessionVar($name); return $this->CakeSession->checkSessionVar($name);
} }
/** /**
@ -113,7 +114,7 @@ class SessionComponent extends Object
*/ */
function error() function error()
{ {
return CakeSession::getLastError(); return $this->CakeSession->getLastError();
} }
/** /**
@ -160,7 +161,7 @@ class SessionComponent extends Object
*/ */
function valid() function valid()
{ {
return CakeSession::isValid(); return $this->CakeSession->isValid();
} }
} }

8
cake/libs/controller/scaffold.php
View file

@ -345,14 +345,6 @@ class Scaffold extends Object {
if(!empty($isDataBaseSet)) if(!empty($isDataBaseSet))
{ {
$this->controllerClass->constructClasses(); $this->controllerClass->constructClasses();
if(!defined('AUTO_SESSION') || AUTO_SESSION == true)
{
if (function_exists('session_write_close'))
{
session_write_close();
}
$session = CakeSession::getInstance($this->controllerClass->base);
}
if($params['action'] === 'index' || $params['action'] === 'list' || if($params['action'] === 'index' || $params['action'] === 'list' ||
$params['action'] === 'show' || $params['action'] === 'add' || $params['action'] === 'show' || $params['action'] === 'add' ||

11
cake/libs/security.php
View file

@ -69,6 +69,17 @@ class Security extends Object
break; break;
} }
} }
function generateAuthKey()
{
return $authKey;
}
function validateAuthKey($authKey)
{
return true;
}
} }
?> ?>

168
cake/libs/session.php
View file

@ -88,31 +88,34 @@ class CakeSession extends Object
* *
* @return unknown * @return unknown
*/ */
function &getInstance($base = null)
function __construct($base = null)
{ {
static $instance = array(); $this->host = $_SERVER['HTTP_HOST'];
if (!$instance) if (strpos($this->host, ':') !== false)
{
$instance[0] = new CakeSession;
$instance[0]->host = $_SERVER['HTTP_HOST'];
if (strpos($instance[0]->host, ':') !== false)
{ {
$instance[0]->host = substr($instance[0]->host,0, strpos($instance[0]->host, ':')); $this->host = substr($this->host,0, strpos($this->host, ':'));
} }
$instance[0]->path = $base; if (empty($this->path))
if (empty($instance[0]->path))
{ {
$instance[0]->path = '/'; $dispatcher =& new Dispatcher();
$this->path = $dispatcher->baseUrl();
}
else
{
$this->path = $base;
}
if (empty($this->path))
{
$this->path = '/';
} }
$instance[0]->ip = $_SERVER['REMOTE_ADDR']; $this->ip = $_SERVER['REMOTE_ADDR'];
$instance[0]->userAgent = !empty($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : ""; $this->userAgent = !empty($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
$instance[0]->_initSession(); $this->_initSession();
$instance[0]->_begin(); $this->_begin();
} parent::__construct();
return $instance[0];
} }
/** /**
@ -123,8 +126,7 @@ class CakeSession extends Object
*/ */
function checkSessionVar($name) function checkSessionVar($name)
{ {
$cakeSession = CakeSession::getInstance(); $expression = "return isset(".$this->_sessionVarNames($name).");";
$expression = "return isset(".$cakeSession->_sessionVarNames($name).");";
return eval($expression); return eval($expression);
} }
@ -136,14 +138,13 @@ class CakeSession extends Object
*/ */
function delSessionVar($name) function delSessionVar($name)
{ {
$cakeSession = CakeSession::getInstance(); if($this->checkSessionVar($name))
if($cakeSession->checkSessionVar($name))
{ {
$var = $cakeSession->_sessionVarNames($name); $var = $this->_sessionVarNames($name);
eval("unset($var);"); eval("unset($var);");
return true; return true;
} }
$cakeSession->_setError(2, "$name doesn't exist"); $this->_setError(2, "$name doesn't exist");
return false; return false;
} }
@ -155,14 +156,14 @@ class CakeSession extends Object
*/ */
function getError($errorNumber) function getError($errorNumber)
{ {
$cakeSession = CakeSession::getInstance();
if(!is_array($cakeSession->error) || !array_key_exists($errorNumber, $cakeSession->error)) if(!is_array($this->error) || !array_key_exists($errorNumber, $this->error))
{ {
return false; return false;
} }
else else
{ {
return $cakeSession->error[$errorNumber]; return $this->error[$errorNumber];
} }
} }
@ -173,10 +174,10 @@ class CakeSession extends Object
*/ */
function getLastError() function getLastError()
{ {
$cakeSession = CakeSession::getInstance();
if($cakeSession->lastError) if($this->lastError)
{ {
return $cakeSession->getError($cakeSession->lastError); return $this->getError($this->lastError);
} }
else else
{ {
@ -191,8 +192,8 @@ class CakeSession extends Object
*/ */
function isValid() function isValid()
{ {
$cakeSession = CakeSession::getInstance();
return $cakeSession->valid; return $this->valid;
} }
/** /**
@ -203,13 +204,13 @@ class CakeSession extends Object
*/ */
function readSessionVar($name) function readSessionVar($name)
{ {
$cakeSession = CakeSession::getInstance();
if($cakeSession->checkSessionVar($name)) if($this->checkSessionVar($name))
{ {
$result = eval("return ".$cakeSession->_sessionVarNames($name).";"); $result = eval("return ".$this->_sessionVarNames($name).";");
return $result; return $result;
} }
$cakeSession->_setError(2, "$name doesn't exist"); $this->_setError(2, "$name doesn't exist");
return false; return false;
} }
@ -221,8 +222,8 @@ class CakeSession extends Object
*/ */
function writeSessionVar($name, $value) function writeSessionVar($name, $value)
{ {
$cakeSession = CakeSession::getInstance();
$expression = $cakeSession->_sessionVarNames($name); $expression = $this->_sessionVarNames($name);
$expression .= " = \$value;"; $expression .= " = \$value;";
eval($expression); eval($expression);
} }
@ -234,10 +235,15 @@ class CakeSession extends Object
*/ */
function _begin() function _begin()
{ {
$cakeSession = CakeSession::getInstance();
if (function_exists('session_write_close'))
{
session_write_close();
}
session_cache_limiter("must-revalidate"); session_cache_limiter("must-revalidate");
session_start(); session_start();
$cakeSession->_new(); $this->_new();
} }
/** /**
@ -286,19 +292,19 @@ class CakeSession extends Object
*/ */
function _initSession() function _initSession()
{ {
$cakeSession = CakeSession::getInstance();
switch (CAKE_SECURITY) switch (CAKE_SECURITY)
{ {
case 'high': case 'high':
$cakeSession->cookieLifeTime = 0; $this->cookieLifeTime = 0;
ini_set('session.referer_check', $cakeSession->host); ini_set('session.referer_check', $this->host);
break; break;
case 'medium': case 'medium':
$cakeSession->cookieLifeTime = 7 * 86400; $this->cookieLifeTime = 7 * 86400;
break; break;
case 'low': case 'low':
default : default :
$cakeSession->cookieLifeTime = 788940000; $this->cookieLifeTime = 788940000;
break; break;
} }
@ -310,8 +316,8 @@ class CakeSession extends Object
ini_set('session.serialize_handler', 'php'); ini_set('session.serialize_handler', 'php');
ini_set('session.use_cookies', 1); ini_set('session.use_cookies', 1);
ini_set('session.name', CAKE_SESSION_COOKIE); ini_set('session.name', CAKE_SESSION_COOKIE);
ini_set('session.cookie_lifetime', $cakeSession->cookieLifeTime); ini_set('session.cookie_lifetime', $this->cookieLifeTime);
ini_set('session.cookie_path', $cakeSession->path); ini_set('session.cookie_path', $this->path);
ini_set('session.gc_probability', 1); ini_set('session.gc_probability', 1);
ini_set('session.gc_maxlifetime', Security::inactiveMins() * 60); ini_set('session.gc_maxlifetime', Security::inactiveMins() * 60);
ini_set('session.auto_start', 0); ini_set('session.auto_start', 0);
@ -324,8 +330,8 @@ class CakeSession extends Object
ini_set('session.serialize_handler', 'php'); ini_set('session.serialize_handler', 'php');
ini_set('session.use_cookies', 1); ini_set('session.use_cookies', 1);
ini_set('session.name', CAKE_SESSION_COOKIE); ini_set('session.name', CAKE_SESSION_COOKIE);
ini_set('session.cookie_lifetime', $cakeSession->cookieLifeTime); ini_set('session.cookie_lifetime', $this->cookieLifeTime);
ini_set('session.cookie_path', $cakeSession->path); ini_set('session.cookie_path', $this->path);
ini_set('session.gc_probability', 1); ini_set('session.gc_probability', 1);
ini_set('session.gc_maxlifetime', Security::inactiveMins() * 60); ini_set('session.gc_maxlifetime', Security::inactiveMins() * 60);
ini_set('session.auto_start', 0); ini_set('session.auto_start', 0);
@ -338,8 +344,8 @@ class CakeSession extends Object
break; break;
case 'php': case 'php':
ini_set('session.name', CAKE_SESSION_COOKIE); ini_set('session.name', CAKE_SESSION_COOKIE);
ini_set('session.cookie_lifetime', $cakeSession->cookieLifeTime); ini_set('session.cookie_lifetime', $this->cookieLifeTime);
ini_set('session.cookie_path', $cakeSession->path); ini_set('session.cookie_path', $this->path);
ini_set('session.gc_maxlifetime', Security::inactiveMins() * 60); ini_set('session.gc_maxlifetime', Security::inactiveMins() * 60);
break; break;
default : default :
@ -351,8 +357,8 @@ class CakeSession extends Object
else else
{ {
ini_set('session.name', CAKE_SESSION_COOKIE); ini_set('session.name', CAKE_SESSION_COOKIE);
ini_set('session.cookie_lifetime', $cakeSession->cookieLifeTime); ini_set('session.cookie_lifetime', $this->cookieLifeTime);
ini_set('session.cookie_path', $cakeSession->path); ini_set('session.cookie_path', $this->path);
ini_set('session.gc_maxlifetime', Security::inactiveMins() * 60); ini_set('session.gc_maxlifetime', Security::inactiveMins() * 60);
} }
break; break;
@ -368,45 +374,45 @@ class CakeSession extends Object
*/ */
function _new() function _new()
{ {
$cakeSession = CakeSession::getInstance();
if(!ereg("proxy\.aol\.com$", gethostbyaddr($cakeSession->ip))) if(!ereg("proxy\.aol\.com$", gethostbyaddr($this->ip)))
{ {
if($cakeSession->readSessionVar("Config")) if($this->readSessionVar("Config"))
{ {
if($cakeSession->ip == $cakeSession->readSessionVar("Config.ip") && $cakeSession->userAgent == $cakeSession->readSessionVar("Config.userAgent")) if($this->ip == $this->readSessionVar("Config.ip") && $this->userAgent == $this->readSessionVar("Config.userAgent"))
{ {
$cakeSession->valid = true; $this->valid = true;
} }
else else
{ {
$cakeSession->valid = false; $this->valid = false;
$cakeSession->_setError(1, "Session Highjacking Attempted !!!"); $this->_setError(1, "Session Highjacking Attempted !!!");
} }
} }
else else
{ {
srand((double)microtime() * 1000000); srand((double)microtime() * 1000000);
$cakeSession->writeSessionVar('Config.rand', rand()); $this->writeSessionVar('Config.rand', rand());
$cakeSession->writeSessionVar("Config.ip", $cakeSession->ip); $this->writeSessionVar("Config.ip", $this->ip);
$cakeSession->writeSessionVar("Config.userAgent", $cakeSession->userAgent); $this->writeSessionVar("Config.userAgent", $this->userAgent);
$cakeSession->valid = true; $this->valid = true;
} }
} }
else else
{ {
if(!$cakeSession->readSessionVar("Config")) if(!$this->readSessionVar("Config"))
{ {
srand((double)microtime() * 1000000); srand((double)microtime() * 1000000);
$cakeSession->writeSessionVar('Config.rand', rand()); $this->writeSessionVar('Config.rand', rand());
$cakeSession->writeSessionVar("Config.ip", $cakeSession->ip); $this->writeSessionVar("Config.ip", $this->ip);
$cakeSession->writeSessionVar("Config.userAgent", $cakeSession->userAgent); $this->writeSessionVar("Config.userAgent", $this->userAgent);
} }
$cakeSession->valid = true; $this->valid = true;
} }
if(CAKE_SECURITY == 'high') if(CAKE_SECURITY == 'high')
{ {
$cakeSession->_regenerateId(); $this->_regenerateId();
} }
header('P3P: CP="NOI ADM DEV PSAi COM NAV OUR OTRo STP IND DEM"'); header('P3P: CP="NOI ADM DEV PSAi COM NAV OUR OTRo STP IND DEM"');
} }
@ -449,7 +455,7 @@ class CakeSession extends Object
*/ */
function _regenerateId() function _regenerateId()
{ {
$cakeSession = CakeSession::getInstance();
$oldSessionId = session_id(); $oldSessionId = session_id();
session_regenerate_id(); session_regenerate_id();
$newSessid = session_id(); $newSessid = session_id();
@ -459,13 +465,13 @@ class CakeSession extends Object
{ {
if (isset($_COOKIE[session_name()])) if (isset($_COOKIE[session_name()]))
{ {
setcookie(CAKE_SESSION_COOKIE, '', time()-42000, $cakeSession->path); setcookie(CAKE_SESSION_COOKIE, '', time()-42000, $this->path);
} }
$file = ini_get('session.save_path')."/sess_$oldSessionId"; $file = ini_get('session.save_path')."/sess_$oldSessionId";
@unlink($file); @unlink($file);
} }
session_write_close(); session_write_close();
$cakeSession->_initSession(); $this->_initSession();
session_id($newSessid); session_id($newSessid);
session_start(); session_start();
} }
@ -479,7 +485,7 @@ class CakeSession extends Object
*/ */
function _renew() function _renew()
{ {
$cakeSession->_regenerateId(); $this->_regenerateId();
} }
/** /**
@ -491,7 +497,7 @@ class CakeSession extends Object
*/ */
function _sessionVarNames($name) function _sessionVarNames($name)
{ {
$cakeSession = CakeSession::getInstance();
if(is_string($name)) if(is_string($name))
{ {
if(strpos($name, ".")) if(strpos($name, "."))
@ -510,7 +516,7 @@ class CakeSession extends Object
} }
return $expression; return $expression;
} }
$cakeSession->setError(3, "$name is not a string"); $this->setError(3, "$name is not a string");
return false; return false;
} }
@ -523,14 +529,14 @@ class CakeSession extends Object
*/ */
function _setError($errorNumber, $errorMessage) function _setError($errorNumber, $errorMessage)
{ {
$cakeSession = CakeSession::getInstance();
if($cakeSession->error === false) if($this->error === false)
{ {
$cakeSession->error = array(); $this->error = array();
} }
$cakeSession->error[$errorNumber] = $errorMessage; $this->error[$errorNumber] = $errorMessage;
$cakeSession->lastError = $errorNumber; $this->lastError = $errorNumber;
} }
/** /**

11
cake/libs/view/helpers/ajax.php
View file

@ -185,7 +185,7 @@ class AjaxHelper extends Helper
if (isset($options['before'])) if (isset($options['before']))
{ {
$func = "{$options['before']}; $function"; $func = "{$options['before']}; $func";
} }
if (isset($options['after'])) if (isset($options['after']))
{ {
@ -231,11 +231,12 @@ class AjaxHelper extends Helper
* @param array $options Callback options * @param array $options Callback options
* @return string JavaScript code * @return string JavaScript code
*/ */
function form($id, $options = null) function form($id, $options = null, $html_options = array())
{ {
$options['id'] = $id; $html_options['id'] = $id;
//$options['html']['onsubmit'] = $this->remoteFunction($options) . "; return false;"; return $this->html->formTag(null, "post", $html_options) .
return $this->Html->formTag(null, "post", $options) . $this->Javascript->event("$('$id')", "submit", "function(){" . $this->remoteFunction($options) . "; return false;}"); $this->Javascript->event("$('$id')", "submit", "function(){" .
$this->remoteFunction($options) . "; return false;}");
} }
/** /**