Move csrf_verify() call out of CI_Input

8 files changed, 34 insertions, 58 deletions

diff --git a/tests/codeigniter/core/Input_test.php b/tests/codeigniter/core/Input_test.php
index 78b659691..e068a84be 100644
--- a/tests/codeigniter/core/Input_test.php
+++ b/tests/codeigniter/core/Input_test.php
@@ -12,10 +12,8 @@ class Input_test extends CI_TestCase {
 		$this->ci_set_config('global_xss_filtering', FALSE);
 		$this->ci_set_config('csrf_protection', FALSE);
 
-		$security = new Mock_Core_Security();
-
-		$this->ci_set_config('charset', 'UTF-8');
-		$this->input = new Mock_Core_Input($security);
+		$security = new Mock_Core_Security('UTF-8');
+		$this->input = new CI_Input($security);
 	}
 
 	// --------------------------------------------------------------------
@@ -120,14 +118,17 @@ class Input_test extends CI_TestCase {
 
 	public function test_fetch_from_array()
 	{
+		$reflection = new ReflectionMethod($this->input, '_fetch_from_array');
+		$reflection->setAccessible(TRUE);
+
 		$data = array(
 			'foo' => 'bar',
 			'harm' => 'Hello, i try to <script>alert(\'Hack\');</script> your site',
 		);
 
-		$foo = $this->input->fetch_from_array($data, 'foo');
-		$harm = $this->input->fetch_from_array($data, 'harm');
-		$harmless = $this->input->fetch_from_array($data, 'harm', TRUE);
+		$foo      = $reflection->invokeArgs($this->input, [&$data, 'foo']);
+		$harm     = $reflection->invokeArgs($this->input, [&$data, 'harm']);
+		$harmless = $reflection->invokeArgs($this->input, [&$data, 'harm', TRUE]);
 
 		$this->assertEquals('bar', $foo);
 		$this->assertEquals("Hello, i try to <script>alert('Hack');</script> your site", $harm);
@@ -215,57 +216,60 @@ class Input_test extends CI_TestCase {
 
 	public function test_ip_address()
 	{
-		$this->input->ip_address = '127.0.0.1';
+		$reflection = new ReflectionProperty($this->input, 'ip_address');
+		$reflection->setAccessible(TRUE);
+
+		$reflection->setValue($this->input, '127.0.0.1');
 		$this->assertEquals('127.0.0.1', $this->input->ip_address());
 
 		// 127.0.0.1 is set in our Bootstrap file
-		$this->input->ip_address = FALSE;
+		$reflection->setValue($this->input, FALSE);
 		$this->assertEquals('127.0.0.1', $this->input->ip_address());
 
 		// Invalid
 		$_SERVER['REMOTE_ADDR'] = 'invalid_ip_address';
-		$this->input->ip_address = FALSE; // reset cached value
+		$reflection->setValue($this->input, FALSE); // reset cached value
 		$this->assertEquals('0.0.0.0', $this->input->ip_address());
 
 		$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
 
 		// Proxy_ips tests
-		$this->input->ip_address = FALSE;
+		$reflection->setValue($this->input, FALSE);
 		$this->ci_set_config('proxy_ips', '127.0.0.3, 127.0.0.4, 127.0.0.2');
 		$_SERVER['HTTP_CLIENT_IP'] = '127.0.0.2';
 		$this->assertEquals('127.0.0.1', $this->input->ip_address());
 
 		// Invalid spoof
-		$this->input->ip_address = FALSE;
+		$reflection->setValue($this->input, FALSE);
 		$this->ci_set_config('proxy_ips', 'invalid_ip_address');
 		$_SERVER['HTTP_CLIENT_IP'] = 'invalid_ip_address';
 		$this->assertEquals('127.0.0.1', $this->input->ip_address());
 
-		$this->input->ip_address = FALSE;
+		$reflection->setValue($this->input, FALSE);
 		$this->ci_set_config('proxy_ips', 'http://foo/bar/baz, 127.0.0.1/1');
 		$_SERVER['HTTP_CLIENT_IP'] = '127.0.0.1';
 		$this->assertEquals('127.0.0.1', $this->input->ip_address());
 
-		$this->input->ip_address = FALSE;
+		$reflection->setValue($this->input, FALSE);
 		$this->ci_set_config('proxy_ips', 'http://foo/bar/baz, 127.0.0.2');
 		$_SERVER['HTTP_CLIENT_IP'] = '127.0.0.2';
 		$_SERVER['REMOTE_ADDR'] = '127.0.0.2';
 		$this->assertEquals('127.0.0.2', $this->input->ip_address());
 
-		//IPv6
-		$this->input->ip_address = FALSE;
+		// IPv6
+		$reflection->setValue($this->input, FALSE);
 		$this->ci_set_config('proxy_ips', 'FE80:0000:0000:0000:0202:B3FF:FE1E:8329/1, FE80:0000:0000:0000:0202:B3FF:FE1E:8300/2');
 		$_SERVER['HTTP_CLIENT_IP'] = 'FE80:0000:0000:0000:0202:B3FF:FE1E:8300';
 		$_SERVER['REMOTE_ADDR'] = 'FE80:0000:0000:0000:0202:B3FF:FE1E:8329';
 		$this->assertEquals('FE80:0000:0000:0000:0202:B3FF:FE1E:8300', $this->input->ip_address());
 
-		$this->input->ip_address = FALSE;
+		$reflection->setValue($this->input, FALSE);
 		$this->ci_set_config('proxy_ips', '0::/32');
 		$_SERVER['HTTP_CLIENT_IP'] = '127.0.0.7';
 		$_SERVER['REMOTE_ADDR'] = '0000:0000:0000:0000:0000:0000:0000:0001';
 		$this->assertEquals('127.0.0.7', $this->input->ip_address());
 
-		$this->input->ip_address = FALSE;
+		$reflection->setValue($this->input, FALSE);
 		$_SERVER['REMOTE_ADDR'] = '127.0.0.1'; // back to reality
 	}
 
diff --git a/tests/codeigniter/core/Security_test.php b/tests/codeigniter/core/Security_test.php
index cbf0285ec..2e1127f87 100644
--- a/tests/codeigniter/core/Security_test.php
+++ b/tests/codeigniter/core/Security_test.php
@@ -12,7 +12,8 @@ class Security_test extends CI_TestCase {
 		$this->ci_set_config('csrf_token_name', 'ci_csrf_token');
 		$this->ci_set_config('csrf_cookie_name', 'ci_csrf_cookie');
 
-		$this->security = new Mock_Core_Security();
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		$this->security = new Mock_Core_Security('UTF-8');
 	}
 
 	// --------------------------------------------------------------------
@@ -341,7 +342,7 @@ class Security_test extends CI_TestCase {
 		// leave csrf_cookie_name as blank to test _csrf_set_hash function
 		$this->ci_set_config('csrf_cookie_name', '');
 
-		$this->security = new Mock_Core_Security();
+		$this->security = new Mock_Core_Security('UTF-8');
 
 		$this->assertNotEmpty($this->security->get_csrf_hash());
 	}
diff --git a/tests/codeigniter/helpers/cookie_helper_test.php b/tests/codeigniter/helpers/cookie_helper_test.php
index 1fbb57f67..e984be21c 100644
--- a/tests/codeigniter/helpers/cookie_helper_test.php
+++ b/tests/codeigniter/helpers/cookie_helper_test.php
@@ -28,9 +28,9 @@ class Cookie_helper_test extends CI_TestCase {
 	{
 		$_COOKIE['foo'] = 'bar';
 
-		$security = new Mock_Core_Security();
+		$security = new Mock_Core_Security('UTF-8');
 		$input_cls = $this->ci_core_class('input');
-		$this->ci_instance_var('input', new Mock_Core_Input($security));
+		$this->ci_instance_var('input', new CI_Input($security));
 
 		$this->assertEquals('bar', get_cookie('foo', FALSE));
 		$this->assertEquals('bar', get_cookie('foo', TRUE));
diff --git a/tests/codeigniter/helpers/security_helper_test.php b/tests/codeigniter/helpers/security_helper_test.php
index ab05d57ba..d7e3f4734 100644
--- a/tests/codeigniter/helpers/security_helper_test.php
+++ b/tests/codeigniter/helpers/security_helper_test.php
@@ -6,7 +6,7 @@ class Security_helper_tests extends CI_TestCase {
 	{
 		$this->helper('security');
 		$obj = new stdClass;
-		$obj->security = new Mock_Core_Security();
+		$obj->security = new Mock_Core_Security('UTF-8');
 		$this->ci_instance($obj);
 	}
 
diff --git a/tests/codeigniter/libraries/Form_validation_test.php b/tests/codeigniter/libraries/Form_validation_test.php
index 5b7830dd8..edbe9da4a 100644
--- a/tests/codeigniter/libraries/Form_validation_test.php
+++ b/tests/codeigniter/libraries/Form_validation_test.php
@@ -13,8 +13,8 @@ class Form_validation_test extends CI_TestCase {
 		// Same applies for lang
 		$lang = $this->getMockBuilder('CI_Lang')->setMethods(array('load'))->getMock();
 
-		$security = new Mock_Core_Security();
-		$input = new Mock_Core_Input($security);
+		$security = new Mock_Core_Security('UTF-8');
+		$input = new CI_Input($security);
 
 		$this->ci_instance_var('lang', $lang);
 		$this->ci_instance_var('load', $loader);
diff --git a/tests/codeigniter/libraries/Session_test.php b/tests/codeigniter/libraries/Session_test.php
index 76a4fcc98..840df076a 100644
--- a/tests/codeigniter/libraries/Session_test.php
+++ b/tests/codeigniter/libraries/Session_test.php
@@ -37,7 +37,8 @@ return;
 		$ci = $this->ci_instance();
 		$ldr = $this->ci_core_class('load');
 		$ci->load = new $ldr();
-		$ci->input = new Mock_Core_Input(NULL, NULL);
+		$security = new Mock_Core_Security('UTF-8');
+		$ci->input = new CI_Input($security);
 
 		// Make sure string helper is available
 		$this->ci_vfs_clone('system/helpers/string_helper.php');
@@ -437,4 +438,4 @@ return;
 		$this->assertNull($this->session->native->userdata($key));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/libraries/Upload_test.php b/tests/codeigniter/libraries/Upload_test.php
index 8bac597b3..74a7d2c22 100644
--- a/tests/codeigniter/libraries/Upload_test.php
+++ b/tests/codeigniter/libraries/Upload_test.php
@@ -6,7 +6,7 @@ class Upload_test extends CI_TestCase {
 	{
 		$ci = $this->ci_instance();
 		$ci->upload = new CI_Upload();
-		$ci->security = new Mock_Core_Security();
+		$ci->security = new Mock_Core_Security('UTF-8');
 		$ci->lang = $this->getMockBuilder('CI_Lang')->setMethods(array('load', 'line'))->getMock();
 		$ci->lang->expects($this->any())->method('line')->will($this->returnValue(FALSE));
 		$this->upload = $ci->upload;
diff --git a/tests/mocks/core/input.php b/tests/mocks/core/input.php
deleted file mode 100644
index 6f6a91365..000000000
--- a/tests/mocks/core/input.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-class Mock_Core_Input extends CI_Input {
-
-	/**
-	 * Since we use GLOBAL to fetch Security and Utf8 classes,
-	 * we need to use inversion of control to mock up
-	 * the same process within CI_Input class constructor.
-	 *
-	 * @covers CI_Input::__construct()
-	 */
-	public function __construct($security)
-	{
-		$this->_enable_csrf = (config_item('csrf_protection') === TRUE);
-		$this->security     = $security;
-	}
-
-	public function fetch_from_array($array, $index = '', $xss_clean = FALSE)
-	{
-		return parent::_fetch_from_array($array, $index, $xss_clean);
-	}
-
-	public function __set($name, $value)
-	{
-		if ($name === 'ip_address')
-		{
-			$this->ip_address = $value;
-		}
-	}
-}