@@ -2019,7 +2019,7 @@ def test_should_respond_200(
20192019 session .commit ()
20202020 assert event .timestamp
20212021
2022- with assert_queries_count (4 ):
2022+ with assert_queries_count (7 ):
20232023 response = test_client .get (
20242024 "/dags/TEST_DAG_ID/dagRuns/TEST_DAG_RUN_ID/upstreamAssetEvents" ,
20252025 )
@@ -2102,7 +2102,7 @@ def test_query_count_does_not_scale_with_consumed_events(
21022102 session .commit ()
21032103
21042104 # Constant regardless of the number of consumed events (parametrized 1 vs 5).
2105- with assert_queries_count (4 ):
2105+ with assert_queries_count (7 ):
21062106 response = test_client .get ("/dags/TEST_DAG_ID/dagRuns/TEST_DAG_RUN_ID/upstreamAssetEvents" )
21072107
21082108 assert response .status_code == 200
@@ -2116,6 +2116,90 @@ def test_query_count_does_not_scale_with_consumed_events(
21162116 assert triggering_by_event [newest_event_id ] is True
21172117 assert all (value is False for eid , value in triggering_by_event .items () if eid != newest_event_id )
21182118
2119+ def _create_consuming_run_with_events (self , dag_maker , session ):
2120+ """
2121+ Create a run consuming three events: one per source Dag, one with no source Dag.
2122+
2123+ Returns the asset ids keyed by index and the event ids keyed by scenario.
2124+ """
2125+ asset_ids = {}
2126+ for index in (1 , 2 ):
2127+ asset = AssetModel (name = f"ds{ index } " , uri = f"file:///da{ index } " , group = "asset" )
2128+ session .add (asset )
2129+ session .flush ()
2130+ asset_ids [index ] = asset .id
2131+ events = {
2132+ "dag_a" : AssetEvent (asset_id = asset_ids [1 ], source_dag_id = "source_dag_a" , timestamp = START_DATE1 ),
2133+ "dag_b" : AssetEvent (asset_id = asset_ids [2 ], source_dag_id = "source_dag_b" , timestamp = START_DATE1 ),
2134+ "dagless" : AssetEvent (asset_id = asset_ids [1 ], timestamp = START_DATE1 ),
2135+ }
2136+ session .add_all (events .values ())
2137+ session .flush ()
2138+ with dag_maker (
2139+ dag_id = "TEST_DAG_ID" , start_date = START_DATE1 , schedule = timedelta (days = 1 ), session = session
2140+ ):
2141+ pass
2142+ dag_run = dag_maker .create_dagrun (run_id = "TEST_DAG_RUN_ID" , run_type = DagRunType .ASSET_TRIGGERED )
2143+ dag_run .consumed_asset_events .extend (events .values ())
2144+ session .commit ()
2145+ return asset_ids , {key : event .id for key , event in events .items ()}
2146+
2147+ @pytest .mark .parametrize (
2148+ ("readable_dags" , "expected_events" ),
2149+ [
2150+ pytest .param (["source_dag_a" ], ["dag_a" , "dagless" ], id = "one-readable-source-dag-plus-dagless" ),
2151+ pytest .param (
2152+ ["source_dag_a" , "source_dag_b" ],
2153+ ["dag_a" , "dag_b" , "dagless" ],
2154+ id = "both-source-dags-readable" ,
2155+ ),
2156+ pytest .param ([], ["dagless" ], id = "no-readable-source-dags-still-sees-dagless" ),
2157+ ],
2158+ )
2159+ @mock .patch (
2160+ "airflow.api_fastapi.auth.managers.base_auth_manager.BaseAuthManager.get_authorized_dag_ids" ,
2161+ autospec = True ,
2162+ )
2163+ def test_returns_only_events_from_source_dags_the_caller_may_read (
2164+ self , mock_get_authorized_dag_ids , test_client , dag_maker , session , readable_dags , expected_events
2165+ ):
2166+ """Reading the consuming run must not expose events produced by Dags the caller cannot read."""
2167+ mock_get_authorized_dag_ids .return_value = set (readable_dags )
2168+ _ , event_ids = self ._create_consuming_run_with_events (dag_maker , session )
2169+ expected_ids = [event_ids [key ] for key in expected_events ]
2170+
2171+ response = test_client .get ("/dags/TEST_DAG_ID/dagRuns/TEST_DAG_RUN_ID/upstreamAssetEvents" )
2172+
2173+ assert response .status_code == 200
2174+ body = response .json ()
2175+ assert [event ["id" ] for event in body ["asset_events" ]] == expected_ids
2176+ # The count must be scoped too, so the existence of hidden events does not leak.
2177+ assert body ["total_entries" ] == len (expected_ids )
2178+
2179+ @mock .patch (
2180+ "airflow.api_fastapi.auth.managers.base_auth_manager.BaseAuthManager.get_authorized_dag_ids" ,
2181+ autospec = True ,
2182+ )
2183+ @mock .patch (
2184+ "airflow.api_fastapi.auth.managers.base_auth_manager.BaseAuthManager.get_authorized_assets" ,
2185+ autospec = True ,
2186+ )
2187+ def test_returns_only_events_of_assets_the_caller_may_read (
2188+ self , mock_get_authorized_assets , mock_get_authorized_dag_ids , test_client , dag_maker , session
2189+ ):
2190+ """An event of an asset the caller cannot read is hidden even when its source Dag is readable."""
2191+ asset_ids , event_ids = self ._create_consuming_run_with_events (dag_maker , session )
2192+ mock_get_authorized_dag_ids .return_value = {"source_dag_a" , "source_dag_b" }
2193+ mock_get_authorized_assets .return_value = {asset_ids [2 ]}
2194+
2195+ response = test_client .get ("/dags/TEST_DAG_ID/dagRuns/TEST_DAG_RUN_ID/upstreamAssetEvents" )
2196+
2197+ assert response .status_code == 200
2198+ body = response .json ()
2199+ assert [event ["id" ] for event in body ["asset_events" ]] == [event_ids ["dag_b" ]]
2200+ assert {event ["uri" ] for event in body ["asset_events" ]} == {"file:///da2" }
2201+ assert body ["total_entries" ] == 1
2202+
21192203 def test_should_respond_401 (self , unauthenticated_test_client ):
21202204 response = unauthenticated_test_client .get (
21212205 "/dags/TEST_DAG_ID/dagRuns/TEST_DAG_RUN_ID/upstreamAssetEvents" ,
0 commit comments