This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new a3dd8473e4 Handle invalid JSON metadata in get_logs_with_metadata
endpoint. (#22898)
a3dd8473e4 is described below
commit a3dd8473e4c5bbea214ebc8d5545b75281166428
Author: Karthikeyan Singaravelan <[email protected]>
AuthorDate: Mon Apr 11 16:18:10 2022 +0530
Handle invalid JSON metadata in get_logs_with_metadata endpoint. (#22898)
---
airflow/www/views.py | 11 ++++++++++-
tests/www/views/test_views_log.py | 20 ++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/airflow/www/views.py b/airflow/www/views.py
index f9cebf90b7..ae1520e50a 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -1419,12 +1419,21 @@ class Airflow(AirflowBaseView):
map_index = request.args.get('map_index', -1, type=int)
try_number = request.args.get('try_number', type=int)
metadata = request.args.get('metadata')
- metadata = json.loads(metadata)
response_format = request.args.get('format', 'json')
# metadata may be null
if not metadata:
metadata = {}
+ else:
+ # Validate JSON metadata
+ try:
+ metadata = json.loads(metadata)
+ except json.decoder.JSONDecodeError:
+ error_message = "Invalid JSON metadata"
+ response = jsonify({"error": error_message})
+ response.status_code = 400
+
+ return response
# Convert string datetime into actual datetime
try:
diff --git a/tests/www/views/test_views_log.py
b/tests/www/views/test_views_log.py
index 3460d74304..f697cd3772 100644
--- a/tests/www/views/test_views_log.py
+++ b/tests/www/views/test_views_log.py
@@ -337,6 +337,26 @@ def test_get_logs_with_metadata(log_admin_client,
metadata):
assert 'Log for testing.' in data
+def test_get_logs_with_invalid_metadata(log_admin_client):
+ """Test invalid metadata JSON returns error message"""
+ metadata = "invalid"
+ url_template =
"get_logs_with_metadata?dag_id={}&task_id={}&execution_date={}&try_number={}&metadata={}"
+ response = log_admin_client.get(
+ url_template.format(
+ DAG_ID,
+ TASK_ID,
+ urllib.parse.quote_plus(DEFAULT_DATE.isoformat()),
+ 1,
+ metadata,
+ ),
+ data={"username": "test", "password": "test"},
+ follow_redirects=True,
+ )
+
+ assert response.status_code == 400
+ assert response.json == {"error": "Invalid JSON metadata"}
+
+
@unittest.mock.patch(
"airflow.utils.log.file_task_handler.FileTaskHandler.read",
return_value=(['airflow log line'], [{'end_of_log': True}]),
