smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 02:44:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

removed merging of $smarty->template_dir into $smarty->secure_dir

Browse Source 
the resource_base_path is considerd secure instead. this change should
have absolutely no impact on smarty's security's behaviour
This commit is contained in:
messju
2004-03-18 19:36:36 +00:00
parent c9a4753f02
commit 840b968bab
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libs/core/core.is_secure.php
View File

@@ -17,41 +17,42 @@
function smarty_core_is_secure($params, &$smarty) function smarty_core_is_secure($params, &$smarty)
{ {
static $check_template_dir = true;
if (!$smarty->security || $smarty->security_settings['INCLUDE_ANY']) { if (!$smarty->security || $smarty->security_settings['INCLUDE_ANY']) {
return true; return true;
} }
$_smarty_secure = false;
if ($params['resource_type'] == 'file') { if ($params['resource_type'] == 'file') {
if($check_template_dir) { $_rp = realpath($params['resource_name']);
if (!in_array($smarty->template_dir, $smarty->secure_dir)) if (isset($params['resource_base_path'])) {
// add template_dir to secure_dir array foreach ((array)$params['resource_base_path'] as $curr_dir) {
array_unshift($smarty->secure_dir, $smarty->template_dir); if ( !empty($curr_dir) && is_readable ($curr_dir)) {
$check_template_dir = false; $_cd = realpath($curr_dir);
if (strncmp($_rp, $_cd, strlen($_cd)) == 0
&& $_rp{strlen($_cd)} == DIRECTORY_SEPARATOR ) {
return true;
}
}
}
} }
if (!empty($smarty->secure_dir)) { if (!empty($smarty->secure_dir)) {
$_rp = realpath($params['resource_name']);
foreach ((array)$smarty->secure_dir as $curr_dir) { foreach ((array)$smarty->secure_dir as $curr_dir) {
if ( !empty($curr_dir) && is_readable ($curr_dir)) { if ( !empty($curr_dir) && is_readable ($curr_dir)) {
$_cd = realpath($curr_dir); $_cd = realpath($curr_dir);
if (strncmp($_rp, $_cd, strlen($_cd)) == 0 if (strncmp($_rp, $_cd, strlen($_cd)) == 0
&& $_rp{strlen($_cd)} == DIRECTORY_SEPARATOR ) { && $_rp{strlen($_cd)} == DIRECTORY_SEPARATOR ) {
$_smarty_secure = true; return true;
break;
} }
} }
} }
} }
} else { } else {
// resource is not on local file system // resource is not on local file system
$_smarty_secure = call_user_func_array( return call_user_func_array(
$smarty->_plugins['resource'][$params['resource_type']][0][2], $smarty->_plugins['resource'][$params['resource_type']][0][2],
array($params['resource_name'], &$smarty)); array($params['resource_name'], &$smarty));
} }
return $_smarty_secure; return false;
} }
/* vim: set expandtab: */ /* vim: set expandtab: */