Merge pull request #52 from sgallagher/validate

Add more validation for content resolver input
minimization · Sep 5, 2023 · 28b72ed · 28b72ed
2 parents 6792d19 + df0a37e
commit 28b72ed
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 4 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -8,7 +8,7 @@ jobs:
   setup_and_test:
     runs-on: ubuntu-latest
     container: 
-      image: registry.fedoraproject.org/fedora:37
+      image: registry.fedoraproject.org/fedora:38
     steps:
 
     - name: Checkout code

diff --git a/feedback_pipeline.py b/feedback_pipeline.py
@@ -356,6 +356,25 @@ def _load_config_workload(document_id, document, settings):
 
     # Step 1: Mandatory fields
     try:
+        if "data" not in document:
+            raise ConfigError(f"Missing 'data' field in {document_id}")
+
+        for key in document["data"]:
+            if key not in [
+                "arch_packages",
+                "description",
+                "groups",
+                "labels",
+                "maintainer",
+                "modules_disable",
+                "modules_enabled",
+                "name",
+                "options",
+                "package_placeholders",
+                "packages",
+            ]:
+                raise ConfigError(f"Unknown key '{key}' in 'data' section of {document_id}")
+
         # Name is an identifier for humans
         config["name"] = str(document["data"]["name"])
 
@@ -711,6 +730,21 @@ def _load_config_unwanted(document_id, document, settings):
 
     # Step 1: Mandatory fields
     try:
+        if "data" not in document:
+            raise ConfigError(f"Missing 'data' field in {document_id}")
+
+        for key in document["data"]:
+            if key not in [
+                "description",
+                "labels",
+                "maintainer",
+                "name",
+                "unwanted_arch_packages",
+                "unwanted_arch_source_packages",
+                "unwanted_packages",
+                "unwanted_source_packages",
+            ]:
+                raise ConfigError(f"Unknown key '{key}' in 'data' section of {document_id}")
         # Name is an identifier for humans
         config["name"] = str(document["data"]["name"])
 
@@ -921,6 +955,28 @@ def get_configs(settings):
 
 
                 # === Case: Repository config ===
+                if document["document"] not in [
+                    "content-resolver-buildroot",
+                    "content-resolver-compose-view",
+                    "content-resolver-environment",
+                    "content-resolver-label",
+                    "content-resolver-repository",
+                    "content-resolver-unwanted",
+                    "content-resolver-view",
+                    "content-resolver-view-addon",
+                    "content-resolver-workload",
+                    "feedback-pipeline-buildroot",
+                    "feedback-pipeline-compose-view",
+                    "feedback-pipeline-environment",
+                    "feedback-pipeline-label",
+                    "feedback-pipeline-repository",
+                    "feedback-pipeline-unwanted",
+                    "feedback-pipeline-view",
+                    "feedback-pipeline-view-addon",
+                    "feedback-pipeline-workload",
+                ]:
+                    raise ConfigError(f"Unknown document type: {document['document']}")
+
                 if document["document"] in ["content-resolver-repository", "feedback-pipeline-repository"]:
                     if document["version"] == 1:
                         configs["repos"][document_id] = _load_config_repo(document_id, document, settings)

diff --git a/test_config_files.py b/test_config_files.py
diff --git a/test_configs/repo-rawhide.yaml b/test_configs/repo-rawhide.yaml
@@ -40,9 +40,6 @@ data:
 
       everything:
         baseurl: https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/
-
-      modular:
-        baseurl: https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Modular/$basearch/os/
 
     releasever: "rawhide"