Auto merge of #11644 - basile-henry:basile-henry/deny-cargo-home-env-table, r=ehuss

bors · bors · commit cf410cb33715 · 2023-02-01T22:16:34.000Z
config: Deny CARGO_HOME in [env] table (fixes #11590) Fixes #11590
diff --git a/src/cargo/util/config/mod.rs b/src/cargo/util/config/mod.rs
@@ -1685,8 +1685,15 @@ impl Config {
     }
 
     pub fn env_config(&self) -> CargoResult<&EnvConfig> {
-        self.env_config
-            .try_borrow_with(|| self.get::<EnvConfig>("env"))
+        let env_config = self
+            .env_config
+            .try_borrow_with(|| self.get::<EnvConfig>("env"))?;
+
+        if env_config.get("CARGO_HOME").is_some() {
+            bail!("setting the `CARGO_HOME` environment variable is not supported in the `[env]` configuration table")
+        }
+
+        Ok(env_config)
     }
 
     /// This is used to validate the `term` table has valid syntax.
diff --git a/tests/testsuite/cargo_env_config.rs b/tests/testsuite/cargo_env_config.rs
@@ -57,6 +57,32 @@ fn env_invalid() {
         .run();
 }
 
+#[cargo_test]
+fn env_no_cargo_home() {
+    let p = project()
+        .file("Cargo.toml", &basic_bin_manifest("foo"))
+        .file(
+            "src/main.rs",
+            r#"
+        fn main() {
+        }
+        "#,
+        )
+        .file(
+            ".cargo/config",
+            r#"
+                [env]
+                CARGO_HOME = "/"
+            "#,
+        )
+        .build();
+
+    p.cargo("build")
+        .with_status(101)
+        .with_stderr_contains("[..]setting the `CARGO_HOME` environment variable is not supported in the `[env]` configuration table")
+        .run();
+}
+
 #[cargo_test]
 fn env_force() {
     let p = project()
