You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polaris.apache.org by di...@apache.org on 2026/07/23 22:59:17 UTC

(polaris) branch main updated: Fix view grants on federated catalogs (#5096)

This is an automated email from the ASF dual-hosted git repository.

dimas-b pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git


The following commit(s) were added to refs/heads/main by this push:
     new 22ea020e05 Fix view grants on federated catalogs (#5096)
22ea020e05 is described below

commit 22ea020e050e7e0fef1c839216c185e305b9c03b
Author: Ayush Saxena <ay...@apache.org>
AuthorDate: Fri Jul 24 04:29:12 2026 +0530

    Fix view grants on federated catalogs (#5096)
---
 .../polaris/service/admin/PolarisAdminService.java |  2 +-
 .../service/admin/PolarisAdminServiceTest.java     | 65 ++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java b/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java
index faf6fd91d3..2f206f75e3 100644
--- a/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java
+++ b/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java
@@ -2351,7 +2351,7 @@ public class PolarisAdminService {
     if (completePathWrapper == null
         || leafEntity == null
         || !(leafEntity.getType() == PolarisEntityType.TABLE_LIKE
-            && leafEntity.getSubType() == PolarisEntitySubType.ICEBERG_TABLE
+            && subTypes.contains(leafEntity.getSubType())
             && Objects.equals(leafEntity.getName(), identifier.name()))) {
       throw new RuntimeException(
           String.format(
diff --git a/runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceTest.java b/runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceTest.java
index 7d47b27c7a..66d938239e 100644
--- a/runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceTest.java
+++ b/runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceTest.java
@@ -666,6 +666,71 @@ public class PolarisAdminServiceTest {
     assertThat(result.isSuccess()).isTrue();
   }
 
+  @Test
+  void testGrantPrivilegeOnViewLikeToRole_PassthroughFacade() throws Exception {
+    String catalogName = "test-catalog";
+    String catalogRoleName = "test-role";
+    Namespace namespace = Namespace.of("ns1");
+    TableIdentifier identifier = TableIdentifier.of(namespace, "test-view");
+    PolarisPrivilege privilege = PolarisPrivilege.VIEW_WRITE_PROPERTIES;
+
+    PolarisEntity catalogEntity = createEntity(catalogName, PolarisEntityType.CATALOG);
+    when(resolutionManifest.getResolvedCatalogEntity()).thenReturn(CatalogEntity.of(catalogEntity));
+    when(resolutionManifest.getIsPassthroughFacade()).thenReturn(true);
+
+    PolarisResolvedPathWrapper catalogRoleWrapper = mock(PolarisResolvedPathWrapper.class);
+    PolarisEntity catalogRoleEntity = createEntity(catalogRoleName, PolarisEntityType.CATALOG_ROLE);
+    when(catalogRoleWrapper.getRawLeafEntity()).thenReturn(catalogRoleEntity);
+    when(resolutionManifest.getResolvedPath(
+            eq(ResolvedPathKey.of(List.of(catalogRoleName), PolarisEntityType.CATALOG_ROLE))))
+        .thenReturn(catalogRoleWrapper);
+
+    PolarisEntity nsEntity = createNamespaceEntity(namespace, 2L, 1L);
+
+    // The view is not yet resolved as a table-like entity, so the pre-existing path stops at the
+    // namespace (leaf subtype is not ICEBERG_VIEW). This forces the synthetic-creation branch.
+    PolarisResolvedPathWrapper existingPathWrapper = mock(PolarisResolvedPathWrapper.class);
+    when(existingPathWrapper.getRawFullPath()).thenReturn(List.of(catalogEntity, nsEntity));
+    when(existingPathWrapper.getRawLeafEntity()).thenReturn(nsEntity);
+    when(resolutionManifest.getResolvedPath(
+            eq(ResolvedPathKey.ofTableLike(identifier)), eq(PolarisEntitySubType.ANY_SUBTYPE)))
+        .thenReturn(existingPathWrapper);
+
+    // The single-level namespace already exists, so no synthetic namespace is created.
+    PolarisResolvedPathWrapper nsWrapper = mock(PolarisResolvedPathWrapper.class);
+    when(nsWrapper.getRawFullPath()).thenReturn(List.of(catalogEntity, nsEntity));
+    when(nsWrapper.getRawLeafEntity()).thenReturn(nsEntity);
+    when(nsWrapper.isFullyResolvedNamespace(eq(catalogName), eq(namespace))).thenReturn(true);
+    when(resolutionManifest.getPassthroughResolvedPath(eq(ResolvedPathKey.ofNamespace(namespace))))
+        .thenReturn(nsWrapper);
+
+    GenerateEntityIdResult idResult = mock(GenerateEntityIdResult.class);
+    when(idResult.getId()).thenReturn(6L);
+    when(metaStoreManager.generateNewEntityId(any())).thenReturn(idResult);
+    EntityResult createResult = mock(EntityResult.class);
+    when(createResult.isSuccess()).thenReturn(true);
+    when(metaStoreManager.createEntityIfNotExists(any(), any(), any())).thenReturn(createResult);
+
+    // After creation, the synthetic leaf re-resolves as an ICEBERG_VIEW (via selectEntitySubType).
+    PolarisEntity viewEntity =
+        createTableEntity(identifier, PolarisEntitySubType.ICEBERG_VIEW, 6L, 2L);
+    PolarisResolvedPathWrapper viewPathWrapper = mock(PolarisResolvedPathWrapper.class);
+    when(viewPathWrapper.getRawLeafEntity()).thenReturn(viewEntity);
+    when(viewPathWrapper.getRawParentPath()).thenReturn(List.of(catalogEntity, nsEntity));
+    when(resolutionManifest.getPassthroughResolvedPath(eq(ResolvedPathKey.ofTableLike(identifier))))
+        .thenReturn(viewPathWrapper);
+
+    PrivilegeResult successResult = mock(PrivilegeResult.class);
+    when(successResult.isSuccess()).thenReturn(true);
+    when(metaStoreManager.grantPrivilegeOnSecurableToRole(any(), any(), any(), any(), any()))
+        .thenReturn(successResult);
+
+    PrivilegeResult result =
+        adminService.grantPrivilegeOnViewToRole(
+            catalogName, catalogRoleName, identifier, privilege);
+    assertThat(result.isSuccess()).isTrue();
+  }
+
   @Test
   void testGrantPrivilegeOnTableLikeToRole_PassthroughFacade_FeatureDisabled() throws Exception {
     String catalogName = "test-catalog";