Skip to content

Commit 39d408d

Browse files
committed
fix: Allow remote-registry first apply for new projects
Signed-off-by: ntkathole <[email protected]>
1 parent f837c66 commit 39d408d

2 files changed

Lines changed: 224 additions & 6 deletions

File tree

‎sdk/python/feast/registry_server.py‎

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from feast.base_feature_view import BaseFeatureView
1313
from feast.data_source import DataSource
1414
from feast.entity import Entity
15-
from feast.errors import FeastObjectNotFoundException
15+
from feast.errors import FeastObjectNotFoundException, FeastPermissionError
1616
from feast.feast_object import FeastObject
1717
from feast.feature_view import FeatureView
1818
from feast.grpc_error_interceptor import ErrorInterceptor
@@ -24,6 +24,8 @@
2424
from feast.permissions.security_manager import (
2525
assert_permissions,
2626
assert_permissions_to_update,
27+
get_security_manager,
28+
is_auth_necessary,
2729
permitted_resources,
2830
)
2931
from feast.permissions.server.grpc import AuthInterceptor
@@ -1603,16 +1605,37 @@ def GetObjectRelationships(
16031605
)
16041606

16051607
def Commit(self, request, context):
1606-
for project in self.proxied_registry.list_projects(allow_cache=True):
1607-
assert_permissions(resource=project, actions=[AuthzedAction.UPDATE])
1608+
# Per-object mutations are authorized in Apply*/Delete* RPCs.
1609+
# Requiring UPDATE on every project breaks shared-registry multi-tenant
1610+
# commits (remote feastRef with different feastProjects). Require CREATE
1611+
# or UPDATE on at least one project when auth is enabled instead.
1612+
projects = cast(
1613+
list[FeastObject],
1614+
list(self.proxied_registry.list_projects(allow_cache=True)),
1615+
)
1616+
if projects and is_auth_necessary(get_security_manager()):
1617+
can_update = permitted_resources(
1618+
resources=projects, actions=AuthzedAction.UPDATE
1619+
)
1620+
can_create = permitted_resources(
1621+
resources=projects, actions=AuthzedAction.CREATE
1622+
)
1623+
if not can_update and not can_create:
1624+
raise FeastPermissionError(
1625+
"Not authorized to commit registry changes: "
1626+
"CREATE or UPDATE permission required on at least one project"
1627+
)
16081628
self.proxied_registry.commit()
16091629
return Empty()
16101630

16111631
def Refresh(self, request, context):
1612-
project = self.proxied_registry.get_project(
1613-
name=request.project, allow_cache=True
1632+
# Use create-or-update authorization so first apply of a new project over
1633+
# a remote registry can refresh before the project exists yet.
1634+
assert_permissions_to_update(
1635+
resource=Project(name=request.project),
1636+
getter=self.proxied_registry.get_project,
1637+
project=request.project,
16141638
)
1615-
assert_permissions(resource=project, actions=[AuthzedAction.UPDATE])
16161639
self.proxied_registry.refresh(request.project)
16171640
return Empty()
16181641

Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,195 @@
1+
from unittest.mock import Mock
2+
3+
import pytest
4+
from google.protobuf.empty_pb2 import Empty
5+
6+
from feast.errors import FeastPermissionError, ProjectObjectNotFoundException
7+
from feast.permissions.permission import AuthzedAction, Permission
8+
from feast.permissions.policy import RoleBasedPolicy
9+
from feast.permissions.security_manager import (
10+
SecurityManager,
11+
no_security_manager,
12+
set_security_manager,
13+
)
14+
from feast.permissions.user import User
15+
from feast.project import Project
16+
from feast.protos.feast.registry import RegistryServer_pb2
17+
from feast.registry_server import RegistryServer
18+
19+
20+
@pytest.fixture
21+
def project_permissions():
22+
return [
23+
Permission(
24+
name="project_updater",
25+
types=Project,
26+
name_patterns="team-a.*",
27+
policy=RoleBasedPolicy(roles=["team-a"]),
28+
actions=[AuthzedAction.DESCRIBE, AuthzedAction.UPDATE],
29+
),
30+
Permission(
31+
name="project_creator",
32+
types=Project,
33+
name_patterns="team-a.*",
34+
policy=RoleBasedPolicy(roles=["team-a"]),
35+
actions=[AuthzedAction.CREATE],
36+
),
37+
Permission(
38+
name="project_a_create_only",
39+
types=Project,
40+
name_patterns="team-a.*",
41+
policy=RoleBasedPolicy(roles=["team-a-creator"]),
42+
actions=[AuthzedAction.CREATE],
43+
),
44+
Permission(
45+
name="project_b_updater",
46+
types=Project,
47+
name_patterns="team-b.*",
48+
policy=RoleBasedPolicy(roles=["team-b"]),
49+
actions=[AuthzedAction.DESCRIBE, AuthzedAction.UPDATE],
50+
),
51+
]
52+
53+
54+
@pytest.fixture
55+
def auth_security_manager(project_permissions):
56+
registry = Mock()
57+
registry.list_permissions = Mock(return_value=project_permissions)
58+
sm = SecurityManager(project="any", registry=registry)
59+
set_security_manager(sm)
60+
yield sm
61+
no_security_manager()
62+
63+
64+
def _server_with_projects(*project_names: str) -> tuple[RegistryServer, Mock]:
65+
registry = Mock()
66+
projects = [Project(name=name) for name in project_names]
67+
registry.list_projects = Mock(return_value=projects)
68+
69+
def get_project(name: str, allow_cache: bool = False):
70+
for project in projects:
71+
if project.name == name:
72+
return project
73+
raise ProjectObjectNotFoundException(name=name)
74+
75+
registry.get_project = Mock(side_effect=get_project)
76+
registry.refresh = Mock()
77+
registry.commit = Mock()
78+
return RegistryServer(registry=registry), registry
79+
80+
81+
def test_refresh_allows_missing_project_without_auth():
82+
no_security_manager()
83+
server, registry = _server_with_projects("existing")
84+
85+
response = server.Refresh(
86+
RegistryServer_pb2.RefreshRequest(project="brand-new"), None
87+
)
88+
89+
assert response == Empty()
90+
registry.refresh.assert_called_once_with("brand-new")
91+
92+
93+
def test_refresh_allows_missing_project_with_create_permission(auth_security_manager):
94+
auth_security_manager.set_current_user(User("alice", ["team-a"]))
95+
server, registry = _server_with_projects("team-b-project")
96+
97+
response = server.Refresh(
98+
RegistryServer_pb2.RefreshRequest(project="team-a-new"), None
99+
)
100+
101+
assert response == Empty()
102+
registry.refresh.assert_called_once_with("team-a-new")
103+
104+
105+
def test_refresh_denies_missing_project_without_create_permission(
106+
auth_security_manager,
107+
):
108+
auth_security_manager.set_current_user(User("bob", ["team-b"]))
109+
server, _ = _server_with_projects("team-b-project")
110+
111+
with pytest.raises(FeastPermissionError):
112+
server.Refresh(RegistryServer_pb2.RefreshRequest(project="team-a-new"), None)
113+
114+
115+
def test_refresh_requires_update_for_existing_project(auth_security_manager):
116+
auth_security_manager.set_current_user(User("alice", ["team-a"]))
117+
server, registry = _server_with_projects("team-a-project", "team-b-project")
118+
119+
response = server.Refresh(
120+
RegistryServer_pb2.RefreshRequest(project="team-a-project"), None
121+
)
122+
assert response == Empty()
123+
registry.refresh.assert_called_once_with("team-a-project")
124+
125+
with pytest.raises(FeastPermissionError):
126+
server.Refresh(
127+
RegistryServer_pb2.RefreshRequest(project="team-b-project"), None
128+
)
129+
130+
131+
def test_commit_allows_when_caller_can_update_one_shared_project(auth_security_manager):
132+
auth_security_manager.set_current_user(User("alice", ["team-a"]))
133+
server, registry = _server_with_projects("team-a-project", "team-b-project")
134+
135+
response = server.Commit(Empty(), None)
136+
137+
assert response == Empty()
138+
registry.commit.assert_called_once()
139+
140+
141+
def test_commit_denies_when_caller_cannot_create_or_update_any_project(
142+
auth_security_manager,
143+
):
144+
auth_security_manager.set_current_user(User("nobody", ["other"]))
145+
server, _ = _server_with_projects("team-a-project", "team-b-project")
146+
147+
with pytest.raises(FeastPermissionError):
148+
server.Commit(Empty(), None)
149+
150+
151+
def test_commit_allows_without_auth():
152+
no_security_manager()
153+
server, registry = _server_with_projects("a", "b")
154+
155+
response = server.Commit(Empty(), None)
156+
157+
assert response == Empty()
158+
registry.commit.assert_called_once()
159+
160+
161+
def test_commit_allows_empty_registry_with_auth(auth_security_manager):
162+
# No projects yet — same as old behavior (empty permission loop).
163+
auth_security_manager.set_current_user(User("nobody", ["other"]))
164+
server, registry = _server_with_projects()
165+
166+
response = server.Commit(Empty(), None)
167+
168+
assert response == Empty()
169+
registry.commit.assert_called_once()
170+
171+
172+
def test_refresh_existing_project_without_auth():
173+
no_security_manager()
174+
server, registry = _server_with_projects("existing")
175+
176+
response = server.Refresh(
177+
RegistryServer_pb2.RefreshRequest(project="existing"), None
178+
)
179+
180+
assert response == Empty()
181+
registry.refresh.assert_called_once_with("existing")
182+
183+
184+
def test_commit_allows_with_only_create_permission_on_new_project(
185+
auth_security_manager,
186+
):
187+
# After ApplyProject(commit=False), project exists in cache but caller may
188+
# only have CREATE (not UPDATE) for that first apply transaction.
189+
auth_security_manager.set_current_user(User("creator", ["team-a-creator"]))
190+
server, registry = _server_with_projects("team-a-new")
191+
192+
response = server.Commit(Empty(), None)
193+
194+
assert response == Empty()
195+
registry.commit.assert_called_once()

0 commit comments

Comments
 (0)