-
Notifications
You must be signed in to change notification settings - Fork 12.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Print environment variables accessed by rustc as special comments into depinfo files #71858
Conversation
Note that this method can be somewhat more precise than tracking of environment variables in cargo. With this approach we can also track values of the variables actually used by rustc instead of ones cached by cargo (there's some window for them to change). |
I would generally speaking love to have this, syncing with build scripts is a pain. I personally would be on board with landing this PR (I didn't review in detail though) without a -Z flag or so as the behavior here seems fairly well understood. One thing I'm not sure about is whether we should include other environment variables rustc reads, like RUSTC_BOOTSTRAP. |
This looks great! And a remarkably simple change. I would maybe suggest using more generic text. Instead of I'm not sure I follow the comment about tracking the value. The environment should be static from the time Cargo starts, right? (Unless it is modified by an evil proc-macro.) Regardless, I don't think that's something to worry about too much. Figuring out how to safely encode the value in a Makefile comment sounds tricky (handling newlines, etc.). |
FWIW, environment variable names can contain newlines as well. (Cargo is free to ignore the I couldn't test this today due to #71936. |
This comment has been minimized.
This comment has been minimized.
Nice! One option to handle escapes here might be to do as @ehuss mentioned and only print the key, not the value. Then keys with weird characters (e.g. newlines) could simply be omitted and not tracked for now. Practically I don't think this will ever matter either way. Personally though I tend to be overly averse to using escape patterns |
This is really neat. :D Miri also uses Does this mean we can revert 8a77d1c again as it becomes redundant? |
@alexcrichton
Yes, all uses of |
I don't think this is universally true. Some scripts use |
I haven't seen this one :) That's certainly not universally true. |
This looks good to me code-wise. I probably wouldn't include the the value (Cargo probably won't use it), and there's maybe a remote possibility it may have an extremely large value, or expose a secret. I don't care much either way, though. I don't feel comfortable to r+ since I am not on the compiler team (and this would be insta-stable). Maybe @Mark-Simulacrum or someone on the team can approve. |
I think the secrets argument in particular is interesting to me, but I would not personally consider it too notable -- you probably just have to trust that anyone that can read files in your target directory is trustworthy enough to be able to read your environment variables too. I think largely speaking I agree that including them "makes sense" and ideally Cargo would use them (I get why it doesn't today, and agree it likely won't cause trouble). I believe it makes sense for this to go through compiler team FCP or at least something similar to the MCP process as a stabilization (especially an instantaneous one). I'm not sure exactly what the right step is though -- cc @nikomatsakis @pnkfelix? With respect to the code, I think it looks good enough that I'd be happy to r+ modulo the instant stabilization. |
The values embedded here are just the ones used in I suppose there is the possibility that there is |
Essentially, yeah -- one could imagine though that for e.g. proc macros (once we support an API for them to expose "I used this environment variable") it could be common for you to set e.g. a database URL including a password such that the proc macro can connect to the database and collect schema data, while the URL isn't actually intended to be stored in the binary at all. But I agree that seems mostly like a niche case; I'd prefer to deal with it in the future. |
I guess the concern is if we will remember dealing with it in the future -- or if that will only happen after some actual security incident caused by this. |
Isn't Cargo already saving these env var values for its rebuild logic? |
This comment suggests that they are hashed: https://github.com/rust-lang/cargo/blob/2cbe9048efc5c904b33191d799f97dc4698debaa/src/cargo/core/compiler/fingerprint.rs#L520-L524 -- but based on the only constructor -- here (https://github.com/rust-lang/cargo/blob/2cbe9048efc5c904b33191d799f97dc4698debaa/src/cargo/core/compiler/fingerprint.rs#L1348-L1355) it seems like this is not true. So looks like Cargo presumably also stores them in plaintext. I don't think we need to stop storing the env values, though it might be nice to make sure that there's some prefix (e.g. |
One thing we could do is state explicitly in the |
Hm, I thought I had given approval previously. But perhaps not. @bors r+ Sorry for the wait, @petrochenkov! |
📌 Commit 69b2179 has been approved by |
I do see that there are some concerns raised about potentially not being able to opt-out or whatever in the future, and some alternative designs -- my impression is that the current design should work more or less well, even if we might need some additional options. But it seems like we could always just stop emitting these keys and start emitting other keys (or files), and that would be backwards compatible I think. |
Print environment variables accessed by rustc as special comments into depinfo files So cargo (and perhaps others tools) can use them for linting (at least) or for actually rebuilding crates on env var changes. --- I've recently observed one more forgotten environment variable in a build script rust-lang@8a77d1c and thought it would be nice to provide the list of accessed variables to cargo automatically as a part of depinfo. Unsurprisingly, I wasn't the first who had this idea - cc rust-lang#70517 rust-lang#40364 rust-lang#44074. Also, there are dozens of uses of `(option_)env!` in rustc repo and, like, half of them are not registered in build scripts. --- Description: - depinfo files are extended with special comments containing info about environment variables accessed during compilation. - Comment format for environment variables with successfully retrieved value: `# env-dep:KEY=VALUE`. - Comment format for environment variables without successfully retrieved value: `# env-dep:KEY` (can happen with `option_env!`). - `KEY` and `VALUE` are minimally escaped (`\n`, `\r`, `\\`) so they don't break makefile comments and can be unescaped by anything that can unescape standard `escape_default` and friends. FCP report: rust-lang#71858 (comment) Closes rust-lang#70517 Closes rust-lang#40364 Closes rust-lang#44074 A new issue in the cargo repo will be needed to track the cargo side of this feature. r? @ehuss
☀️ Test successful - checks-azure |
Made an issue for using this in cargo - rust-lang/cargo#8417. |
This commit updates Cargo's parsing of rustc's dep-info files to account for changes made upstream in rust-lang/rust#71858. This means that if `env!` or `option_env!` is used in crate files Cargo will correctly rebuild the crate if the env var changes. Closes rust-lang#8417
Parse `# env-dep` directives in dep-info files This commit updates Cargo's parsing of rustc's dep-info files to account for changes made upstream in rust-lang/rust#71858. This means that if `env!` or `option_env!` is used in crate files Cargo will correctly rebuild the crate if the env var changes. Closes #8417
proc_macro: Add API for tracked access to environment variables Continuation of rust-lang#71858. `proc_macro::tracked_env::var` is similar to regular `env::var` called from a proc macro, except that it also adds the accessed variable to depinfo.
So cargo (and perhaps others tools) can use them for linting (at least) or for actually rebuilding crates on env var changes.
I've recently observed one more forgotten environment variable in a build script 8a77d1c and thought it would be nice to provide the list of accessed variables to cargo automatically as a part of depinfo.
Unsurprisingly, I wasn't the first who had this idea - cc #70517 #40364 #44074.
Also, there are dozens of uses of
(option_)env!
in rustc repo and, like, half of them are not registered in build scripts.Description:
# env-dep:KEY=VALUE
.# env-dep:KEY
(can happen withoption_env!
).KEY
andVALUE
are minimally escaped (\n
,\r
,\\
) so they don't break makefile comments and can be unescaped by anything that can unescape standardescape_default
and friends.FCP report: #71858 (comment)
Closes #70517
Closes #40364
Closes #44074
A new issue in the cargo repo will be needed to track the cargo side of this feature.
r? @ehuss