From 3e4cf1bbe1745a55ede0dece31353aebc3f82729 Mon Sep 17 00:00:00 2001
From: Adriane Boyd <adrianeboyd@gmail.com>
Date: Fri, 19 Aug 2022 09:52:12 +0200
Subject: [PATCH] Check for . in factory names (#11336)

---
 spacy/errors.py              |  2 ++
 spacy/language.py            |  9 +++++++--
 spacy/tests/test_language.py | 11 +++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/spacy/errors.py b/spacy/errors.py
index 9a679ae2c..40e50aaa9 100644
--- a/spacy/errors.py
+++ b/spacy/errors.py
@@ -540,6 +540,8 @@ class Errors(metaclass=ErrorsWithCodes):
     E202 = ("Unsupported {name} mode '{mode}'. Supported modes: {modes}.")
 
     # New errors added in v3.x
+    E853 = ("Unsupported component factory name '{name}'. The character '.' is "
+            "not permitted in factory names.")
     E854 = ("Unable to set doc.ents. Check that the 'ents_filter' does not "
             "permit overlapping spans.")
     E855 = ("Invalid {obj}: {obj} is not from the same doc.")
diff --git a/spacy/language.py b/spacy/language.py
index 816bd6531..e89ae142b 100644
--- a/spacy/language.py
+++ b/spacy/language.py
@@ -465,6 +465,8 @@ class Language:
         """
         if not isinstance(name, str):
             raise ValueError(Errors.E963.format(decorator="factory"))
+        if "." in name:
+            raise ValueError(Errors.E853.format(name=name))
         if not isinstance(default_config, dict):
             err = Errors.E962.format(
                 style="default config", name=name, cfg_type=type(default_config)
@@ -543,8 +545,11 @@ class Language:
 
         DOCS: https://spacy.io/api/language#component
         """
-        if name is not None and not isinstance(name, str):
-            raise ValueError(Errors.E963.format(decorator="component"))
+        if name is not None:
+            if not isinstance(name, str):
+                raise ValueError(Errors.E963.format(decorator="component"))
+            if "." in name:
+                raise ValueError(Errors.E853.format(name=name))
         component_name = name if name is not None else util.get_object_name(func)
 
         def add_component(component_func: "Pipe") -> Callable:
diff --git a/spacy/tests/test_language.py b/spacy/tests/test_language.py
index c5fdc8eb0..6f3ba8acc 100644
--- a/spacy/tests/test_language.py
+++ b/spacy/tests/test_language.py
@@ -659,3 +659,14 @@ def test_multiprocessing_gpu_warning(nlp2, texts):
             # Trigger multi-processing.
             for _ in docs:
                 pass
+
+
+def test_dot_in_factory_names(nlp):
+    Language.component("my_evil_component", func=evil_component)
+    nlp.add_pipe("my_evil_component")
+
+    with pytest.raises(ValueError, match="not permitted"):
+        Language.component("my.evil.component.v1", func=evil_component)
+
+    with pytest.raises(ValueError, match="not permitted"):
+        Language.factory("my.evil.component.v1", func=evil_component)