:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.
Python ab-testingai-analyticsanalyticscdpdata-warehouseexperimentsfeature-flagsjavascriptproduct-analyticspythonreactsession-replaysurveystypescriptweb-analytics
fix(flags): stop per-flag queries in matching_ids access check (#126561)
Paul D'Ambra4613a4c26548
diff --git a/products/feature_flags/backend/api/feature_flag.py b/products/feature_flags/backend/api/feature_flag.pyindex faa5591f7dc0..4c9376cfd5ef 100644--- a/products/feature_flags/backend/api/feature_flag.py+++ b/products/feature_flags/backend/api/feature_flag.py@@ -5,6 +5,7 @@ import copyimport jsonimport mathimport logging+import builtinsimport functoolsfrom collections.abc import Callable, Iterable, Iterator, Mapping, Sequencefrom contextlib import nullcontext@@ -5190,6 +5191,21 @@ class FeatureFlagViewSet(return Response(response_data)+ def _ids_user_can_edit(self, queryset: QuerySet[FeatureFlag]) -> builtins.list[int]:+ """IDs of the flags in `queryset` that the user can edit, with the same check as the serializer's `get_can_edit`."""+ from products.access_control.backend.facade.user_access_control import access_level_satisfied_for_resource++ # The access check reads created_by_id, so a deferred column costs a query per flag+ flags = list(queryset.only("id", "created_by_id"))+ self.user_access_control.preload_object_access_controls(cast(list, flags))++ editable_ids = []+ for flag in flags:+ user_access_level = self.user_access_control.get_user_access_level(flag)+ if user_access_level and access_level_satisfied_for_resource("feature_flag", user_access_level, "editor"):+ editable_ids.append(flag.id)+ return editable_ids+@action(methods=["GET"], detail=False, required_scopes=["feature_flag:read"])def matching_ids(self, request: request.Request, **kwargs):"""@@ -5197,8 +5213,6 @@ class FeatureFlagViewSet(Uses the same filtering logic as the list endpoint.Returns only IDs that the user has permission to edit."""- from products.access_control.backend.facade.user_access_control import access_level_satisfied_for_resource-# Build queryset with same filtering as list endpointqueryset = self.queryset.filter(team__project_id=self.project_id, deleted=False)@@ -5219,20 +5233,7 @@ class FeatureFlagViewSet(if not self.user_access_control:editable_ids = list(queryset.values_list("id", flat=True))else:- # Load only the id field to minimize data transfer- flags = list(queryset.only("id"))-- # Preload access controls to avoid N+1 queries- self.user_access_control.preload_object_access_controls(cast(list, flags))-- # Filter to only flags the user can edit (same logic as serializer's get_can_edit)- editable_ids = []- for flag in flags:- user_access_level = self.user_access_control.get_user_access_level(flag)- if user_access_level and access_level_satisfied_for_resource(- "feature_flag", user_access_level, "editor"- ):- editable_ids.append(flag.id)+ editable_ids = self._ids_user_can_edit(queryset)return Response({@@ -5271,7 +5272,6 @@ class FeatureFlagViewSet(from posthog.models.activity_logging.activity_log import LogActivityEntry, bulk_log_activityfrom posthog.tasks.remote_config import update_team_remote_config- from products.access_control.backend.facade.user_access_control import access_level_satisfied_for_resourcefrom products.feature_flags.backend.flags_cache import enqueue_evaluation_cache_invalidationfrom products.feature_flags.backend.tasks import update_team_flags_cache@@ -5341,23 +5341,11 @@ class FeatureFlagViewSet(# Apply access control - filter to only editable flagsif self.user_access_control:- # The access check reads created_by_id, so a deferred column costs a query per flag- flags_for_access_check = list(queryset.only("id", "created_by_id"))- self.user_access_control.preload_object_access_controls(cast(list, flags_for_access_check))-- editable_ids = []- for flag in flags_for_access_check:- user_access_level = self.user_access_control.get_user_access_level(flag)- if user_access_level and access_level_satisfied_for_resource(- "feature_flag", user_access_level, "editor"- ):- editable_ids.append(flag.id)-# Filter the existing queryset to only editable flags (preserves all exclusions)- queryset = queryset.filter(id__in=editable_ids)+ queryset = queryset.filter(id__in=self._ids_user_can_edit(queryset))# Prefetch related data for validation (only for flags we'll actually process)- queryset = queryset.select_related("team").prefetch_related("features", "experiment_set")+ queryset = queryset.prefetch_related("features", "experiment_set")flags_list = list(queryset)# Batch query for dependent flags@@ -5466,7 +5454,7 @@ class FeatureFlagViewSet(# Prepare activity log entryactivity_log_entries.append(LogActivityEntry(- organization_id=flag.team.organization_id,+ organization_id=self.team.organization_id,team_id=flag.team_id,user=current_user,was_impersonated=was_impersonated,@@ -5533,7 +5521,7 @@ class FeatureFlagViewSet(update_flag(flag,{"deleted": True, "version": flag.version or 0},- team=flag.team,+ team=self.team,user=request.user,request=FlagLifecycleWriteRequest(request),serializer_context=self.get_serializer_context(),diff --git a/products/feature_flags/backend/api/test/test_feature_flag.py b/products/feature_flags/backend/api/test/test_feature_flag.pyindex fd8369c7ab9b..d577559f0b14 100644--- a/products/feature_flags/backend/api/test/test_feature_flag.py+++ b/products/feature_flags/backend/api/test/test_feature_flag.py@@ -13599,31 +13599,45 @@ class TestFeatureFlagBulkDelete(APIBaseTest):assert len(data["deleted"]) == 150assert len(data["errors"]) == 0- def _bulk_delete_query_count(self, flag_count: int) -> int:+ def _query_count(self, endpoint: str, flag_count: int) -> int:+ key_prefix = f"query_count_flag_{flag_count}_"flags = [FeatureFlag.objects.create(team=self.team,created_by=self.user,- key=f"query_count_flag_{flag_count}_{i}",+ key=f"{key_prefix}{i}",filters={"groups": [{"rollout_percentage": 50, "properties": []}]},)for i in range(flag_count)]+ flag_ids = [f.id for f in flags]with CaptureQueriesContext(connection) as ctx:- response = self.client.post(- f"/api/projects/{self.team.id}/feature_flags/bulk_delete/",- {"ids": [f.id for f in flags]},- )+ if endpoint == "bulk_delete":+ response = self.client.post(+ f"/api/projects/{self.team.id}/feature_flags/bulk_delete/",+ {"ids": flag_ids},+ )+ else:+ response = self.client.get(+ f"/api/projects/{self.team.id}/feature_flags/matching_ids/?search={key_prefix}"+ )assert response.status_code == 200- assert len(response.json()["deleted"]) == flag_count+ if endpoint == "bulk_delete":+ assert len(response.json()["deleted"]) == flag_count+ else:+ assert sorted(response.json()["ids"]) == sorted(flag_ids)return len(ctx.captured_queries)- def test_bulk_delete_query_count_does_not_grow_with_flag_count(self):- self._bulk_delete_query_count(1)- few = self._bulk_delete_query_count(2)- many = self._bulk_delete_query_count(6)+ def _warm_session_caches(self, endpoint: str) -> None:+ self._query_count(endpoint, 1)++ @parameterized.expand([("bulk_delete",), ("matching_ids",)])+ def test_query_count_does_not_grow_with_flag_count(self, endpoint: str) -> None:+ self._warm_session_caches(endpoint)+ few = self._query_count(endpoint, 2)+ many = self._query_count(endpoint, 6)- assert few == many, f"deleting 6 flags cost {many} queries vs {few} for 2, so something N+1s"+ assert few == many, f"{endpoint} over 6 flags cost {many} queries vs {few} for 2, so something N+1s"def test_bulk_delete_validates_running_experiments(self):"""Test that flags linked to running experiments are rejected."""