This repository has been archived by the owner on Nov 15, 2023. It is now read-only.
PVF worker: random fixes #7649
Merged
PVF worker: random fixes #7649
+51
−13
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
- Fixes possible panic due to non-UTF-8 env vars (#7330 (comment)) - Very small refactor of some duplicated code
mrcnski
added
A0-please_review
antonva
approved these changes
Aug 21, 2023
If we don't use anything like |
vstakhov
reviewed
Aug 21, 2023
| // TODO: *theoretically* the value (or mere presence) of `RUST_LOG` can be a source of | ||
| // randomness for malicious code. In the future we can remove it also and log in the host; | ||
| // see <https://github.com/paritytech/polkadot/issues/7117>. | ||
| if key != "RUST_LOG" { | ||
| if key.to_str() != Some("RUST_LOG") { |
There was a problem hiding this comment.
Do we need to_str here? As far as I see, we can directly compare OsStr and str, even if OsStr variable has some unsafe unicode.
There was a problem hiding this comment.
Yep, looks like you're right.
|
It seems that we need to filter |
In case of a key or value that would cause env::remove_var to panic, we first log a warning and then proceed to attempt to remove the env var.
|
Thanks @vstakhov, pushed a commit. Got to use |
vstakhov
approved these changes
Aug 21, 2023
|
bot merge |
|
Waiting for commit status. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
env::remove_varto panic, we first log a warning and then proceed to attempt to remove the env var.Not needed on Unix according to @vstakhovI didn't address keeping
PATHas it's not needed for the workers to function. @vstakhov is there any reason to keep it?