Fix exclusive spawn mechanism for relative paths and working directories #14812
Conversation
This file contains 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
…m the working_directory. [ci skip-build-wheels]
stuhood
force-pushed
the
stuhood/exclusive-spawn-escaping-relative-paths
branch
from
cfe7469
to
4c8b26e
Compare
Eric-Arellano
approved these changes
Mar 16, 2022
jsirois
approved these changes
Mar 16, 2022
| let mut executable_path = PathBuf::from(&req.argv[0]); | ||
| if executable_path.is_relative() { | ||
| if let Some(working_directory) = &req.working_directory { | ||
| executable_path = working_directory.as_ref().join(executable_path) |
There was a problem hiding this comment.
This should probably be using RelativePath so that ../ are followed and collapsed and there is still verification the root has not been escaped. I can't see the harm if it is escaped, but the effort to avoid the lock is nominally being made, so go all the way?
There was a problem hiding this comment.
Just saw this, sorry. I agree, but I also don't see the harm in letting it escape. Will let it slide for now to save a tree.
stuhood
added a commit
to stuhood/pants
that referenced
this pull request
Mar 16, 2022
…ies. (pantsbuild#14812) The `exclusive_spawn` facility to avoid/retry for `ExecutableFileBusy` / "Text file busy" is triggered by having materialized `arg[0]` of a process into the process sandbox. But in the presence of a `Process::working_directory` and a relative path as `arg[0]`, the facility was not being triggered (since validation of `arg[0]` as a `RelativePath` would fail due to it escaping its root). This relates to pantsbuild#13424 (which would remove the need for the `exclusive_spawn` facility), but does not fix it: only ensure that we handle an existing known case. [ci skip-build-wheels]
stuhood
added a commit
that referenced
this pull request
Mar 16, 2022
…ies. (cherrypick of #14812) (#14816) The `exclusive_spawn` facility to avoid/retry for `ExecutableFileBusy` / "Text file busy" is triggered by having materialized `arg[0]` of a process into the process sandbox. But in the presence of a `Process::working_directory` and a relative path as `arg[0]`, the facility was not being triggered (since validation of `arg[0]` as a `RelativePath` would fail due to it escaping its root). This relates to #13424 (which would remove the need for the `exclusive_spawn` facility), but does not fix it: only ensure that we handle an existing known case. [ci skip-build-wheels]
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.
The
exclusive_spawnfacility to avoid/retry forExecutableFileBusy/ "Text file busy" is triggered by having materializedarg[0]of a process into the process sandbox. But in the presence of aProcess::working_directoryand a relative path asarg[0], the facility was not being triggered (since validation ofarg[0]as aRelativePathwould fail due to it escaping its root).This relates to #13424 (which would remove the need for the
exclusive_spawnfacility), but does not fix it: only ensure that we handle an existing known case.