[v3-1-test] Handle non-dictionary json payload during logging to avoid internal server error. (#62355) (#62367)

github-actions[bot] · tirkarthi · vatsrahul1001 · commit 5395c9df704f · 2026-03-04T17:38:53.000+05:30
(cherry picked from commit 46a433d) Co-authored-by: Karthikeyan Singaravelan <tir.karthi@gmail.com>
diff --git a/airflow-core/src/airflow/api_fastapi/logging/decorators.py b/airflow-core/src/airflow/api_fastapi/logging/decorators.py
@@ -91,16 +91,16 @@ async def log_action(
             user_display = user.get_name()
 
         has_json_body = "application/json" in request.headers.get("content-type", "") and await request.body()
+        request_body = {}
+        masked_body_json = {}
 
         if has_json_body:
             request_body = await request.json()
-            masked_body_json = {k: secrets_masker.redact(v, k) for k, v in request_body.items()}
-        else:
-            request_body = {}
-            masked_body_json = {}
+            if isinstance(request_body, dict):
+                masked_body_json = {k: secrets_masker.redact(v, k) for k, v in request_body.items()}
 
-        if event_name in skip_dry_run_events and request_body.get("dry_run", True):
-            return
+                if event_name in skip_dry_run_events and request_body.get("dry_run", True):
+                    return
 
         fields_skip_logging = {
             "csrf_token",
diff --git a/airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_dag_run.py b/airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_dag_run.py
@@ -1656,11 +1656,25 @@ def test_should_respond_403(self, unauthorized_test_client):
                     ]
                 },
             ),
+            (
+                [],
+                {
+                    "detail": [
+                        {
+                            "type": "model_attributes_type",
+                            "loc": ["body"],
+                            "msg": "Input should be a valid dictionary or object to extract fields from",
+                            "input": [],
+                        }
+                    ]
+                },
+            ),
         ],
     )
     def test_invalid_data(self, test_client, post_body, expected_detail):
-        now = timezone.utcnow().isoformat()
-        post_body["logical_date"] = now
+        if isinstance(post_body, dict):
+            now = timezone.utcnow().isoformat()
+            post_body["logical_date"] = now
         response = test_client.post(f"/dags/{DAG1_ID}/dagRuns", json=post_body)
         assert response.status_code == 422
         assert response.json() == expected_detail
