💫 Toolkit to help you get started with SDD or any other process!
fix: reject host-less catalog URLs in base and preset validators (#3209) (#3227)
Noor ul aincb7c36c95b04
diff --git a/src/specify_cli/catalogs.py b/src/specify_cli/catalogs.pyindex d14e8ec42..ec8014127 100644--- a/src/specify_cli/catalogs.py+++ b/src/specify_cli/catalogs.py@@ -80,7 +80,7 @@ class CatalogStackBase:)# Check hostname, not netloc: netloc is truthy for host-less URLs like# "https://:8080" or "https://user@", so the host guarantee this error- # promises would not actually hold. hostname is None in those cases.+ # promises would not actually hold. hostname is None in those cases (#3209).if not parsed.hostname:raise cls._error("Catalog URL must be a valid URL with a host.")diff --git a/src/specify_cli/presets/__init__.py b/src/specify_cli/presets/__init__.pyindex 354cc8239..cf89b788a 100644--- a/src/specify_cli/presets/__init__.py+++ b/src/specify_cli/presets/__init__.py@@ -1863,7 +1863,7 @@ class PresetCatalog:)# Check hostname, not netloc: netloc is truthy for host-less URLs like# "https://:8080" or "https://user@", so the host guarantee this error- # promises would not actually hold. hostname is None in those cases.+ # promises would not actually hold. hostname is None in those cases (#3209).if not parsed.hostname:raise PresetValidationError("Catalog URL must be a valid URL with a host."diff --git a/tests/integrations/test_integration_catalog.py b/tests/integrations/test_integration_catalog.pyindex 6b6831e05..274ec1315 100644--- a/tests/integrations/test_integration_catalog.py+++ b/tests/integrations/test_integration_catalog.py@@ -70,16 +70,17 @@ class TestCatalogURLValidation:@pytest.mark.parametrize("url",[- "https://:8080", # port only, no host- "https://:0", # port only, no host- "https://user@", # userinfo only, no host- "https://user:pw@", # userinfo only, no host+ "https://:8080", # port only, no host+ "https://:8080/catalog.json", # port only, with path+ "https://:0", # port only, no host+ "https://user@", # userinfo only, no host+ "https://user:pass@", # userinfo only, no host],)def test_hostless_url_with_truthy_netloc_rejected(self, url):# These have a truthy netloc (":8080", "user@") but no actual host,# so a netloc-based check would wrongly accept them despite the- # "valid URL with a host" promise. hostname is None for all of them.+ # "valid URL with a host" promise. hostname is None for all of them (#3209).with pytest.raises(IntegrationCatalogError, match="valid URL"):IntegrationCatalog._validate_catalog_url(url)diff --git a/tests/test_presets.py b/tests/test_presets.pyindex 58dcdc711..ff3f3dffc 100644--- a/tests/test_presets.py+++ b/tests/test_presets.py@@ -1427,14 +1427,15 @@ class TestPresetCatalog:@pytest.mark.parametrize("url",[- "https://:8080", # port only, no host- "https://:0", # port only, no host- "https://user@", # userinfo only, no host- "https://user:pw@", # userinfo only, no host+ "https://:8080", # port only, no host+ "https://:8080/catalog.json", # port only, with path+ "https://:0", # port only, no host+ "https://user@", # userinfo only, no host+ "https://user:pass@", # userinfo only, no host],)def test_validate_catalog_url_hostless_rejected(self, project_dir, url):- """Reject host-less URLs whose netloc is truthy but hostname is None.+ """Reject host-less URLs whose netloc is truthy but hostname is None (#3209).``urlparse('https://:8080').netloc`` is ``':8080'`` (truthy) but its``hostname`` is ``None``, so a netloc-based check would accept a URL