Knah-Tsaeb
/
Minigalnano
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Somewhat more complex protection against directory traversal attacks. 

But hey, we can use symlinks again ! (☞ಠ_ಠ)☞

Really fixes sebsauvage/MinigalNano/#89
This commit is contained in:
Alda Marteau-Hardi 2015-07-24 18:44:08 +02:00
parent 950a741cbd
commit a60233ecab
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
index.php
View File

@ -137,6 +137,20 @@ function checkpermissions($file) {
}
}
function guardAgainstDirectoryTraversal($path) {
/*
* I don't like regexes but this matches
* any attemp of directory traversal I could think of
* without forbidding « .. » in directory names.
*/
$pattern = "/^(.*\/)?(\.\.)(\/.*)?$/";
$directoryTraversal = preg_match($pattern, $path);
if ($directoryTraversal === 1) {
die("ERROR: Could not open " . htmlspecialchars(stripslashes($currentdir)) . " for reading!");
}
}
if (!defined("GALLERY_ROOT")) {
define("GALLERY_ROOT", "");
}
@ -150,10 +164,7 @@ $photoRoot = GALLERY_ROOT . 'photos/';
$thumbdir = rtrim('photos/' . $requestedDir, '/');
$currentdir = GALLERY_ROOT . $thumbdir;
$thumbdirIsInPhotoRoot = strpos(realpath($thumbdir), realpath($photoRoot));
if ($thumbdirIsInPhotoRoot === false) {
die("ERROR: Could not open " . htmlspecialchars(stripslashes($currentdir)) . " for reading!");
}
guardAgainstDirectoryTraversal($currentdir);
//-----------------------
// READ FILES AND FOLDERS