[flake8-import-conventions] Syntax check aliases supplied in configuration for unconventional-import-alias (ICN001)

crates/ruff/tests/lint.rs

@@ -1966,3 +1966,73 @@ fn nested_implicit_namespace_package() -> Result<()> {
 
     Ok(())
 }
+
+#[test]
+fn flake8_import_convention_invalid_aliases_config_alias_name() -> Result<()> {
+    let tempdir = TempDir::new()?;
+    let ruff_toml = tempdir.path().join("ruff.toml");
+    fs::write(
+        &ruff_toml,
+        r#"
+[lint.flake8-import-conventions.aliases]
+"module.name" = "invalid.alias"
+"#,
+    )?;
+
+    insta::with_settings!({
+        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
+    }, {
+        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+            .args(STDIN_BASE_OPTIONS)
+            .arg("--config")
+            .arg(&ruff_toml)
+    , @r#"
+success: false
+exit_code: 2
+----- stdout -----
+
+----- stderr -----
+ruff failed
+  Cause: Failed to parse [TMP]/ruff.toml
+  Cause: TOML parse error at line 2, column 2
+  |
+2 | [lint.flake8-import-conventions.aliases]
+  |  ^^^^
+alias must be a valid identifier"#);});
+    Ok(())
+}
+
+#[test]
+fn flake8_import_convention_invalid_aliases_config_module_name() -> Result<()> {
+    let tempdir = TempDir::new()?;
+    let ruff_toml = tempdir.path().join("ruff.toml");
+    fs::write(
+        &ruff_toml,
+        r#"
+[lint.flake8-import-conventions.aliases]
+"module..invalid" = "alias"
+"#,
+    )?;
+
+    insta::with_settings!({
+        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
+    }, {
+        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+            .args(STDIN_BASE_OPTIONS)
+            .arg("--config")
+            .arg(&ruff_toml)
+    , @r#"
+success: false
+exit_code: 2
+----- stdout -----
+
+----- stderr -----
+ruff failed
+  Cause: Failed to parse [TMP]/ruff.toml
+  Cause: TOML parse error at line 2, column 2
+  |
+2 | [lint.flake8-import-conventions.aliases]
+  |  ^^^^
+module must be a valid identifier separated by single periods"#);});
+    Ok(())
+}

crates/ruff_workspace/Cargo.toml

@@ -21,6 +21,7 @@ ruff_macros = { workspace = true }
 ruff_python_ast = { workspace = true }
 ruff_python_formatter = { workspace = true, features = ["serde"] }
 ruff_python_semantic = { workspace = true, features = ["serde"] }
+ruff_python_stdlib = {workspace = true}
 ruff_source_file = { workspace = true }
 
 anyhow = { workspace = true }

crates/ruff_workspace/src/options.rs

@@ -1,6 +1,7 @@
 use regex::Regex;
 use rustc_hash::{FxBuildHasher, FxHashMap, FxHashSet};
-use serde::{Deserialize, Serialize};
+use serde::de::{self};
+use serde::{Deserialize, Deserializer, Serialize};
 use std::collections::BTreeMap;
 use std::path::PathBuf;
 use strum::IntoEnumIterator;
@@ -34,6 +35,7 @@ use ruff_macros::{CombineOptions, OptionsMetadata};
 use ruff_python_ast::name::Name;
 use ruff_python_formatter::{DocstringCodeLineWidth, QuoteStyle};
 use ruff_python_semantic::NameImports;
+use ruff_python_stdlib::identifiers::is_identifier;
 
 #[derive(Clone, Debug, PartialEq, Eq, Default, OptionsMetadata, Serialize, Deserialize)]
 #[serde(deny_unknown_fields, rename_all = "kebab-case")]
@@ -1327,6 +1329,7 @@ pub struct Flake8ImportConventionsOptions {
             scipy = "sp"
         "#
     )]
+    #[serde(deserialize_with = "deserialize_and_validate_aliases")]
     pub aliases: Option<FxHashMap<String, String>>,
 
     /// A mapping from module to conventional import alias. These aliases will
@@ -1370,6 +1373,30 @@ pub struct Flake8ImportConventionsOptions {
     pub banned_from: Option<FxHashSet<String>>,
 }
 
+fn deserialize_and_validate_aliases<'de, D>(
+    deserializer: D,
+) -> Result<Option<FxHashMap<String, String>>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let Some(aliases) = Option::<FxHashMap<String, String>>::deserialize(deserializer)? else {
+        return Ok(None);
+    };
+
+    for (module, alias) in &aliases {
+        if module.is_empty() || module.split('.').any(|part| !is_identifier(part)) {
+            return Err(de::Error::custom(
+                "module must be a valid identifier separated by single periods",
+            ));
+        }
+        if !is_identifier(alias) {
+            return Err(de::Error::custom("alias must be a valid identifier"));
+        }
+    }
+
+    Ok(Some(aliases)) // Return the validated map.
+}
+
 impl Flake8ImportConventionsOptions {
     pub fn into_settings(self) -> flake8_import_conventions::settings::Settings {
         let mut aliases = match self.aliases {