bug #17063 bug #14246 [Filesystem] dumpFile() negates default file permissions (Hidde Boomsma)

fabpot · fabpot · commit 48b4bcfa4743 · 2016-01-07T14:25:41.000+01:00
This PR was merged into the 3.0 branch. Discussion ---------- bug #14246 [Filesystem] dumpFile() negates default file permissions | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #14246 | License | MIT | Doc PR | none Remain BC compatible with Symfony 2.8. Without this change a chmod is needed after calling `dumpFile`, making it non atomic. Commits ------- 53d6d4b bug #14246 [Filesystem] dumpFile() negates default file permissions
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -522,12 +522,16 @@ public function dumpFile($filename, $content)
             throw new IOException(sprintf('Unable to write to the "%s" directory.', $dir), 0, null, $dir);
         }
 
+        // Will create a temp file with 0600 access rights
+        // when the filesystem supports chmod.
         $tmpFile = $this->tempnam($dir, basename($filename));
 
         if (false === @file_put_contents($tmpFile, $content)) {
             throw new IOException(sprintf('Failed to write file "%s".', $filename), 0, null, $filename);
         }
 
+        // Ignore for filesystems that do not support umask
+        @chmod($tmpFile, 0666);
         $this->rename($tmpFile, $filename, true);
     }
 
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -1076,7 +1076,7 @@ public function testDumpFile()
 
         // skip mode check on Windows
         if ('\\' !== DIRECTORY_SEPARATOR) {
-            $this->assertFilePermissions(600, $filename);
+            $this->assertFilePermissions(666, $filename);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -522,12 +522,16 @@ public function dumpFile($filename, $content)`
`522`	`522`	`throw new IOException(sprintf('Unable to write to the "%s" directory.', $dir), 0, null, $dir);`
`523`	`523`	`}`
`524`	`524`
	`525`	`+ // Will create a temp file with 0600 access rights`
	`526`	`+ // when the filesystem supports chmod.`
`525`	`527`	`$tmpFile = $this->tempnam($dir, basename($filename));`
`526`	`528`
`527`	`529`	`if (false === @file_put_contents($tmpFile, $content)) {`
`528`	`530`	`throw new IOException(sprintf('Failed to write file "%s".', $filename), 0, null, $filename);`
`529`	`531`	`}`
`530`	`532`
	`533`	`+ // Ignore for filesystems that do not support umask`
	`534`	`+ @chmod($tmpFile, 0666);`
`531`	`535`	`$this->rename($tmpFile, $filename, true);`
`532`	`536`	`}`
`533`	`537`
Original file line number	Diff line number	Diff line change
`@@ -1076,7 +1076,7 @@ public function testDumpFile()`
`1076`	`1076`
`1077`	`1077`	`// skip mode check on Windows`
`1078`	`1078`	`if ('\\' !== DIRECTORY_SEPARATOR) {`
`1079`		`- $this->assertFilePermissions(600, $filename);`
	`1079`	`+ $this->assertFilePermissions(666, $filename);`
`1080`	`1080`	`}`
`1081`	`1081`	`}`
`1082`	`1082`