MAGETWO-92162: [Backport for 2.2.x] Log File Validation

Oleksandr Gorkun · Oleksandr Gorkun · commit 64e6fe0d2d51 · 2018-07-02T15:30:21.000+03:00
diff --git a/dev/tests/functional/utils/log.php b/dev/tests/functional/utils/log.php
@@ -9,11 +9,11 @@
 }
 
 $name = urldecode($_GET['name']);
-$logDir = realpath('../../../../var/log');
-$logFile = realpath($logDir .'/' .$name);
-if (!$logFile || !$logDir || mb_strpos($logFile, $logDir .'/') !== 0) {
+if (preg_match('/\.\.(\\\|\/)/', $name)) {
     throw new \InvalidArgumentException('Invalid log file name');
 }
+$logDir = '../../../../var/log';
+$logFile = realpath($logDir .'/' .$name);
 $file = file_get_contents($logFile);
 
 echo serialize($file);

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,11 @@`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`$name = urldecode($_GET['name']);`
`12`		`-$logDir = realpath('../../../../var/log');`
`13`		`-$logFile = realpath($logDir .'/' .$name);`
`14`		`-if (!$logFile \|\| !$logDir \|\| mb_strpos($logFile, $logDir .'/') !== 0) {`
	`12`	`+if (preg_match('/\.\.(\\\\|\/)/', $name)) {`
`15`	`13`	`throw new \InvalidArgumentException('Invalid log file name');`
`16`	`14`	`}`
	`15`	`+$logDir = '../../../../var/log';`
	`16`	`+$logFile = realpath($logDir .'/' .$name);`
`17`	`17`	`$file = file_get_contents($logFile);`
`18`	`18`
`19`	`19`	`echo serialize($file);`