mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Exclude git directories from path traversal

Browse Source
This commit is contained in:
Matthias Gutjahr
2014-04-25 10:39:47 +02:00
parent 041994aa58
commit dfd0261cda
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/functions_images.inc.php
View File

@ -1810,7 +1810,7 @@ function serendipity_traversePath($basedir, $dir='', $onlyDirs = true, $pattern
if ($aExcludeDirs === null) { if ($aExcludeDirs === null) {
// add _vti_cnf to exclude possible added servers frontpage extensions // add _vti_cnf to exclude possible added servers frontpage extensions
// add ckeditor/kcfinders .thumb dir to exclude, since no hook // add ckeditor/kcfinders .thumb dir to exclude, since no hook
$aExcludeDirs = array("CVS" => true, ".svn" => true, ".thumbs" => true, "_vti_cnf" => true); $aExcludeDirs = array("CVS" => true, ".svn" => true, ".thumbs" => true, "_vti_cnf" => true, ".git" => true);
} }
$odir = serendipity_dirSlash('end', $basedir) . serendipity_dirSlash('end', $dir); $odir = serendipity_dirSlash('end', $basedir) . serendipity_dirSlash('end', $dir);
@ -1828,6 +1828,9 @@ function serendipity_traversePath($basedir, $dir='', $onlyDirs = true, $pattern
if ($onlyDirs === false || $bIsDir) { if ($onlyDirs === false || $bIsDir) {
if ($bPatternMatch && if ($bPatternMatch &&
(!$bIsDir || $aExcludeDirs == null || !isset($aExcludeDirs[$file]))) { (!$bIsDir || $aExcludeDirs == null || !isset($aExcludeDirs[$file]))) {
if ($file == '.git') {
echo $file;
}
$files[] = array( $files[] = array(
'name' => $file, 'name' => $file,
'depth' => $depth, 'depth' => $depth,