Merge MAGETWO-92160 into 2.3-bugfixes-150918

Author: dvoskoboinikov

dev/tests/functional/utils/log.php

@@ -4,11 +4,16 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 if (!isset($_GET['name'])) {
-    throw new \InvalidArgumentException('The name of log file is required for getting logs.');
+    throw new \InvalidArgumentException(
+        'The name of log file is required for getting logs.'
+    );
 }
-
 $name = urldecode($_GET['name']);
-$file = file_get_contents('../../../../var/log/' . $name);
+if (preg_match('/\.\.(\\\|\/)/', $name)) {
+    throw new \InvalidArgumentException('Invalid log file name');
+}
 
-echo serialize($file);
+echo serialize(file_get_contents('../../../../var/log' .'/' .$name));