Skip to content

Fix: Apply DAG permission filter to dashboard (closes #53938) #54126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pierrejeambrun merged 1 commit into from
Aug 7, 2025
Merged

Fix: Apply DAG permission filter to dashboard (closes #53938) #54126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion airflow-core/src/airflow/api_fastapi/core_api/routes/ui/dashboard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
HistoricalMetricDataResponse,
)
from airflow.api_fastapi.core_api.openapi.exceptions import create_openapi_http_exception_doc
from airflow.api_fastapi.core_api.security import requires_access_dag
from airflow.api_fastapi.core_api.security import ReadableDagsFilterDep, requires_access_dag
from airflow.models.dag import DagModel
from airflow.models.dagrun import DagRun, DagRunType
from airflow.models.taskinstance import TaskInstance
Expand All @@ -50,17 +50,20 @@
def historical_metrics(
session: SessionDep,
start_date: DateTimeQuery,
readable_dags_filter: ReadableDagsFilterDep,
end_date: OptionalDateTimeQuery = None,
) -> HistoricalMetricDataResponse:
"""Return cluster activity historical metrics."""
current_time = timezone.utcnow()
permitted_dag_ids = readable_dags_filter.value
# DagRuns
dag_run_types = session.execute(
select(DagRun.run_type, func.count(DagRun.run_id))
.where(
func.coalesce(DagRun.start_date, current_time) >= start_date,
func.coalesce(DagRun.end_date, current_time) <= func.coalesce(end_date, current_time),
)
.where(DagRun.dag_id.in_(permitted_dag_ids))
.group_by(DagRun.run_type)
).all()

Expand All @@ -70,6 +73,7 @@ def historical_metrics(
func.coalesce(DagRun.start_date, current_time) >= start_date,
func.coalesce(DagRun.end_date, current_time) <= func.coalesce(end_date, current_time),
)
.where(DagRun.dag_id.in_(permitted_dag_ids))
.group_by(DagRun.state)
).all()

Expand All @@ -81,6 +85,7 @@ def historical_metrics(
func.coalesce(DagRun.start_date, current_time) >= start_date,
func.coalesce(DagRun.end_date, current_time) <= func.coalesce(end_date, current_time),
)
.where(DagRun.dag_id.in_(permitted_dag_ids))
.group_by(TaskInstance.state)
).all()

Expand Down Expand Up @@ -110,11 +115,14 @@ def historical_metrics(
)
def dag_stats(
session: SessionDep,
readable_dags_filter: ReadableDagsFilterDep,
) -> DashboardDagStatsResponse:
"""Return basic DAG stats with counts of DAGs in various states."""
permitted_dag_ids = readable_dags_filter.value
latest_dates_subq = (
select(DagRun.dag_id, func.max(DagRun.logical_date).label("max_logical_date"))
.where(DagRun.logical_date.is_not(None))
.where(DagRun.dag_id.in_(permitted_dag_ids))
.group_by(DagRun.dag_id)
.subquery()
)
Expand All @@ -131,6 +139,7 @@ def dag_stats(
(DagRun.dag_id == latest_dates_subq.c.dag_id)
& (DagRun.logical_date == latest_dates_subq.c.max_logical_date),
)
.where(DagRun.dag_id.in_(permitted_dag_ids))
.cte()
)

Expand Down