[Filesystem] Consider the umask setting when dumping a file #19872
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@nicolas-grekas I original also added the part that would listen to the umask, but that would have been a BC break, so I left it out. I do support the idea of adding it. 👍 |
| @@ -554,8 +554,7 @@ public function dumpFile($filename, $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); | |||
| @chmod($tmpFile, 0666 & ~umask()); | |||
There was a problem hiding this comment.
Can you also adjust the test case to test this behavior? (be aware of windows not having umask)
There was a problem hiding this comment.
There is nothing I could adjust, because the Symfony unit test suite explicitly sets the umask to 0, so the expected file permissions in the tests will always be 666 on both Unix and Windows.
There was a problem hiding this comment.
@hboomsma Ah, I see. Thank you. 😄
|
@leofeyer can you please rebase so that the merge commit goes away? |
|
Done. |
|
I'd be 👍 here, looks consistent to me. |
|
👍 |
1 similar comment
|
👍 |
|
Thank you @leofeyer. |
fabpot
added a commit
that referenced
this pull request
Sep 14, 2016
…e (leofeyer) This PR was merged into the 3.1 branch. Discussion ---------- [Filesystem] Consider the umask setting when dumping a file | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #14246 , #17063 | License | MIT | Doc PR | - `Filesystem::dumpFile()` does not consider the umask setting and thus creates files with write permissions for everyone (`0666`). Other `chmod()` calls in Symfony do consider the umask setting (see e.g. [here](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpFoundation/File/File.php#L101) or [here](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpFoundation/File/UploadedFile.php#L230)), therefore I have adjusted the `dumpFile()` method accordingly. Commits ------- fdd266f Consider the umask setting when dumping a file.
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Filesystem::dumpFile()does not consider the umask setting and thus creates files with write permissions for everyone (0666). Otherchmod()calls in Symfony do consider the umask setting (see e.g. here or here), therefore I have adjusted thedumpFile()method accordingly.