fix(config-include): disallow glob and template syntax

This reserves future possibility for us to support globa syntax and
templated paths.

Addressing rust-lang#16284 (comment)

Author: weihanglo

src/cargo/util/context/mod.rs

@@ -61,7 +61,6 @@
 //! read the environment variable due to ambiguity. (See `ConfigMapAccess` for
 //! more details.)
 
-use crate::util::cache_lock::{CacheLock, CacheLockMode, CacheLocker};
 use std::borrow::Cow;
 use std::collections::{HashMap, HashSet};
 use std::env;
@@ -85,9 +84,11 @@ use crate::ops::RegistryCredentialConfig;
 use crate::sources::CRATES_IO_INDEX;
 use crate::sources::CRATES_IO_REGISTRY;
 use crate::util::OnceExt as _;
+use crate::util::cache_lock::{CacheLock, CacheLockMode, CacheLocker};
 use crate::util::errors::CargoResult;
 use crate::util::network::http::configure_http_handle;
 use crate::util::network::http::http_handle;
+use crate::util::restricted_names::is_glob_pattern;
 use crate::util::{CanonicalUrl, closest_msg, internal};
 use crate::util::{Filesystem, IntoUrl, IntoUrlWithBase, Rustc};
 
@@ -1499,6 +1500,26 @@ impl GlobalContext {
                     include.def,
                 )
             }
+
+            if let Some(path) = include.path.to_str() {
+                // Ignore non UTF-8 bytes as glob and template syntax are for textual config.
+                if is_glob_pattern(path) {
+                    bail!(
+                        "expected a config include path without glob patterns, \
+                         but found `{}` from `{}`",
+                        include.path.display(),
+                        include.def,
+                    )
+                }
+                if path.contains(&['{', '}']) {
+                    bail!(
+                        "expected a config include path without template braces, \
+                         but found `{}` from `{}`",
+                        include.path.display(),
+                        include.def,
+                    )
+                }
+            }
         }
 
         Ok(includes)

tests/testsuite/config_include.rs

@@ -698,13 +698,7 @@ fn disallow_glob_syntax() {
 could not load Cargo configuration
 
 Caused by:
-  failed to load config include `config-*.toml` from `[ROOT]/.cargo/config.toml`
-
-Caused by:
-  failed to read configuration file `[ROOT]/.cargo/config-*.toml`
-
-Caused by:
-  [NOT_FOUND]
+  expected a config include path without glob patterns, but found `config-*.toml` from `[ROOT]/.cargo/config.toml`
 "#]],
     );
 }
@@ -722,13 +716,7 @@ fn disallow_template_syntax() {
 could not load Cargo configuration
 
 Caused by:
-  failed to load config include `{workspace-root}/config.toml` from `[ROOT]/.cargo/config.toml`
-
-Caused by:
-  failed to read configuration file `[ROOT]/.cargo/{workspace-root}/config.toml`
-
-Caused by:
-  [NOT_FOUND]
+  expected a config include path without template braces, but found `{workspace-root}/config.toml` from `[ROOT]/.cargo/config.toml`
 "#]],
     );
 }