feat: disallow relative paths with any depth other than zero

fix: update test

fix test

fix again

Author: ryuwd

diracx-core/src/diracx/core/models/replica_catalog.py

@@ -57,13 +57,18 @@
 def _validate_lfn(value: str) -> str:
     """Validate and normalize Logical File Name.
 
-    Removes LFN: prefix if present and ensures it's a valid absolute path.
+    Removes LFN: prefix if present and ensures it's a valid absolute path or a filename without slashes.
     """
     value = value.removeprefix("LFN:")
-    # if not value.startswith("/"):
-    #     raise ValueError(f"LFN must start with '/': {value}")
     if not value:
         raise ValueError("LFN cannot be empty")
+    # Either it has a slash at the start or there can be no slashes at all
+    if not value.startswith("/"):
+        if "/" in value:
+            raise ValueError(
+                "LFN must be an absolute path starting with '/' "
+                "or have no slashes at all (e.g. refers to a file in the current working directory)."
+            )
     return value
 
 
@@ -192,8 +197,8 @@ def validate_replicas(cls, v: list) -> list:
         @field_validator("size_bytes")
         @classmethod
         def validate_size_bytes(cls, v: int | None) -> int | None:
-            if v is not None and v < 0:
-                raise ValueError(f"Size in bytes cannot be negative: {v}")
+            if v is not None and v <= 0:
+                raise ValueError(f"Size in bytes cannot be zero or negative: {v}")
             return v
 
     root: dict[LFN, CatalogEntry]

diracx-core/tests/test_replica_catalog.py

@@ -184,7 +184,9 @@ def test_entry_empty_replicas_raises_error(self):
 
     def test_entry_negative_size_raises_error(self):
         """Test that negative size_bytes raises ValueError."""
-        with pytest.raises(ValueError, match="Size in bytes cannot be negative"):
+        with pytest.raises(
+            ValueError, match="Size in bytes cannot be zero or negative"
+        ):
             ReplicaCatalog.CatalogEntry(
                 replicas=[
                     ReplicaCatalog.CatalogEntry.Replica(
@@ -194,20 +196,20 @@ def test_entry_negative_size_raises_error(self):
                 size_bytes=-1,
             )
 
-    def test_entry_zero_size_is_valid(self):
-        """Test that zero size_bytes is valid."""
-        entry = ReplicaCatalog.CatalogEntry(
-            replicas=[
-                ReplicaCatalog.CatalogEntry.Replica(
-                    url="https://example.com/file.dst", se="SE1"
-                )
-            ],
-            size_bytes=0,
-        )
-        assert entry.size_bytes == 0
-
+    def test_entry_zero_size_is_invalid(self):
+        """Test that zero size_bytes is invalid."""
+        with pytest.raises(
+            ValueError, match="Size in bytes cannot be zero or negative"
+        ):
+            ReplicaCatalog.CatalogEntry(
+                replicas=[
+                    ReplicaCatalog.CatalogEntry.Replica(
+                        url="https://example.com/file.dst", se="SE1"
+                    )
+                ],
+                size_bytes=0,
+            )
 
-class TestReplicaCatalogReplica:
     """Tests for ReplicaCatalog.CatalogEntry.Replica model."""
 
     def test_valid_replica(self):