Skip to content

: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.

fix(rbac): use membership level as project access without entitlement (#128173)

Alex Lider43efa3ea9e5d
diff --git a/frontend/src/scenes/settings/organization/memberProjectAccess.test.ts b/frontend/src/scenes/settings/organization/memberProjectAccess.test.ts
index bda32cc85d16..eaca3f5dd5e9 100644
--- a/frontend/src/scenes/settings/organization/memberProjectAccess.test.ts
+++ b/frontend/src/scenes/settings/organization/memberProjectAccess.test.ts
@@ -47,6 +47,7 @@ describe('memberProjectAccess', () => {
it.each([
['org_admin', null, 'Organization admins always have full access'],
+ ['org_membership', null, 'Based on organization membership'],
['system_default', null, 'No access rules set'],
['object', 'member', 'Set for this member'],
['object', 'role', 'Based on role Engineering'],
diff --git a/frontend/src/scenes/settings/organization/memberProjectAccess.ts b/frontend/src/scenes/settings/organization/memberProjectAccess.ts
index 3145d4717e2e..ae236a0704e3 100644
--- a/frontend/src/scenes/settings/organization/memberProjectAccess.ts
+++ b/frontend/src/scenes/settings/organization/memberProjectAccess.ts
@@ -41,6 +41,8 @@ export function describeProjectAccessSource(
: 'Organization admins always have full access'
case 'creator':
return 'Created this project'
+ case 'org_membership':
+ return 'Based on organization membership'
case 'system_default':
return 'No access rules set'
}
diff --git a/posthog/api/project.py b/posthog/api/project.py
index 9e3e1f8ee596..e504e785d753 100644
--- a/posthog/api/project.py
+++ b/posthog/api/project.py
@@ -1208,6 +1208,10 @@ class ProjectBackwardCompatSerializer(
continue
resource, required_level = field_mappings[field_name]
if resource == "project":
+ # Without the entitlement a project rule is never consulted; validate_team_attrs
+ # gates the admin-only fields on the membership level instead.
+ if not user_access_control.access_controls_supported:
+ continue
has_access = user_access_control.check_access_level_for_object(team, required_level)
else:
has_access = user_access_control.check_access_level_for_resource(resource, required_level)
diff --git a/products/access_control/backend/facade/user_access_control.py b/products/access_control/backend/facade/user_access_control.py
index ae778b2f5e1c..bba5c70d8062 100644
--- a/products/access_control/backend/facade/user_access_control.py
+++ b/products/access_control/backend/facade/user_access_control.py
@@ -281,8 +281,9 @@ class ResolvedAccess:
without the entitlement, where rules are never consulted)
- "org_admin": rules never consulted — the admin bypass
- "creator": rules never consulted — the user created the object
- - "org_membership": the object is the organization itself — organizations have no access
- rules; the level comes from the user's OrganizationMembership.level (admin or member)
+ - "org_membership": the level comes from the user's OrganizationMembership.level (admin or
+ member) — the object is the organization itself, which has no access rules, or a project
+ in an organization without the entitlement, where rules are never consulted
"""
access_level: AccessControlLevel
@@ -1685,6 +1686,16 @@ class UserAccessControl:
if not self.access_controls_supported:
if explicit:
return True, None
+ if resource == "project":
+ # Without the entitlement a project is reached through the organization membership
+ # alone (UserTeamPermissions.effective_membership_level). Admins returned above, so
+ # the user is a plain member, not the "admin" that default_access_level names.
+ return True, ResolvedAccess(
+ access_level="member",
+ source="org_membership",
+ source_subject=None,
+ source_resource=resource,
+ )
return True, ResolvedAccess(
access_level=default_access_level(resource),
source="system_default",
diff --git a/products/access_control/backend/presentation/access_control.py b/products/access_control/backend/presentation/access_control.py
index d561412b591f..f4154711fafd 100644
--- a/products/access_control/backend/presentation/access_control.py
+++ b/products/access_control/backend/presentation/access_control.py
@@ -731,6 +731,10 @@ class UserAccessControlSerializerMixin(serializers.Serializer):
# "project" access is object-level (checked against the Team instance), not resource-level.
# For models with a team FK (e.g. Team extensions), use the team for the project check.
if resource == "project":
+ # Without the entitlement a project rule is never consulted, and the admin-only team
+ # fields are gated on the membership level by validate_team_attrs instead.
+ if not user_access_control.access_controls_supported:
+ continue
obj_for_check = getattr(self.instance, "team", self.instance)
has_access = user_access_control.check_access_level_for_object(obj_for_check, required_level)
else:
diff --git a/products/access_control/backend/tests/test_access_control.py b/products/access_control/backend/tests/test_access_control.py
index e4886d2a0225..290a3a98af99 100644
--- a/products/access_control/backend/tests/test_access_control.py
+++ b/products/access_control/backend/tests/test_access_control.py
@@ -2866,6 +2866,20 @@ class TestOrganizationMemberProjectAccess(BaseAccessControlTest):
res = self.client.get(f"/api/organizations/@current/members/project_access?member_id={other_membership.id}")
assert res.status_code == status.HTTP_404_NOT_FOUND, res.json()
+ def test_membership_level_decides_without_the_entitlement(self):
+ self._set_access_control_available(False)
+ # A stale rule from before the downgrade must not be consulted
+ self._project_rule(self.team, "admin", organization_member=self.user2_membership)
+
+ projects = self._projects(self._get(), self.user2_membership.id)
+ assert {(p["access_level"], p["resolved"]["source"]) for p in projects.values()} == {
+ ("member", "org_membership")
+ }
+ admin_projects = self._projects(self._get(), self.organization_membership.id)
+ assert {(p["access_level"], p["resolved"]["source"]) for p in admin_projects.values()} == {
+ ("admin", "org_admin")
+ }
+
def test_query_count_does_not_grow_with_members_or_projects(self):
def query_count() -> int:
with CaptureQueriesContext(connection) as ctx:
diff --git a/products/access_control/backend/tests/test_field_access_control.py b/products/access_control/backend/tests/test_field_access_control.py
index dea9fe29aba3..a4c788bb54f3 100644
--- a/products/access_control/backend/tests/test_field_access_control.py
+++ b/products/access_control/backend/tests/test_field_access_control.py
@@ -10,6 +10,7 @@ from parameterized import parameterized
from rest_framework import serializers
from rest_framework.exceptions import ValidationError
+from posthog.constants import AvailableFeature
from posthog.models.team import Team
from posthog.rbac.decorators import field_access_control
@@ -22,6 +23,14 @@ from products.access_control.backend.presentation.access_control import UserAcce
class TestFieldAccessControlDecorator(BaseTest):
+ def setUp(self):
+ super().setUp()
+ # Project field checks are skipped without the entitlement
+ self.organization.available_product_features = [
+ {"key": AvailableFeature.ACCESS_CONTROL, "name": AvailableFeature.ACCESS_CONTROL}
+ ]
+ self.organization.save()
+
def test_decorator_adds_metadata_to_field(self):
"""Test that the decorator adds access control metadata to fields"""
field = cast(Any, Team)._meta.get_field("session_recording_opt_in")
diff --git a/products/access_control/backend/tests/test_user_access_control.py b/products/access_control/backend/tests/test_user_access_control.py
index 0756b72312e7..dd3d5a029ccd 100644
--- a/products/access_control/backend/tests/test_user_access_control.py
+++ b/products/access_control/backend/tests/test_user_access_control.py
@@ -214,8 +214,10 @@ class TestUserAccessControl(BaseUserAccessControlTest):
assert self.user_access_control.access_level_for_object(self.team) == "admin"
assert self.user_access_control.check_access_level_for_object(self.team, "admin") is True
- assert self.other_user_access_control.access_level_for_object(self.team) == "admin"
- assert self.other_user_access_control.check_access_level_for_object(self.team, "admin") is True
+ # A plain member gets the same answer as effective_membership_level, not the "admin" default
+ assert self.other_user_access_control.access_level_for_object(self.team) == "member"
+ assert self.other_user_access_control.check_access_level_for_object(self.team, "member") is True
+ assert self.other_user_access_control.check_access_level_for_object(self.team, "admin") is False
resource_access = self.user_access_control.access_level_for_resource("project")
assert resource_access and resource_access.access_level == "admin"
resource_access = self.other_user_access_control.access_level_for_resource("project")
diff --git a/products/access_control/backend/tests/test_user_access_control_pbt.py b/products/access_control/backend/tests/test_user_access_control_pbt.py
index 41e553f51a3a..ef2809f76831 100644
--- a/products/access_control/backend/tests/test_user_access_control_pbt.py
+++ b/products/access_control/backend/tests/test_user_access_control_pbt.py
@@ -623,11 +623,16 @@ class BaseAccessControlPropertyTest(HypothesisDjangoTestCase, BaseTest):
return UserAccessControl(self.user, self.team)
def _set_role_based_access(self, enabled: bool) -> None:
+ self._set_entitlements(access_control=True, role_based_access=enabled)
+
+ def _set_entitlements(self, *, access_control: bool, role_based_access: bool) -> None:
# Written on every example (not just when disabling) so the class-level in-memory
# organization, which hypothesis's per-example rollback does not restore, can't drift
# from the row the resolvers read
- features = [{"key": AvailableFeature.ACCESS_CONTROL, "name": AvailableFeature.ACCESS_CONTROL}]
- if enabled:
+ features = []
+ if access_control:
+ features.append({"key": AvailableFeature.ACCESS_CONTROL, "name": AvailableFeature.ACCESS_CONTROL})
+ if role_based_access:
features.append({"key": AvailableFeature.ROLE_BASED_ACCESS, "name": AvailableFeature.ROLE_BASED_ACCESS})
self.organization.available_product_features = features
self.organization.save()
@@ -894,14 +899,17 @@ class TestUserAccessControlProperties(BaseAccessControlPropertyTest):
team_rows=project_rows(),
membership_level=membership_levels_st,
role_based_access=st.booleans(),
+ access_control=st.booleans(),
)
@settings(max_examples=100, deadline=None, suppress_health_check=SUPPRESSED_HEALTH_CHECKS)
def test_effective_membership_level_agrees_with_enforced_project_access(
- self, team_rows, membership_level, role_based_access
+ self, team_rows, membership_level, role_based_access, access_control
):
# The two project resolvers must not contradict each other: effective_membership_level
# gates ~25 call sites, while get_user_access_level is what PermissionClass 403s on, so a
- # disagreement means one of them grants access the other denies.
+ # disagreement means one of them grants access the other denies. This holds without the
+ # access control entitlement too, where the members page shows get_user_access_level's
+ # answer while effective_membership_level enforces the membership level.
#
# Scope: object-scope rows only (`project_rows()` draws `("object",)`, so every row carries
# `resource_id = str(team.pk)`). Agreement is *not* asserted for resource-level project rows
@@ -911,7 +919,7 @@ class TestUserAccessControlProperties(BaseAccessControlPropertyTest):
# create such a row and the UI never sends `resource: "project"` to `resource_access_controls`,
# so that path is left as-is rather than modelled here.
self._set_membership_level(membership_level)
- self._set_role_based_access(role_based_access)
+ self._set_entitlements(access_control=access_control, role_based_access=role_based_access)
self._materialize_project_rows(team_rows)
level = UserPermissions(self.user, self.team).current_team.effective_membership_level