Merge pull request #1617 from sjinks/view-superglobals

Do not allow to override superglobals in views

ext/config.m4

@@ -137,6 +137,7 @@ mvc/collectioninterface.c \
 mvc/view/engine/php.c \
 mvc/view/engine/volt/compiler.c \
 mvc/view/engine/volt.c \
+mvc/view/engine/helpers.c \
 mvc/view/exception.c \
 mvc/view/engineinterface.c \
 mvc/view/simple.c \

ext/config.w32

@@ -35,7 +35,7 @@ if (PHP_PHALCON != "no") {
   ADD_SOURCES("ext/phalcon/mvc/user", "component.c plugin.c module.c", "phalcon")
   ADD_SOURCES("ext/phalcon/mvc/router", "group.c route.c annotations.c exception.c routeinterface.c", "phalcon")
   ADD_SOURCES("ext/phalcon/mvc/url", "exception.c", "phalcon")
-  ADD_SOURCES("ext/phalcon/mvc/view/engine", "php.c volt.c", "phalcon")
+  ADD_SOURCES("ext/phalcon/mvc/view/engine", "php.c volt.c helpers.c", "phalcon")
   ADD_SOURCES("ext/phalcon/mvc/view", "exception.c engineinterface.c simple.c engine.c", "phalcon")
   ADD_SOURCES("ext/phalcon/mvc/model/metadata", "files.c apc.c xcache.c memory.c session.c", "phalcon")
   ADD_SOURCES("ext/phalcon/mvc/model/metadata/strategy", "introspection.c annotations.c", "phalcon")

ext/mvc/view/engine/helpers.c

@@ -0,0 +1,30 @@
+/*
+  +------------------------------------------------------------------------+
+  | Phalcon Framework                                                      |
+  +------------------------------------------------------------------------+
+  | Copyright (c) 2011-2013 Phalcon Team (http://www.phalconphp.com)       |
+  +------------------------------------------------------------------------+
+  | This source file is subject to the New BSD License that is bundled     |
+  | with this package in the file docs/LICENSE.txt.                        |
+  |                                                                        |
+  | If you did not receive a copy of the license and are unable to         |
+  | obtain it through the world-wide-web, please send an email             |
+  | to [email protected] so we can send you a copy immediately.       |
+  +------------------------------------------------------------------------+
+  | Authors: Andres Gutierrez <[email protected]>                      |
+  |          Eduar Carvajal <[email protected]>                         |
+  |          Vladimir Kolesnikov <[email protected]>              |
+  +------------------------------------------------------------------------+
+*/
+
+#include "mvc/view/engine/helpers.h"
+#include <Zend/zend_globals.h>
+
+zend_bool phalcon_mvc_view_engine_php_symtable_merger(HashTable *ht, void *pData, zend_hash_key *hash_key, void *pParam)
+{
+#ifdef ZTS
+	TSRMLS_FETCH_FROM_CTX(pParam);
+#endif
+
+	return hash_key->arKey && hash_key->nKeyLength && !zend_hash_quick_exists(CG(auto_globals), hash_key->arKey, hash_key->nKeyLength, hash_key->h);
+}

ext/mvc/view/engine/helpers.h

@@ -0,0 +1,27 @@
+/*
+  +------------------------------------------------------------------------+
+  | Phalcon Framework                                                      |
+  +------------------------------------------------------------------------+
+  | Copyright (c) 2011-2013 Phalcon Team (http://www.phalconphp.com)       |
+  +------------------------------------------------------------------------+
+  | This source file is subject to the New BSD License that is bundled     |
+  | with this package in the file docs/LICENSE.txt.                        |
+  |                                                                        |
+  | If you did not receive a copy of the license and are unable to         |
+  | obtain it through the world-wide-web, please send an email             |
+  | to [email protected] so we can send you a copy immediately.       |
+  +------------------------------------------------------------------------+
+  | Authors: Andres Gutierrez <[email protected]>                      |
+  |          Eduar Carvajal <[email protected]>                         |
+  |          Vladimir Kolesnikov <[email protected]>              |
+  +------------------------------------------------------------------------+
+*/
+
+#ifndef PHALCON_MVC_VIEW_ENGINE_HELPERS_H
+#define PHALCON_MVC_VIEW_ENGINE_HELPERS_H
+
+#include <Zend/zend.h>
+
+zend_bool phalcon_mvc_view_engine_php_symtable_merger(HashTable *ht, void *pData, zend_hash_key *hash_key, void *pParam);
+
+#endif /* PHALCON_MBC_VIEW_ENGINE_HELPERS_H */

ext/mvc/view/engine/php.c

@@ -39,6 +39,8 @@
 #include "kernel/require.h"
 #include "kernel/object.h"
 
+#include "mvc/view/engine/helpers.h"
+
 /**
  * Phalcon\Mvc\View\Engine\Php
  *
@@ -67,15 +69,10 @@ PHALCON_INIT_CLASS(Phalcon_Mvc_View_Engine_Php){
  */
 PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render){
 
-	zval *path, *params, *must_clean = NULL, *value = NULL, *key = NULL, *contents;
+	zval *path, *params, *must_clean = NULL, *contents;
 	zval *view;
-	HashTable *ah0;
-	HashPosition hp0;
-	zval **hd;
-
-	PHALCON_MM_GROW();
 
-	phalcon_fetch_params(1, 2, 1, &path, &params, &must_clean);
+	phalcon_fetch_params(0, 2, 1, &path, &params, &must_clean);
 
 	if (!must_clean) {
 		must_clean = PHALCON_GLOBAL(z_false);
@@ -89,38 +86,38 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render){
 	 * Create the variables in local symbol table
 	 */
 	if (Z_TYPE_P(params) == IS_ARRAY) { 
-
-		phalcon_is_iterable(params, &ah0, &hp0, 0, 0);
-
-		while (zend_hash_get_current_data_ex(ah0, (void**) &hd, &hp0) == SUCCESS) {
-
-			PHALCON_GET_HKEY(key, ah0, hp0);
-			PHALCON_GET_HVALUE(value);
-
-			if (phalcon_set_symbol(key, value TSRMLS_CC) == FAILURE){
-				return;
-			}
-
-			zend_hash_move_forward_ex(ah0, &hp0);
+		if (!EG(active_symbol_table)) {
+			zend_rebuild_symbol_table(TSRMLS_C);
 		}
-
+
+		zend_hash_merge_ex(
+			EG(active_symbol_table),
+			Z_ARRVAL_P(params),
+			(copy_ctor_func_t)zval_add_ref,
+			sizeof(zval*),
+			phalcon_mvc_view_engine_php_symtable_merger
+#ifdef ZTS
+			TSRMLS_CC
+#else
+			NULL
+#endif
+		);
 	}
 
 	/** 
 	 * Require the file
 	 */
 	if (phalcon_require(path TSRMLS_CC) == FAILURE) {
-		RETURN_MM();
+		RETURN_FALSE;
 	}
+
 	if (PHALCON_IS_TRUE(must_clean)) {
-		PHALCON_INIT_VAR(contents);
+		PHALCON_ALLOC_GHOST_ZVAL(contents);
 		phalcon_ob_get_contents(contents TSRMLS_CC);
 
-		PHALCON_OBS_VAR(view);
-		phalcon_read_property_this(&view, this_ptr, SL("_view"), PH_NOISY_CC);
-		phalcon_call_method_p1_noret(view, "setcontent", contents);
+		view = phalcon_fetch_nproperty_this(this_ptr, SL("_view"), PH_NOISY_CC);
+		phalcon_call_method_params(NULL, NULL, view, SL("setcontent"), zend_inline_hash_func(SS("setcontent")) TSRMLS_CC, 1, contents);
 	}
-
-	PHALCON_MM_RESTORE();
-}
 
+	RETURN_TRUE;
+}

ext/mvc/view/engine/volt.c

@@ -42,6 +42,8 @@
 #include "kernel/string.h"
 #include "kernel/array.h"
 
+#include "mvc/view/engine/helpers.h"
+
 /**
  * Phalcon\Mvc\View\Engine\Volt
  *
@@ -152,11 +154,8 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, getCompiler){
 PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render){
 
 	zval *template_path, *params, *must_clean = NULL, *compiler;
-	zval *compiled_template_path, *value = NULL, *key = NULL, *contents;
+	zval *compiled_template_path, *contents;
 	zval *view;
-	HashTable *ah0;
-	HashPosition hp0;
-	zval **hd;
 
 	PHALCON_MM_GROW();
 
@@ -181,38 +180,40 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render){
 	phalcon_call_method(compiled_template_path, compiler, "getcompiledtemplatepath");
 
 	/** 
-	 * Export the variables the current symbol table
+	 * Export the variables into the current symbol table
 	 */
 	if (Z_TYPE_P(params) == IS_ARRAY) { 
-
-		phalcon_is_iterable(params, &ah0, &hp0, 0, 0);
-
-		while (zend_hash_get_current_data_ex(ah0, (void**) &hd, &hp0) == SUCCESS) {
-
-			PHALCON_GET_HKEY(key, ah0, hp0);
-			PHALCON_GET_HVALUE(value);
-
-			if (phalcon_set_symbol(key, value TSRMLS_CC) == FAILURE){
-				return;
-			}
-
-			zend_hash_move_forward_ex(ah0, &hp0);
+		if (!EG(active_symbol_table)) {
+			zend_rebuild_symbol_table(TSRMLS_C);
 		}
-
+
+		zend_hash_merge_ex(
+			EG(active_symbol_table),
+			Z_ARRVAL_P(params),
+			(copy_ctor_func_t)zval_add_ref,
+			sizeof(zval*),
+			phalcon_mvc_view_engine_php_symtable_merger
+#ifdef ZTS
+			TSRMLS_CC
+#else
+			NULL
+#endif
+		);
 	}
 
 	if (phalcon_require(compiled_template_path TSRMLS_CC) == FAILURE) {
+		RETVAL_FALSE;
 		RETURN_MM();
 	}
 	if (PHALCON_IS_TRUE(must_clean)) {
 		PHALCON_INIT_VAR(contents);
 		phalcon_ob_get_contents(contents TSRMLS_CC);
 
-		PHALCON_OBS_VAR(view);
-		phalcon_read_property_this(&view, this_ptr, SL("_view"), PH_NOISY_CC);
+		view = phalcon_fetch_nproperty_this(this_ptr, SL("_view"), PH_NOISY_CC);
 		phalcon_call_method_p1_noret(view, "setcontent", contents);
 	}
 
+	RETVAL_TRUE;
 	PHALCON_MM_RESTORE();
 }
 
@@ -224,32 +225,19 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render){
  */
 PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, length){
 
-	zval *item, *length = NULL;
-
-	PHALCON_MM_GROW();
+	zval *item;
 
-	phalcon_fetch_params(1, 1, 0, &item);
+	phalcon_fetch_params(0, 1, 0, &item);
 
-	PHALCON_INIT_VAR(length);
-	ZVAL_LONG(length, 0);
-	if (Z_TYPE_P(item) == IS_OBJECT) {
-		phalcon_fast_count(length, item TSRMLS_CC);
+	if (Z_TYPE_P(item) == IS_OBJECT || Z_TYPE_P(item) == IS_ARRAY) {
+		phalcon_fast_count(return_value, item TSRMLS_CC);
+	} else if (phalcon_function_exists_ex(SS("mb_strlen") TSRMLS_CC) == SUCCESS) {
+		PHALCON_MM_GROW();
+		phalcon_call_func_p1(return_value, "mb_strlen", item);
+		PHALCON_MM_RESTORE();
 	} else {
-		if (Z_TYPE_P(item) == IS_ARRAY) { 
-			PHALCON_INIT_NVAR(length);
-			phalcon_fast_count(length, item TSRMLS_CC);
-		} else {
-			if (phalcon_function_exists_ex(SS("mb_strlen") TSRMLS_CC) == SUCCESS) {
-				PHALCON_INIT_NVAR(length);
-				phalcon_call_func_p1(length, "mb_strlen", item);
-			} else {
-				PHALCON_INIT_NVAR(length);
-				phalcon_fast_strlen(length, item);
-			}
-		}
+		phalcon_fast_strlen(return_value, item);
 	}
-
-	RETURN_CCTOR(length);
 }
 
 /**
@@ -263,25 +251,23 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, isIncluded){
 
 	zval *needle, *haystack;
 
-	PHALCON_MM_GROW();
-
-	phalcon_fetch_params(1, 2, 0, &needle, &haystack);
+	phalcon_fetch_params(0, 2, 0, &needle, &haystack);
 
 	if (Z_TYPE_P(haystack) == IS_ARRAY) { 
-		RETVAL_BOOL(phalcon_fast_in_array(needle, haystack TSRMLS_CC));
-		RETURN_MM();
+		RETURN_BOOL(phalcon_fast_in_array(needle, haystack TSRMLS_CC));
 	}
+
 	if (Z_TYPE_P(haystack) == IS_STRING) {
 		if (phalcon_function_exists_ex(SS("mb_strpos") TSRMLS_CC) == SUCCESS) {
+			PHALCON_MM_GROW();
 			phalcon_call_func_p2(return_value, "mb_strpos", haystack, needle);
 			RETURN_MM();
 		}
+
 		phalcon_fast_strpos(return_value, haystack, needle);
-		RETURN_MM();
 	}
 
-	PHALCON_THROW_EXCEPTION_STR(phalcon_mvc_view_exception_ce, "Invalid haystack");
-	return;
+	PHALCON_THROW_EXCEPTION_STRW(phalcon_mvc_view_exception_ce, "Invalid haystack");
 }
 
 /**

ext/tests/issue-1617.phpt

@@ -0,0 +1,33 @@
+--TEST--
+Do not allow to override superglobals in views - https://github.com/phalcon/cphalcon/pull/1617
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--FILE--
+<?php
+$di     = new \Phalcon\DI\FactoryDefault();
+$view   = new \Phalcon\Mvc\View();
+$engine = new \Phalcon\Mvc\View\Engine\Php($view, $di);
+
+foreach (array('_GET', '_POST', '_COOKIE', 'GLOBALS') as $v) {
+	$view->setVar($v, strtolower($v));
+}
+
+var_dump($view->getParamsToView());
+var_dump($engine->render(__DIR__ . '/views/superglobals.phtml', $view->getParamsToView(), false));
+?>
+--EXPECT--
+array(4) {
+  ["_GET"]=>
+  string(4) "_get"
+  ["_POST"]=>
+  string(5) "_post"
+  ["_COOKIE"]=>
+  string(7) "_cookie"
+  ["GLOBALS"]=>
+  string(7) "globals"
+}
+array
+array
+array
+array
+bool(true)

ext/tests/views/superglobals.phtml

@@ -0,0 +1,5 @@
+<?php
+echo gettype($_GET), PHP_EOL;
+echo gettype($_POST), PHP_EOL;
+echo gettype($_COOKIE), PHP_EOL;
+echo gettype($GLOBALS), PHP_EOL;