default parameters are escaped

dg · dg · commit 406eb13e54b8 · 2020-05-26T10:46:23.000+02:00
diff --git a/src/Bootstrap/Configurator.php b/src/Bootstrap/Configurator.php
@@ -67,7 +67,7 @@ class Configurator
 
 	public function __construct()
 	{
-		$this->parameters = $this->getDefaultParameters();
+		$this->parameters = self::escape($this->getDefaultParameters());
 	}
 
 
@@ -101,7 +101,7 @@ public function isDebugMode(): bool
 	 */
 	public function setTempDirectory(string $path)
 	{
-		$this->parameters['tempDir'] = $path;
+		$this->parameters['tempDir'] = self::escape($path);
 		return $this;
 	}
 
@@ -301,7 +301,7 @@ protected function getCacheDirectory(): string
 		if (empty($this->parameters['tempDir'])) {
 			throw new Nette\InvalidStateException('Set path to temporary directory using setTempDirectory().');
 		}
-		$dir = $this->parameters['tempDir'] . '/cache';
+		$dir = DI\Helpers::expand('%tempDir%/cache', $this->parameters, true);
 		Nette\Utils\FileSystem::createDir($dir);
 		return $dir;
 	}
@@ -330,4 +330,18 @@ public static function detectDebugMode($list = null): bool
 		}
 		return in_array($addr, $list, true) || in_array("$secret@$addr", $list, true);
 	}
+
+
+	/**
+	 * Expand counterpart.
+	 */
+	private static function escape($value)
+	{
+		if (is_array($value)) {
+			return array_map([self::class, 'escape'], $value);
+		} elseif (is_string($value)) {
+			return str_replace('%', '%%', $value);
+		}
+		return $value;
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class Configurator`
`67`	`67`
`68`	`68`	`public function __construct()`
`69`	`69`	`{`
`70`		`- $this->parameters = $this->getDefaultParameters();`
	`70`	`+ $this->parameters = self::escape($this->getDefaultParameters());`
`71`	`71`	`}`
`72`	`72`
`73`	`73`
`@@ -101,7 +101,7 @@ public function isDebugMode(): bool`
`101`	`101`	`*/`
`102`	`102`	`public function setTempDirectory(string $path)`
`103`	`103`	`{`
`104`		`- $this->parameters['tempDir'] = $path;`
	`104`	`+ $this->parameters['tempDir'] = self::escape($path);`
`105`	`105`	`return $this;`
`106`	`106`	`}`
`107`	`107`
`@@ -301,7 +301,7 @@ protected function getCacheDirectory(): string`
`301`	`301`	`if (empty($this->parameters['tempDir'])) {`
`302`	`302`	`throw new Nette\InvalidStateException('Set path to temporary directory using setTempDirectory().');`
`303`	`303`	`}`
`304`		`- $dir = $this->parameters['tempDir'] . '/cache';`
	`304`	`+ $dir = DI\Helpers::expand('%tempDir%/cache', $this->parameters, true);`
`305`	`305`	`Nette\Utils\FileSystem::createDir($dir);`
`306`	`306`	`return $dir;`
`307`	`307`	`}`
`@@ -330,4 +330,18 @@ public static function detectDebugMode($list = null): bool`
`330`	`330`	`}`
`331`	`331`	`return in_array($addr, $list, true) \|\| in_array("$secret@$addr", $list, true);`
`332`	`332`	`}`
	`333`	`+`
	`334`	`+`
	`335`	`+ /**`
	`336`	`+ * Expand counterpart.`
	`337`	`+ */`
	`338`	`+ private static function escape($value)`
	`339`	`+ {`
	`340`	`+ if (is_array($value)) {`
	`341`	`+ return array_map([self::class, 'escape'], $value);`
	`342`	`+ } elseif (is_string($value)) {`
	`343`	`+ return str_replace('%', '%%', $value);`
	`344`	`+ }`
	`345`	`+ return $value;`
	`346`	`+ }`
`333`	`347`	`}`