diff --git a/airflow/www/views.py b/airflow/www/views.py index 5a6faece479e6..6bb5c47fa1192 100644 --- a/airflow/www/views.py +++ b/airflow/www/views.py @@ -1519,8 +1519,13 @@ def trigger(self, session=None): if request_conf: try: run_conf = json.loads(request_conf) + if not isinstance(conf, dict): + flash("Invalid JSON configuration, must be a dict", "error") + return self.render_template( + 'airflow/trigger.html', dag_id=dag_id, origin=origin, conf=request_conf + ) except json.decoder.JSONDecodeError: - flash("Invalid JSON configuration", "error") + flash("Invalid JSON configuration, not parseable", "error") return self.render_template( 'airflow/trigger.html', dag_id=dag_id, origin=origin, conf=request_conf ) diff --git a/tests/api_connexion/endpoints/test_dag_run_endpoint.py b/tests/api_connexion/endpoints/test_dag_run_endpoint.py index 4ea91107eaf3c..482cbeaeedc2f 100644 --- a/tests/api_connexion/endpoints/test_dag_run_endpoint.py +++ b/tests/api_connexion/endpoints/test_dag_run_endpoint.py @@ -945,6 +945,26 @@ def test_should_response_400_for_naive_datetime_and_bad_datetime(self, data, exp assert response.status_code == 400 assert response.json['detail'] == expected + @parameterized.expand( + [ + ( + { + "dag_run_id": "TEST_DAG_RUN", + "execution_date": "2020-06-11T18:00:00+00:00", + "conf": "some string", + }, + "'some string' is not of type 'object' - 'conf'", + ) + ] + ) + def test_should_response_400_for_non_dict_dagrun_conf(self, data, expected): + self._create_dag("TEST_DAG_ID") + response = self.client.post( + "api/v1/dags/TEST_DAG_ID/dagRuns", json=data, environ_overrides={'REMOTE_USER': "test"} + ) + assert response.status_code == 400 + assert response.json['detail'] == expected + def test_response_404(self): response = self.client.post( "api/v1/dags/TEST_DAG_ID/dagRuns", diff --git a/tests/www/api/experimental/test_endpoints.py b/tests/www/api/experimental/test_endpoints.py index 8c6734c7a4ca8..a63b0bb327649 100644 --- a/tests/www/api/experimental/test_endpoints.py +++ b/tests/www/api/experimental/test_endpoints.py @@ -148,9 +148,25 @@ def test_dag_paused(self): def test_trigger_dag(self): url_template = '/api/experimental/dags/{}/dag_runs' run_id = 'my_run' + utcnow().isoformat() + + # Test error for nonexistent dag + response = self.client.post( + url_template.format('does_not_exist_dag'), data=json.dumps({}), content_type="application/json" + ) + assert 404 == response.status_code + + # Test error for bad conf data response = self.client.post( url_template.format('example_bash_operator'), - data=json.dumps({'run_id': run_id}), + data=json.dumps({'conf': 'This is a string not a dict'}), + content_type="application/json", + ) + assert 400 == response.status_code + + # Test OK case + response = self.client.post( + url_template.format('example_bash_operator'), + data=json.dumps({'run_id': run_id, 'conf': {'param': 'value'}}), content_type="application/json", ) self.assert_deprecated(response) @@ -168,12 +184,6 @@ def test_trigger_dag(self): assert run_id == dag_run_id assert dag_run_id == response['run_id'] - # Test error for nonexistent dag - response = self.client.post( - url_template.format('does_not_exist_dag'), data=json.dumps({}), content_type="application/json" - ) - assert 404 == response.status_code - def test_trigger_dag_for_date(self): url_template = '/api/experimental/dags/{}/dag_runs' dag_id = 'example_bash_operator' diff --git a/tests/www/views/test_views_trigger_dag.py b/tests/www/views/test_views_trigger_dag.py index fdd80b6a0a15e..b36f89189eeaf 100644 --- a/tests/www/views/test_views_trigger_dag.py +++ b/tests/www/views/test_views_trigger_dag.py @@ -78,6 +78,17 @@ def test_trigger_dag_conf_malformed(admin_client): assert run is None +def test_trigger_dag_conf_not_dict(admin_client): + test_dag_id = "example_bash_operator" + + response = admin_client.post(f'trigger?dag_id={test_dag_id}', data={'conf': 'string and not a dict'}) + check_content_in_response('must be a dict', response) + + with create_session() as session: + run = session.query(DagRun).filter(DagRun.dag_id == test_dag_id).first() + assert run is None + + def test_trigger_dag_form(admin_client): test_dag_id = "example_bash_operator" resp = admin_client.get(f'trigger?dag_id={test_dag_id}')