From 4f78065c14e73f2ec71e4f51e9896e3ab27e075f Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Wed, 11 Apr 2007 20:47:17 +0000
Subject: [PATCH] Adding fix for Ticket #2387 Fixed issue in view with
 $session->valid() always returning false.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4839 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/session.php | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/cake/libs/session.php b/cake/libs/session.php
index 661e15167..ed12a86cf 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -122,6 +122,13 @@ class CakeSession extends Object {
  * @access public
  */
 	function __construct($base = null, $start = true) {
+		if (env('HTTP_USER_AGENT') != null) {
+			$this->_userAgent = md5(env('HTTP_USER_AGENT') . CAKE_SESSION_STRING);
+		} else {
+				$this->_userAgent = "";
+		}
+		$this->time = time();
+
 		if($start === true) {
 			$this->host = env('HTTP_HOST');
 
@@ -135,13 +142,6 @@ class CakeSession extends Object {
 				$this->host = substr($this->host, 0, strpos($this->host, ':'));
 			}
 
-			if (env('HTTP_USER_AGENT') != null) {
-				$this->_userAgent = md5(env('HTTP_USER_AGENT') . CAKE_SESSION_STRING);
-			} else {
-				$this->_userAgent = "";
-			}
-
-			$this->time = time();
 			$this->sessionTime = $this->time + (Security::inactiveMins() * CAKE_SESSION_TIMEOUT);
 			$this->security = CAKE_SECURITY;
 
@@ -264,6 +264,14 @@ class CakeSession extends Object {
  * @access public
  */
 	function valid() {
+		if ($this->read('Config')) {
+			if ($this->_userAgent == $this->read("Config.userAgent") && $this->time <= $this->read("Config.time")) {
+				$this->valid = true;
+			} else {
+				$this->valid = false;
+				$this->__setError(1, "Session Highjacking Attempted !!!");
+			}
+		}
 		return $this->valid;
 	}
 /**
@@ -362,7 +370,7 @@ class CakeSession extends Object {
 	function __close() {
 		$probability = mt_rand(1, 150);
 		if($probability <= 3) {
-			$this->__gc();
+			CakeSession::__gc();
 		}
 		return true;
 	}