Refactored docs for std::fs::set_permissions_nofollow + fix BSD-based systems to use fchmodat with AT_SYMLINK_NOFOLLOW flag - #160170
Conversation
| /// * `open` with `O_NOFOLLOW` flag enabled + `fchmod` on WASI. | ||
| /// * `fchmodat` function with the flag `AT_SYMLINK_NOFOLLOW` enabled | ||
| /// on Unix platforms | ||
| /// on Unix platforms. |
There was a problem hiding this comment.
These aren't super necessary but 🤷🏻 doesn't matter too much
There was a problem hiding this comment.
Yeah this is grammatically still odd -- the first two bullets are not actually sentences, but the last one is.
|
@bors r+ rollup |
| /// * `fchmodat` function with the flag `AT_SYMLINK_NOFOLLOW` enabled | ||
| /// on Unix platforms | ||
| /// on Unix platforms. | ||
| /// * The flag `FILE_FLAG_OPEN_REPARSE_POINT` is enabled and then the |
There was a problem hiding this comment.
That flag is enabled where? Should this say "SetFileInformationByHandle with the flag ..." or would that not be right?
There was a problem hiding this comment.
The internal code for Windows' set_permissions_nofollow does the following:
pub fn set_perm_nofollow(p: &WCStr, perm: FilePermissions) -> io::Result<()> {
let mut opts = OpenOptions::new();
opts.access_mode(c::FILE_WRITE_ATTRIBUTES);
// `FILE_FLAG_OPEN_REPARSE_POINT` for no_follow behavior
opts.custom_flags(c::FILE_FLAG_BACKUP_SEMANTICS | c::FILE_FLAG_OPEN_REPARSE_POINT);
let file = File::open_native(p, &opts)?;
file.set_permissions(perm)
}It opens the file first with FILE_FLAG_BACKUP_SEMANTICS and FILE_FLAG_OPEN_REPARSE_POINT and then it sets the permissions on the reparse point itself using SetFileInformationByHandle. Enabled is probably a poor choice of word here; at the time, I wasn't too sure how to discuss the opening a file behavior on Windows because it seems like OpenOptions::open doesn't go in depth about platform-specific behavior and the open_native call seem to be doing a lot here:
rust/library/std/src/sys/fs/windows.rs
Lines 345 to 398 in b5be620
There was a problem hiding this comment.
I would say something like
/// This function currently corresponds to the following underlying operations:
/// * WASI: `open` with `O_NOFOLLOW` followed by `fchmod`.
/// * Unix: `fchmodat` with `AT_SYMLINK_NOFOLLOW`.
/// * Windows: `CreateFileW` with `FILE_FLAG_OPEN_REPARSE_POINT` followed
/// by `SetFileInformationByHandle`.
There was a problem hiding this comment.
I took a look at Unix implementation of set_permissions_nofollow again, and I wanted to correct something I said about MacOS/BSD-based systems. Currently, they call fchmodat with no flag provided (0), and I realized that's a mistake I made since I forgot to include them underneath the fchmodat with AT_SYMLINK_NOFOLLOW.
rust/library/std/src/sys/fs/unix.rs
Lines 2038 to 2070 in b5be620
I think the reason why I did that was because CI mentioned compiler errors on libc::AT_SYMLINK_NOFOLLOW not existing on certain platforms (though this was on dist-various-1 so wasn't sure what that tested), so I gated it to linux, but forgot to update it to include MacOS/other BSD-based systems that support AT_SYMLINK_NOFOLLOW.
I have to fix this and include the BSD-based systems in that block. I also verified the behavior on my MacBook and it should definitely change the permission bits, which means the test case that sets a symlink with readonly permission should pass.
|
@bors r- Sorry I have a question :) |
|
This pull request was unapproved. |
|
r? RalfJung since you're mostly reviewing already |
|
|
d24bee2 to
82ff1cb
Compare
std::fs::set_permissions_nofollow + fix BSD-based systems to use fchmodat with AT_SYMLINK_NOFOLLOW flag
82ff1cb to
f0403c2
Compare
| @@ -662,13 +662,10 @@ fn set_get_permissions_nofollows_symlink() { | |||
There was a problem hiding this comment.
Android and Linux share the same kernel, so I highly doubt they will behave different here?
There was a problem hiding this comment.
I'll take it off from this block and we can put up a try job to confirm
| // on symlinks could lead to no effect, so we should expect | ||
| // there being no change to BSD-based systems. | ||
| // on symlinks could lead to no effect, so it's case by case | ||
| // on whether the permissions are set |
There was a problem hiding this comment.
// On these systems, the symlink itself is now marked readonly.
This is meant to replace the entire comment, github is just incapable of making that a suggestion...
| options.open(Path::new(os_str))?.set_permissions(Permissions::from_inner(perm)) | ||
| } | ||
| all(target_os = "linux", not(any(target_os = "espidf", target_os = "horizon"))) => { | ||
| all(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "android"), not(any(target_os = "espidf", target_os = "horizon"))) => { |
There was a problem hiding this comment.
What is going on here? The not part at the end makes no sense at all...?
| // These platforms do not have `AT_SYMLINK_NOFOLLOW` but support fchmodat, | ||
| // so no flag is set for fchmodat. | ||
| cvt_r(|| unsafe { | ||
| libc::fchmodat(libc::AT_FDCWD, p.as_ptr(), perm.mode, 0) | ||
| }) |
There was a problem hiding this comment.
We promise that we will not follow the symlink. So why is it correct to not set the flag?
There was a problem hiding this comment.
To be honest with you, I wasn't sure what Unix platforms didn't support AT_SYMLINK_NOFOLLOW/O_NOFOLLOW because they didn't support symlinks.
For example, I think in my previous PR someone was commenting that ESPIDF/Horizon OS do not have support O_NOFOLLOW or symlinks, so I figured that their behavior should match with just regularly setting permissions on the file (fchmodat with no flag set). I had the not condition from earlier because I wasn't exhaustively sure which Unix-based platform has no symlinks.
I could try separating the not portion of the second branch into its own branch using fchmodat with no flag set and then have the _ branch do the same thing that lolbinarycat did originally:
use crate::fs::OpenOptions;
use crate::os::unix::fs::OpenOptionsExt;
OpenOptions::new().custom_flags(libc::O_NOFOLLOW).open(path)?.set_permissions(perm)^This does return a different error message than Unsupported on symlinks though.
There was a problem hiding this comment.
I think in my previous PR someone was commenting that ESPIDF/Horizon OS do not have support O_NOFOLLOW or symlinks, so I figured that their behavior should match with just regularly setting permissions on the file (fchmodat with no flag set)
If we are sure this is correct (ping the target maintainers) then we can skip the flag on those targets.
But your code skips the flag on all unknown targets and that doesn't seem good.
OpenOptions::new().custom_flags(libc::O_NOFOLLOW).open(path)?.set_permissions(perm) seems like a good fallback impl.
There was a problem hiding this comment.
The maintainer of the ESP-IDF target here: yes, I confirm ESP-IDF (and likely Horizon) do not support neither fchmodat, nor AT_SYMLINK_NOFOLLOW, nor O_NOFOLLOW so they should fall back to the old code before #158168. The latest code surface of this PR seems to fix that.
There was a problem hiding this comment.
To be clear, this only makes sense because they don't support symlinks at all. We have to guarantee that these operations never follow symlinks.
| /// // or succeed in modifying the permissions of a symlink | ||
| /// // This should result in an error on certain platforms, | ||
| /// // succeed in modifying the permissions of a symlink, | ||
| /// // or do nothing at all. |
There was a problem hiding this comment.
Do we know any platform where it does nothing at all?
There was a problem hiding this comment.
I don't have an exhaustive list. All I read from this MacOS post is that it's possible some systems can't change symbolic link permissions at all, which I interpreted to mean two different things: that fchmodat has no effects on symlinks or it throws an error. I did see this issue here that mentions that certain kernel silently ignored AT_SYMLINK_NOFOLLOW, which change permissions on the target, but that does something instead of no effect and it's an incorrect implementation.
Should I assume that AT_SYMLINK_NOFOLLOW should succeed in setting the permission bits/throw an error if it's not supported on symlinks? I'm unsure if no effects on symlinks and not throwing an error is valid behavior.
There was a problem hiding this comment.
Actually, I'll remove the no effects behavior note. I don't think of it being a valid behavior for this function, and since I can't find any results that tell me what platforms does nothing for fchmodat with AT_SYMLINK_NOFOLLOW
|
The user-facing comments are fine but this is turning into a libs discussion about the implementation. r? libs |
| libc::fchmodat(libc::AT_FDCWD, p.as_ptr(), perm.mode, 0) | ||
| }) | ||
| .map(|_| ()) | ||
| use crate::fs::OpenOptions; |
There was a problem hiding this comment.
To be conservative, I just have the fallback use the previous implementation of set_permissions_nofollow here. If there are other platforms that benefits from using fchmodat directly instead of open + fchmod, we can adjust that accordingly in a separate PR.
45bb905 to
cc256a2
Compare
This comment has been minimized.
This comment has been minimized.
|
Yea, I guess that's the reason why I had wasi in its own branch, but I'll cfg gate what |
cc256a2 to
8743121
Compare
This comment has been minimized.
This comment has been minimized.
… on different platforms + fixed BSD-based systems to use fchmodat with AT_SYMLINK_NOFOLLOW
…tored non-BSD-based/non-Linux platforms to use OpenOptions open + set_permissions, and refactored tests accordingly
8743121 to
a793546
Compare
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
| } | ||
| all(target_os = "linux", not(any(target_os = "espidf", target_os = "horizon"))) => { | ||
| any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "android") => { | ||
| cvt_r(|| unsafe { |
There was a problem hiding this comment.
Sorry if I'm bringing useless noise, but the AI keeps alerting me that using fchmodat with AT_SYMLINK_NOFOLLOW on Linux behaves very differently compared to BSDs, and might return an error when called on a symlink.
For brevity, I won't paste its output here, but just mentioning in case you are not aware.
There was a problem hiding this comment.
I'm aware. I've mentioned in the documentation for set_permissions_nofollow that on Linux it throws an Unsupported error and on BSD it can change the symlink permission bits (both behaviors should be verified in a test I created for symlinks).
There was a problem hiding this comment.
It's probably reading our docs https://doc.rust-lang.org/nightly/std/fs/fn.set_permissions_nofollow.html#errors
View all comments
This PR refactors documentations for
std::fs::set_permissions_nofollowand fixes BSD-based systems + Android to usefchmodatwithAT_SYMLINK_NOFOLLOWflag (instead of no flag set) and refactors all other platforms to defer toOpenOptionswithO_NOFOLLOWbehavior.r? @clarfonthey
Since they looked at the original
set_permissions_nofollowPR I madecc @RalfJung