Fix: reject non-dict user_args/barcode_tag_mapping in config API

JSONField(binary=True) accepts any JSON value, so a truthy non-dict
(bool/int/list/string) silently passed validation and later crashed
tesseract.py's OCR arg merge or barcodes.py's Barcode.is_tag.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

src/documents/bulk_edit.py

@@ -899,26 +899,17 @@ def edit_pdf(
     pdf_docs: list[pikepdf.Pdf] = []
 
     try:
-        if not operations:
-            raise ValueError("Output document index is out of bounds")
-
-        max_idx = max(op.get("doc", 0) for op in operations)
-        if update_document and max_idx > 0:
-            logger.error(
-                "Update requested but multiple output documents specified",
-            )
-            raise ValueError("Multiple output documents specified")
-
-        if any(
-            op.get("doc", 0) < 0 or op.get("doc", 0) >= len(operations)
-            for op in operations
-        ):
-            raise ValueError("Output document index is out of bounds")
-
         with pikepdf.open(pair.source_doc.source_path) as src:
             # prepare output documents
+            max_idx = max(op.get("doc", 0) for op in operations)
             pdf_docs = [pikepdf.new() for _ in range(max_idx + 1)]
 
+            if update_document and len(pdf_docs) > 1:
+                logger.error(
+                    "Update requested but multiple output documents specified",
+                )
+                raise ValueError("Multiple output documents specified")
+
             for op in operations:
                 dst = pdf_docs[op.get("doc", 0)]
                 page = src.pages[op["page"] - 1]

src/documents/serialisers.py

@@ -1749,18 +1749,8 @@ class MergeDocumentsAsVersionsSerializer(DocumentListSerializer):
         return attrs
 
 
-class PdfEditOperationSerializer(serializers.Serializer[dict[str, int]]):
-    page = serializers.IntegerField(min_value=1)
-    rotate = serializers.IntegerField(required=False)
-    doc = serializers.IntegerField(required=False, min_value=0)
-
-
 class EditPdfDocumentsSerializer(DocumentListSerializer, SourceModeValidationMixin):
-    operations = serializers.ListField(
-        child=PdfEditOperationSerializer(),
-        required=True,
-        allow_empty=False,
-    )
+    operations = serializers.ListField(required=True)
     delete_original = serializers.BooleanField(required=False, default=False)
     update_document = serializers.BooleanField(required=False, default=False)
     include_metadata = serializers.BooleanField(required=False, default=True)
@@ -1778,9 +1768,18 @@ class EditPdfDocumentsSerializer(DocumentListSerializer, SourceModeValidationMix
             )
 
         operations = attrs["operations"]
+        if not isinstance(operations, list):
+            raise serializers.ValidationError("operations must be a list")
 
-        if any(op.get("doc", 0) >= len(operations) for op in operations):
-            raise serializers.ValidationError("doc index is out of bounds")
+        for op in operations:
+            if not isinstance(op, dict):
+                raise serializers.ValidationError("invalid operation entry")
+            if "page" not in op or not isinstance(op["page"], int):
+                raise serializers.ValidationError("page must be an integer")
+            if "rotate" in op and not isinstance(op["rotate"], int):
+                raise serializers.ValidationError("rotate must be an integer")
+            if "doc" in op and not isinstance(op["doc"], int):
+                raise serializers.ValidationError("doc must be an integer")
 
         if attrs["update_document"]:
             max_idx = max(op.get("doc", 0) for op in operations)
@@ -1792,7 +1791,7 @@ class EditPdfDocumentsSerializer(DocumentListSerializer, SourceModeValidationMix
         doc = Document.objects.get(id=documents[0])
         if doc.page_count:
             for op in operations:
-                if op["page"] > doc.page_count:
+                if op["page"] < 1 or op["page"] > doc.page_count:
                     raise serializers.ValidationError(
                         f"Page {op['page']} is out of bounds for document with {doc.page_count} pages.",
                     )
@@ -2123,15 +2122,17 @@ class BulkEditSerializer(
     def _validate_parameters_edit_pdf(self, parameters, document_id) -> None:
         if "operations" not in parameters:
             raise serializers.ValidationError("operations not specified")
-        operations_field = serializers.ListField(
-            child=PdfEditOperationSerializer(),
-            allow_empty=False,
-        )
-        parameters["operations"] = operations_field.run_validation(
-            parameters["operations"],
-        )
-        operations = parameters["operations"]
-
+        if not isinstance(parameters["operations"], list):
+            raise serializers.ValidationError("operations must be a list")
+        for op in parameters["operations"]:
+            if not isinstance(op, dict):
+                raise serializers.ValidationError("invalid operation entry")
+            if "page" not in op or not isinstance(op["page"], int):
+                raise serializers.ValidationError("page must be an integer")
+            if "rotate" in op and not isinstance(op["rotate"], int):
+                raise serializers.ValidationError("rotate must be an integer")
+            if "doc" in op and not isinstance(op["doc"], int):
+                raise serializers.ValidationError("doc must be an integer")
         if "update_document" in parameters:
             if not isinstance(parameters["update_document"], bool):
                 raise serializers.ValidationError("update_document must be a boolean")
@@ -2143,11 +2144,8 @@ class BulkEditSerializer(
         else:
             parameters["include_metadata"] = True
 
-        if any(op.get("doc", 0) >= len(operations) for op in operations):
-            raise serializers.ValidationError("doc index is out of bounds")
-
         if parameters["update_document"]:
-            max_idx = max(op.get("doc", 0) for op in operations)
+            max_idx = max(op.get("doc", 0) for op in parameters["operations"])
             if max_idx > 0:
                 raise serializers.ValidationError(
                     "update_document only allowed with a single output document",
@@ -2156,8 +2154,8 @@ class BulkEditSerializer(
         doc = Document.objects.get(id=document_id)
         # doc existence is already validated
         if doc.page_count:
-            for op in operations:
-                if op["page"] > doc.page_count:
+            for op in parameters["operations"]:
+                if op["page"] < 1 or op["page"] > doc.page_count:
                     raise serializers.ValidationError(
                         f"Page {op['page']} is out of bounds for document with {doc.page_count} pages.",
                     )

src/documents/tests/test_api_app_config.py

@@ -194,6 +194,56 @@ class TestApiAppConfig(DirectoriesMixin, APITestCase):
         self.assertEqual(config.language, None)
         self.assertEqual(config.barcode_tag_mapping, None)
 
+    def test_api_update_config_rejects_non_dict_user_args(self) -> None:
+        """
+        GIVEN:
+            - API request to update app config with a JSON-encoded non-dict
+              value (e.g. a bare string) for the user_args JSONField
+        WHEN:
+            - API is called
+        THEN:
+            - Request is rejected with a 400, not silently accepted
+            - Config is not updated
+        """
+        response = self.client.patch(
+            f"{self.ENDPOINT}1/",
+            json.dumps(
+                {
+                    "user_args": json.dumps("not a dict"),
+                },
+            ),
+            content_type="application/json",
+        )
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        config = ApplicationConfiguration.objects.first()
+        assert config is not None
+        self.assertEqual(config.user_args, None)
+
+    def test_api_update_config_rejects_non_dict_barcode_tag_mapping(self) -> None:
+        """
+        GIVEN:
+            - API request to update app config with a JSON-encoded non-dict
+              value (e.g. a bare list) for the barcode_tag_mapping JSONField
+        WHEN:
+            - API is called
+        THEN:
+            - Request is rejected with a 400, not silently accepted
+            - Config is not updated
+        """
+        response = self.client.patch(
+            f"{self.ENDPOINT}1/",
+            json.dumps(
+                {
+                    "barcode_tag_mapping": json.dumps([1, 2, 3]),
+                },
+            ),
+            content_type="application/json",
+        )
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        config = ApplicationConfiguration.objects.first()
+        assert config is not None
+        self.assertEqual(config.barcode_tag_mapping, None)
+
     def test_api_replace_app_logo(self) -> None:
         """
         GIVEN:

src/documents/tests/test_api_bulk_edit.py

@@ -1649,24 +1649,6 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
 
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
-    def test_legacy_bulk_edit_rejects_out_of_bounds_pdf_doc_index(self) -> None:
-        response = self.client.post(
-            "/api/documents/bulk_edit/",
-            json.dumps(
-                {
-                    "documents": [self.doc2.id],
-                    "method": "edit_pdf",
-                    "parameters": {
-                        "operations": [{"page": 1, "doc": 2**32}],
-                    },
-                },
-            ),
-            content_type="application/json",
-        )
-
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        self.assertIn(b"doc index is out of bounds", response.content)
-
     @mock.patch("documents.views.bulk_edit.edit_pdf")
     def test_edit_pdf(self, m) -> None:
         self.setup_mock(m, "edit_pdf")
@@ -1728,7 +1710,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
             content_type="application/json",
         )
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        self.assertIn(b"Expected a dictionary", response.content)
+        self.assertIn(b"invalid operation entry", response.content)
 
         response = self.client.post(
             "/api/documents/edit_pdf/",
@@ -1741,7 +1723,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
             content_type="application/json",
         )
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        self.assertIn(b"valid integer is required", response.content)
+        self.assertIn(b"page must be an integer", response.content)
 
         response = self.client.post(
             "/api/documents/edit_pdf/",
@@ -1754,7 +1736,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
             content_type="application/json",
         )
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        self.assertIn(b"valid integer is required", response.content)
+        self.assertIn(b"rotate must be an integer", response.content)
 
         response = self.client.post(
             "/api/documents/edit_pdf/",
@@ -1767,29 +1749,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
             content_type="application/json",
         )
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        self.assertIn(b"valid integer is required", response.content)
-
-        # A negative doc index is rejected by PdfEditOperationSerializer's
-        # own min_value=0 field constraint, before the "doc index is out
-        # of bounds" object-level check (against len(operations)) ever
-        # runs -- hence the different expected message per case.
-        for doc_index, expected_message in (
-            (-1, b"greater than or equal to 0"),
-            (2**32, b"doc index is out of bounds"),
-        ):
-            with self.subTest(doc_index=doc_index):
-                response = self.client.post(
-                    "/api/documents/edit_pdf/",
-                    json.dumps(
-                        {
-                            "documents": [self.doc2.id],
-                            "operations": [{"page": 1, "doc": doc_index}],
-                        },
-                    ),
-                    content_type="application/json",
-                )
-                self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-                self.assertIn(expected_message, response.content)
+        self.assertIn(b"doc must be an integer", response.content)
 
         response = self.client.post(
             "/api/documents/edit_pdf/",
@@ -1797,7 +1757,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
                 {
                     "documents": [self.doc2.id],
                     "update_document": True,
-                    "operations": [{"page": 1, "doc": 0}, {"page": 2, "doc": 1}],
+                    "operations": [{"page": 1, "doc": 1}, {"page": 2, "doc": 2}],
                 },
             ),
             content_type="application/json",
@@ -1822,86 +1782,6 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertIn(b"Invalid source_mode", response.content)
 
-    @mock.patch("documents.views.bulk_edit.edit_pdf")
-    def test_edit_pdf_rejects_empty_operations(self, m) -> None:
-        """
-        An empty operations list previously reached bulk_edit.edit_pdf()
-        and crashed with `ValueError: max() iterable argument is empty`
-        (via `max(op.get("doc", 0) for op in operations)`) whenever
-        update_document was true. Must now be rejected up front.
-        """
-        self.setup_mock(m, "edit_pdf")
-        response = self.client.post(
-            "/api/documents/edit_pdf/",
-            json.dumps(
-                {
-                    "documents": [self.doc2.id],
-                    "operations": [],
-                    "update_document": True,
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        m.assert_not_called()
-
-    @mock.patch("documents.views.bulk_edit.edit_pdf")
-    def test_edit_pdf_rejects_negative_doc_index(self, m) -> None:
-        """
-        A negative `doc` index was previously silently accepted and used
-        as a wrapping Python list index instead of being rejected.
-        """
-        self.setup_mock(m, "edit_pdf")
-        response = self.client.post(
-            "/api/documents/edit_pdf/",
-            json.dumps(
-                {
-                    "documents": [self.doc2.id],
-                    "operations": [{"page": 1, "doc": -1}],
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        m.assert_not_called()
-
-    @mock.patch("documents.views.bulk_edit.edit_pdf")
-    def test_edit_pdf_rejects_out_of_bounds_doc_index(self, m) -> None:
-        """
-        A `doc` index far larger than the number of operations previously
-        drove `pdf_docs = [pikepdf.new() for _ in range(max_idx + 1)]` to
-        attempt allocating an enormous number of real objects.
-        """
-        self.setup_mock(m, "edit_pdf")
-        response = self.client.post(
-            "/api/documents/edit_pdf/",
-            json.dumps(
-                {
-                    "documents": [self.doc2.id],
-                    "operations": [{"page": 1, "doc": 2**33}],
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        m.assert_not_called()
-
-    @mock.patch("documents.views.bulk_edit.edit_pdf")
-    def test_edit_pdf_rejects_non_positive_page(self, m) -> None:
-        self.setup_mock(m, "edit_pdf")
-        response = self.client.post(
-            "/api/documents/edit_pdf/",
-            json.dumps(
-                {
-                    "documents": [self.doc2.id],
-                    "operations": [{"page": 0}],
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        m.assert_not_called()
-
     @mock.patch("documents.views.bulk_edit.edit_pdf")
     def test_edit_pdf_page_out_of_bounds(self, m) -> None:
         self.setup_mock(m, "edit_pdf")
@@ -1919,46 +1799,6 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         self.assertIn(b"out of bounds", response.content)
         m.assert_not_called()
 
-    @mock.patch("documents.serialisers.bulk_edit.edit_pdf")
-    def test_bulk_edit_edit_pdf_rejects_empty_operations(self, m) -> None:
-        """
-        Same validation gap as test_edit_pdf_rejects_empty_operations, but
-        via the legacy generic /api/documents/bulk_edit/ method="edit_pdf"
-        path, which hand-parses `parameters["operations"]` independently
-        in BulkEditSerializer._validate_parameters_edit_pdf.
-        """
-        self.setup_mock(m, "edit_pdf")
-        response = self.client.post(
-            "/api/documents/bulk_edit/",
-            json.dumps(
-                {
-                    "documents": [self.doc2.id],
-                    "method": "edit_pdf",
-                    "parameters": {"operations": [], "update_document": True},
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        m.assert_not_called()
-
-    @mock.patch("documents.serialisers.bulk_edit.edit_pdf")
-    def test_bulk_edit_edit_pdf_rejects_out_of_bounds_doc_index(self, m) -> None:
-        self.setup_mock(m, "edit_pdf")
-        response = self.client.post(
-            "/api/documents/bulk_edit/",
-            json.dumps(
-                {
-                    "documents": [self.doc2.id],
-                    "method": "edit_pdf",
-                    "parameters": {"operations": [{"page": 1, "doc": 2**33}]},
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        m.assert_not_called()
-
     @mock.patch("documents.views.bulk_edit.edit_pdf")
     def test_edit_pdf_insufficient_permissions(self, m) -> None:
         self.doc1.owner = User.objects.get(username="temp_admin")

src/documents/tests/test_bulk_edit.py

@@ -1642,17 +1642,6 @@ class TestPDFActions(DirectoriesMixin, TestCase):
         mock_group.assert_not_called()
         mock_consume_file.assert_not_called()
 
-    @mock.patch("pikepdf.open")
-    def test_edit_pdf_rejects_out_of_bounds_output_index(self, mock_open) -> None:
-        with self.assertLogs("paperless.bulk_edit", level="ERROR"):
-            with self.assertRaisesRegex(ValueError, "index is out of bounds"):
-                bulk_edit.edit_pdf(
-                    [self.doc2.id],
-                    [{"page": 1, "doc": 2**32}],
-                )
-
-        mock_open.assert_not_called()
-
     @mock.patch("documents.bulk_edit.update_document_content_maybe_archive_file.delay")
     @mock.patch("documents.tasks.consume_file.apply_async")
     @mock.patch("documents.bulk_edit.tempfile.mkdtemp")

src/paperless/serialisers.py

@@ -235,6 +235,20 @@ class ApplicationConfigurationSerializer(
     ) -> list[str]:
         return sorted(name for name in os.environ if name.startswith("PAPERLESS_"))
 
+    def validate_user_args(self, value):
+        if value is not None and not isinstance(value, dict):
+            raise serializers.ValidationError(
+                "user_args must be a JSON object.",
+            )
+        return value
+
+    def validate_barcode_tag_mapping(self, value):
+        if value is not None and not isinstance(value, dict):
+            raise serializers.ValidationError(
+                "barcode_tag_mapping must be a JSON object.",
+            )
+        return value
+
     def run_validation(self, data):
         # Empty strings treated as None to avoid unexpected behavior
         if "user_args" in data and data["user_args"] == "":