From 32f383205e00c99b47e2812ead78fd37eb94360c Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Tue, 2 Aug 2011 21:05:20 -0500
Subject: [PATCH] restructured session driver interfaces and added cookie
 session driver.

---
 application/config/session.php |  2 +-
 system/session.php             |  8 +++--
 system/session/apc.php         | 11 -------
 system/session/cookie.php      | 54 ++++++++++++++++++++++++++++++++++
 system/session/db.php          |  2 +-
 system/session/driver.php      |  8 -----
 system/session/file.php        |  2 +-
 system/session/memcached.php   | 11 -------
 system/session/sweeper.php     | 13 ++++++++
 9 files changed, 76 insertions(+), 35 deletions(-)
 create mode 100644 system/session/cookie.php
 create mode 100644 system/session/sweeper.php

diff --git a/application/config/session.php b/application/config/session.php
index 2da93353..12ccb6ff 100644
--- a/application/config/session.php
+++ b/application/config/session.php
@@ -12,7 +12,7 @@
 	| Since HTTP is stateless, sessions are used to maintain "state" across
 	| multiple requests from the same user of your application.
 	|
-	| Supported Drivers: 'file', 'db', 'memcached', 'apc'.
+	| Supported Drivers: 'cookie', 'file', 'db', 'memcached', 'apc'.
 	|
 	*/
 
diff --git a/system/session.php b/system/session.php
index 63000e35..c57d6d97 100644
--- a/system/session.php
+++ b/system/session.php
@@ -27,6 +27,10 @@ public static function driver()
 		{
 			switch (Config::get('session.driver'))
 			{
+				case 'cookie':
+					static::$driver = new Session\Cookie;
+					break;
+
 				case 'file':
 					static::$driver = new Session\File;
 					break;
@@ -203,8 +207,8 @@ public static function close()
 			Cookie::put('laravel_session', static::$session['id'], $minutes, $config['path'], $config['domain'], $config['https'], $config['http_only']);
 		}
 
-		// 2% chance of performing session garbage collection...
-		if (mt_rand(1, 100) <= 2)
+		// 2% chance of performing session garbage collection on any given request...
+		if (mt_rand(1, 100) <= 2 and static::driver() instanceof Session\Sweeper)
 		{
 			static::driver()->sweep(time() - ($config['lifetime'] * 60));
 		}
diff --git a/system/session/apc.php b/system/session/apc.php
index 3716b5e4..7b236ba9 100644
--- a/system/session/apc.php
+++ b/system/session/apc.php
@@ -37,15 +37,4 @@ public function delete($id)
 		Cache::driver('apc')->forget($id);
 	}
 
-	/**
-	 * Delete all expired sessions.
-	 *
-	 * @param  int   $expiration
-	 * @return void
-	 */
-	public function sweep($expiration)
-	{
-		// APC sessions will expire automatically.
-	}
-
 }
\ No newline at end of file
diff --git a/system/session/cookie.php b/system/session/cookie.php
new file mode 100644
index 00000000..477b1f1f
--- /dev/null
+++ b/system/session/cookie.php
@@ -0,0 +1,54 @@
+<?php namespace System\Session;
+
+use System\Crypt;
+use System\Config;
+
+class Cookie implements Driver {
+
+	public function __construct()
+	{
+		if (Config::get('application.key') == '')
+		{
+			throw new \Exception("You must set an application key before using the Cookie session driver.");
+		}
+	}
+
+	/**
+	 * Load a session by ID.
+	 *
+	 * @param  string  $id
+	 * @return array
+	 */
+	public function load($id)
+	{
+		if (\System\Cookie::has('session_payload'))
+		{
+			return unserialize(Crypt::decrypt(\System\Cookie::get('session_payload')));
+		}
+	}
+
+	/**
+	 * Save a session.
+	 *
+	 * @param  array  $session
+	 * @return void
+	 */
+	public function save($session)
+	{
+		$c = \System\Config::get('session');
+
+		\System\Cookie::put('session_payload', Crypt::encrypt(serialize($session)), $c['lifetime'], $c['path'], $c['domain'], $c['https'], $c['http_only']);
+	}
+
+	/**
+	 * Delete a session by ID.
+	 *
+	 * @param  string  $id
+	 * @return void
+	 */
+	public function delete($id)
+	{
+		\System\Cookie::forget('session_payload');
+	}
+
+}
\ No newline at end of file
diff --git a/system/session/db.php b/system/session/db.php
index 2bca957d..34ba65df 100644
--- a/system/session/db.php
+++ b/system/session/db.php
@@ -3,7 +3,7 @@
 use System\Config;
 use System\DB\Manager;
 
-class DB implements Driver {
+class DB implements Driver, Sweeper {
 
 	/**
 	 * Load a session by ID.
diff --git a/system/session/driver.php b/system/session/driver.php
index ebf2ab4e..0514420a 100644
--- a/system/session/driver.php
+++ b/system/session/driver.php
@@ -26,12 +26,4 @@ public function save($session);
 	 */
 	public function delete($id);
 
-	/**
-	 * Delete all expired sessions.
-	 *
-	 * @param  int   $expiration
-	 * @return void
-	 */
-	public function sweep($expiration);
-
 }
\ No newline at end of file
diff --git a/system/session/file.php b/system/session/file.php
index 59606359..df268569 100644
--- a/system/session/file.php
+++ b/system/session/file.php
@@ -1,6 +1,6 @@
 <?php namespace System\Session;
 
-class File implements Driver {
+class File implements Driver, Sweeper {
 
 	/**
 	 * Load a session by ID.
diff --git a/system/session/memcached.php b/system/session/memcached.php
index ec4214e3..1071326f 100644
--- a/system/session/memcached.php
+++ b/system/session/memcached.php
@@ -38,15 +38,4 @@ public function delete($id)
 		Cache::driver('memcached')->forget($id);
 	}
 
-	/**
-	 * Delete all expired sessions.
-	 *
-	 * @param  int   $expiration
-	 * @return void
-	 */
-	public function sweep($expiration)
-	{
-		// Memcached sessions will expire automatically.
-	}
-
 }
\ No newline at end of file
diff --git a/system/session/sweeper.php b/system/session/sweeper.php
new file mode 100644
index 00000000..187ac414
--- /dev/null
+++ b/system/session/sweeper.php
@@ -0,0 +1,13 @@
+<?php namespace System\Session;
+
+interface Sweeper {
+
+	/**
+	 * Delete all expired sessions.
+	 *
+	 * @param  int   $expiration
+	 * @return void
+	 */
+	public function sweep($expiration);
+
+}
\ No newline at end of file