Fix : error handling for malformed TOML files

tagbot/action/repo.py

@@ -168,7 +168,12 @@ def _project(self, k: str) -> str:
                 pass  # Try the next filename
         else:
             raise InvalidProject("Project file was not found")
-        self.__project = toml.loads(contents.decoded_content.decode())
+        try:
+            self.__project = toml.loads(contents.decoded_content.decode())
+        except Exception as e:
+            raise InvalidProject(
+                f"Failed to parse Project.toml: {type(e).__name__}: {e}"
+            )
         return str(self.__project[k])
 
     @property
@@ -194,17 +199,24 @@ def _registry_path(self) -> Optional[str]:
             uuid = self._project("uuid").lower()
         except KeyError:
             raise InvalidProject("Project file has no UUID")
-        if self._clone_registry:
-            with open(os.path.join(self._registry_clone_dir, "Registry.toml")) as f:
-                registry = toml.load(f)
-        else:
-            contents = self._only(self._registry.get_contents("Registry.toml"))
-            blob = self._registry.get_git_blob(contents.sha)
-            b64 = b64decode(blob.content)
-            string_contents = b64.decode("utf8")
-            registry = toml.loads(string_contents)
+        try:
+            if self._clone_registry:
+                with open(os.path.join(self._registry_clone_dir, "Registry.toml")) as f:
+                    registry = toml.load(f)
+            else:
+                contents = self._only(self._registry.get_contents("Registry.toml"))
+                blob = self._registry.get_git_blob(contents.sha)
+                b64 = b64decode(blob.content)
+                string_contents = b64.decode("utf8")
+                registry = toml.loads(string_contents)
+        except Exception as e:
+            logger.warning(
+                f"Failed to load Registry.toml: {type(e).__name__}: {e}. "
+                "This may indicate a temporary issue with the registry file."
+            )
+            return None
 
-        if uuid in registry["packages"]:
+        if uuid in registry.get("packages", {}):
             self.__registry_path = registry["packages"][uuid]["path"]
             return self.__registry_path
         return None
@@ -219,7 +231,12 @@ def _registry_url(self) -> Optional[str]:
             contents = self._only(self._registry.get_contents(f"{root}/Package.toml"))
         except UnknownObjectExceptions:
             raise InvalidProject("Package.toml was not found")
-        package = toml.loads(contents.decoded_content.decode())
+        try:
+            package = toml.loads(contents.decoded_content.decode())
+        except Exception as e:
+            raise InvalidProject(
+                f"Failed to parse Package.toml: {type(e).__name__}: {e}"
+            )
         self.__registry_url = package["repo"]
         return self.__registry_url
 

test/action/test_repo.py

@@ -97,6 +97,17 @@ def test_project():
         r._project("name")
 
 
+def test_project_malformed_toml():
+    """Test that malformed Project.toml raises InvalidProject."""
+    r = _repo()
+    r._repo.get_contents = Mock(
+        return_value=Mock(decoded_content=b"""name = "FooBar"\nuuid""")
+    )
+    r._Repo__project = None
+    with pytest.raises(InvalidProject, match="Failed to parse Project.toml"):
+        r._project("name")
+
+
 def test_project_subdir():
     r = _repo(subdir="path/to/FooBar.jl")
     r._repo.get_contents = Mock(
@@ -159,6 +170,17 @@ def test_registry_url():
     assert r._registry.get_contents.call_count == 1
 
 
+def test_registry_url_malformed_toml():
+    """Test that malformed Package.toml raises InvalidProject."""
+    r = _repo()
+    r._Repo__registry_path = "E/Example"
+    r._registry = Mock()
+    # Malformed TOML content
+    r._registry.get_contents.return_value.decoded_content = b"name = "
+    with pytest.raises(InvalidProject, match="Failed to parse Package.toml"):
+        _ = r._registry_url
+
+
 def test_release_branch():
     r = _repo()
     r._repo = Mock(default_branch="a")