Merge pull request #230 from mindflayer/bugfix/strict-mode-allowed

Strict mode check should accept a location as `str`

Author: mindflayer

mocket/utils.py

@@ -57,12 +57,17 @@ def __init__(self):
     def is_allowed(self, location: Union[str, Tuple[str, int]]) -> bool:
         """
         Checks if (`host`, `port`) or at least `host`
-        are allowed locationsto perform real `socket` calls
+        are allowed locations to perform real `socket` calls
         """
         if not self.STRICT:
             return True
-        host, _ = location
-        return location in self.STRICT_ALLOWED or host in self.STRICT_ALLOWED
+        try:
+            host, _ = location
+        except ValueError:
+            host = None
+        return location in self.STRICT_ALLOWED or (
+            host is not None and host in self.STRICT_ALLOWED
+        )
 
     @staticmethod
     def raise_not_allowed():

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["hatchling"]
+requires = ["hatchling>=1.22.2"]
 build-backend = "hatchling.build"
 
 [project]

tests/main/test_mode.py

@@ -65,7 +65,8 @@ def test_strict_mode_false_with_allowed_hosts():
         Mocketizer(strict_mode=False, strict_mode_allowed=["foobar.local"])
 
 
-def test_strict_mode_false_always_allowed():
-    with Mocketizer(strict_mode=False):
-        assert MocketMode().is_allowed("foobar.com")
-        assert MocketMode().is_allowed(("foobar.com", 443))
+@pytest.mark.parametrize("strict_mode_on", (False, True))
+def test_strict_mode_allowed_or_not(strict_mode_on):
+    with Mocketizer(strict_mode=strict_mode_on):
+        assert MocketMode().is_allowed("foobar.com") is not strict_mode_on
+        assert MocketMode().is_allowed(("foobar.com", 443)) is not strict_mode_on