[feature/request-class] Add is_secure method to request for HTTPS

igorw · igorw · commit a48889fed83b · 2011-08-18T22:26:30.000+02:00
PHPBB3-9716
diff --git a/phpBB/includes/request/interface.php b/phpBB/includes/request/interface.php
@@ -121,6 +121,13 @@ public function is_set($var, $super_global = phpbb_request_interface::REQUEST);
 	*/
 	public function is_ajax();
 
+	/**
+	* Checks if the current request is happening over HTTPS.
+	*
+	* @return	bool			True if the request is secure.
+	*/
+	public function is_secure();
+
 	/**
 	* Returns all variable names for a given super global
 	*
diff --git a/phpBB/includes/request/request.php b/phpBB/includes/request/request.php
@@ -326,6 +326,16 @@ public function is_ajax()
 		return $this->header('X-Requested-With') == 'XMLHttpRequest';
 	}
 
+	/**
+	* Checks if the current request is happening over HTTPS.
+	*
+	* @return	bool			True if the request is secure.
+	*/
+	public function is_secure()
+	{
+		return $this->server('HTTPS') == 'on';
+	}
+
 	/**
 	* Returns all variable names for a given super global
 	*
diff --git a/tests/mock/request.php b/tests/mock/request.php
@@ -57,6 +57,11 @@ public function is_ajax()
 		return false;
 	}
 
+	public function is_secure()
+	{
+		return false;
+	}
+
 	public function variable_names($super_global = phpbb_request_interface::REQUEST)
 	{
 		return array_keys($this->data[$super_global]);
diff --git a/tests/request/request_test.php b/tests/request/request_test.php
@@ -117,6 +117,17 @@ public function test_is_ajax_with_ajax()
 		$this->assertTrue($this->request->is_ajax());
 	}
 
+	public function test_is_secure()
+	{
+		$this->assertFalse($this->request->is_secure());
+
+		$this->request->enable_super_globals();
+		$_SERVER['HTTPS'] = 'on';
+		$this->request = new phpbb_request($this->type_cast_helper);
+
+		$this->assertTrue($this->request->is_secure());
+	}
+
 	public function test_variable_names()
 	{
 		$expected = array('test', 'unset');

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,11 @@ public function is_ajax()`
`57`	`57`	`return false;`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ public function is_secure()`
	`61`	`+ {`
	`62`	`+ return false;`
	`63`	`+ }`
	`64`	`+`
`60`	`65`	`public function variable_names($super_global = phpbb_request_interface::REQUEST)`
`61`	`66`	`{`
`62`	`67`	`return array_keys($this->data[$super_global]);`