Fixed downloading of files with dots

cakephp · Feb 15, 2015 · 5fd7396 · 5fd7396
1 parent 10b6ba7
commit 5fd7396
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php
@@ -1336,7 +1336,7 @@ public function file($path, $options = array()) {
 			'download' => null
 		);
 
-		if (strpos($path, '..') !== false) {
+		if (strpos($path, '../') !== false || strpos($path, '..\\') !== false) {
 			throw new NotFoundException(__d(
 				'cake_dev',
 				'The requested file contains `..` and will not be read.'

diff --git a/lib/Cake/Test/Case/Network/CakeResponseTest.php b/lib/Cake/Test/Case/Network/CakeResponseTest.php
@@ -1170,13 +1170,32 @@ public function testFileNotFound() {
  * test file with ..
  *
  * @expectedException NotFoundException
+ * @expectedExceptionMessage The requested file contains `..` and will not be read.
  * @return void
  */
 	public function testFileWithPathTraversal() {
 		$response = new CakeResponse();
 		$response->file('my/../cat.gif');
 	}
 
+	public function testFileWithDotsInFilename() {
+		$ok = false;
+		$file = 'my/Some..cat.gif';
+
+		try {
+			$response = new CakeResponse();
+			$response->file($file);
+		} catch (NotFoundException $e) {
+			if (Configure::read('debug') > 0) {
+				$ok = $e->getMessage() === sprintf('The requested file %s was not found or not readable', APP . $file);
+			} else {
+				$ok = $e->getMessage() === 'The requested file was not found';
+			}
+		}
+
+		$this->assertTrue($ok);
+	}
+
 /**
  * testFile method
  *