You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polaris.apache.org by yu...@apache.org on 2026/09/11 16:29:44 UTC
(polaris) branch main updated: Core: Thread ResolvedIntent through findMissingPrivileges (#5493)
This is an automated email from the ASF dual-hosted git repository.
flyrain 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 ef6e9398f9 Core: Thread ResolvedIntent through findMissingPrivileges (#5493)
ef6e9398f9 is described below
commit ef6e9398f961cd507c5c0ec1901deea3e46fe15d
Author: Yuewei Zhou <91...@users.noreply.github.com>
AuthorDate: Fri Sep 11 09:29:38 2026 -0700
Core: Thread ResolvedIntent through findMissingPrivileges (#5493)
---
.../polaris/core/auth/PolarisAuthorizerImpl.java | 19 +++++-----
.../core/auth/PolarisAuthorizerImplTest.java | 40 ++++++++--------------
2 files changed, 24 insertions(+), 35 deletions(-)
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizerImpl.java b/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizerImpl.java
index 6106c7ebe4..415cb2f90b 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizerImpl.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizerImpl.java
@@ -133,6 +133,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import org.apache.iceberg.exceptions.ForbiddenException;
import org.apache.polaris.core.StructuredLogKeys;
+import org.apache.polaris.core.auth.AuthorizationIntentResolver.ResolvedIntent;
import org.apache.polaris.core.auth.RbacOperationSemantics.ResolvedPathRooting;
import org.apache.polaris.core.config.RealmConfig;
import org.apache.polaris.core.entity.PolarisBaseEntity;
@@ -775,14 +776,13 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
RbacOperationSemantics semantics = RbacOperationSemantics.forOperation(intent.getOperation());
boolean prependRootContainer = semantics.rooting() == ResolvedPathRooting.ROOT;
try {
- AuthorizationIntentResolver.ResolvedIntent resolvedIntent =
+ ResolvedIntent resolvedIntent =
AuthorizationIntentResolver.resolve(resolutionManifest, intent, prependRootContainer);
authorizeRbacOrThrow(
polarisPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
intent.getOperation(),
- resolvedIntent.targets(),
- resolvedIntent.secondaries());
+ resolvedIntent);
return AuthorizationDecision.allow();
} catch (ForbiddenException e) {
LOGGER.debug(
@@ -817,8 +817,7 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
@NonNull PolarisPrincipal polarisPrincipal,
@NonNull Set<PolarisBaseEntity> activatedEntities,
@NonNull PolarisAuthorizableOperation authzOp,
- @Nullable List<PolarisResolvedPathWrapper> targets,
- @Nullable List<PolarisResolvedPathWrapper> secondaries) {
+ @NonNull ResolvedIntent resolvedIntent) {
AuthorizationPreConditions.checkCredentialRotationRequired(
polarisPrincipal, authzOp, realmConfig);
boolean isRoot = getRootPrincipalName().equals(polarisPrincipal.getName());
@@ -832,7 +831,7 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
.log("Root principal allowed to reset credentials");
} else {
List<MissingPrivilege> missing =
- findMissingPrivileges(polarisPrincipal, activatedEntities, authzOp, targets, secondaries);
+ findMissingPrivileges(polarisPrincipal, activatedEntities, authzOp, resolvedIntent);
if (!missing.isEmpty()) {
String missingDetails = formatMissingPrivileges(missing);
LOGGER.info(
@@ -875,7 +874,8 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
@NonNull PolarisAuthorizableOperation authzOp,
@Nullable List<PolarisResolvedPathWrapper> targets,
@Nullable List<PolarisResolvedPathWrapper> secondaries) {
- return findMissingPrivileges(polarisPrincipal, activatedEntities, authzOp, targets, secondaries)
+ return findMissingPrivileges(
+ polarisPrincipal, activatedEntities, authzOp, new ResolvedIntent(targets, secondaries))
.isEmpty();
}
@@ -895,8 +895,9 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
@NonNull PolarisPrincipal polarisPrincipal,
@NonNull Set<PolarisBaseEntity> activatedEntities,
@NonNull PolarisAuthorizableOperation authzOp,
- @Nullable List<PolarisResolvedPathWrapper> targets,
- @Nullable List<PolarisResolvedPathWrapper> secondaries) {
+ @NonNull ResolvedIntent resolvedIntent) {
+ List<PolarisResolvedPathWrapper> targets = resolvedIntent.targets();
+ List<PolarisResolvedPathWrapper> secondaries = resolvedIntent.secondaries();
Set<Long> entityIdSet =
activatedEntities.stream().map(PolarisEntityCore::getId).collect(Collectors.toSet());
RbacOperationSemantics semantics = RbacOperationSemantics.forOperation(authzOp);
diff --git a/polaris-core/src/test/java/org/apache/polaris/core/auth/PolarisAuthorizerImplTest.java b/polaris-core/src/test/java/org/apache/polaris/core/auth/PolarisAuthorizerImplTest.java
index fbb03b3548..8e86bbfd0d 100644
--- a/polaris-core/src/test/java/org/apache/polaris/core/auth/PolarisAuthorizerImplTest.java
+++ b/polaris-core/src/test/java/org/apache/polaris/core/auth/PolarisAuthorizerImplTest.java
@@ -34,6 +34,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.iceberg.exceptions.ForbiddenException;
+import org.apache.polaris.core.auth.AuthorizationIntentResolver.ResolvedIntent;
import org.apache.polaris.core.config.FeatureConfiguration;
import org.apache.polaris.core.config.RealmConfig;
import org.apache.polaris.core.entity.PolarisEntity;
@@ -111,8 +112,7 @@ public class PolarisAuthorizerImplTest {
any(PolarisPrincipal.class),
ArgumentMatchers.any(),
eq(PolarisAuthorizableOperation.ADD_ROOT_GRANT_TO_PRINCIPAL_ROLE),
- ArgumentMatchers.any(),
- ArgumentMatchers.<List<PolarisResolvedPathWrapper>>any());
+ any(ResolvedIntent.class));
AuthorizationRequest request =
new AuthorizationRequest(
@@ -131,8 +131,7 @@ public class PolarisAuthorizerImplTest {
eq(principal),
eq(Set.of()),
eq(PolarisAuthorizableOperation.ADD_ROOT_GRANT_TO_PRINCIPAL_ROLE),
- eq(List.of(rootWrapper)),
- eq(List.of(principalRoleWrapper)));
+ eq(new ResolvedIntent(List.of(rootWrapper), List.of(principalRoleWrapper))));
}
@Test
@@ -153,8 +152,7 @@ public class PolarisAuthorizerImplTest {
any(PolarisPrincipal.class),
ArgumentMatchers.any(),
eq(PolarisAuthorizableOperation.LIST_CATALOGS),
- ArgumentMatchers.any(),
- ArgumentMatchers.<List<PolarisResolvedPathWrapper>>any());
+ any(ResolvedIntent.class));
AuthorizationRequest request =
new AuthorizationRequest(
@@ -169,8 +167,7 @@ public class PolarisAuthorizerImplTest {
eq(principal),
eq(Set.of()),
eq(PolarisAuthorizableOperation.LIST_CATALOGS),
- eq(List.of(rootWrapper)),
- eq(null));
+ eq(new ResolvedIntent(List.of(rootWrapper), null)));
}
@Test
@@ -193,8 +190,7 @@ public class PolarisAuthorizerImplTest {
any(PolarisPrincipal.class),
ArgumentMatchers.any(),
eq(PolarisAuthorizableOperation.LIST_NAMESPACES),
- ArgumentMatchers.any(),
- ArgumentMatchers.<List<PolarisResolvedPathWrapper>>any());
+ any(ResolvedIntent.class));
AuthorizationRequest request =
new AuthorizationRequest(
@@ -216,8 +212,7 @@ public class PolarisAuthorizerImplTest {
eq(principal),
eq(Set.of()),
eq(PolarisAuthorizableOperation.LIST_NAMESPACES),
- eq(List.of(namespaceWrapper)),
- eq(null));
+ eq(new ResolvedIntent(List.of(namespaceWrapper), null)));
}
@Test
@@ -238,8 +233,7 @@ public class PolarisAuthorizerImplTest {
any(PolarisPrincipal.class),
ArgumentMatchers.any(),
eq(PolarisAuthorizableOperation.GET_CATALOG),
- ArgumentMatchers.any(),
- ArgumentMatchers.<List<PolarisResolvedPathWrapper>>any());
+ any(ResolvedIntent.class));
AuthorizationDecision decision =
authorizer.authorize(
@@ -262,15 +256,13 @@ public class PolarisAuthorizerImplTest {
eq(principal),
eq(Set.of()),
eq(PolarisAuthorizableOperation.GET_CATALOG),
- eq(List.of(firstCatalogWrapper)),
- eq(null));
+ eq(new ResolvedIntent(List.of(firstCatalogWrapper), null)));
verify(authorizer, times(1))
.findMissingPrivileges(
eq(principal),
eq(Set.of()),
eq(PolarisAuthorizableOperation.GET_CATALOG),
- eq(List.of(secondCatalogWrapper)),
- eq(null));
+ eq(new ResolvedIntent(List.of(secondCatalogWrapper), null)));
}
@Test
@@ -291,8 +283,7 @@ public class PolarisAuthorizerImplTest {
any(PolarisPrincipal.class),
ArgumentMatchers.any(),
any(PolarisAuthorizableOperation.class),
- ArgumentMatchers.any(),
- ArgumentMatchers.<List<PolarisResolvedPathWrapper>>any());
+ any(ResolvedIntent.class));
PolarisSecurable tableTarget =
PolarisSecurable.of(
@@ -317,15 +308,13 @@ public class PolarisAuthorizerImplTest {
eq(principal),
eq(Set.of()),
eq(PolarisAuthorizableOperation.REMOVE_TABLE_PROPERTIES),
- eq(List.of(tableWrapper)),
- eq(null));
+ eq(new ResolvedIntent(List.of(tableWrapper), null)));
verify(authorizer, times(1))
.findMissingPrivileges(
eq(principal),
eq(Set.of()),
eq(PolarisAuthorizableOperation.SET_TABLE_SNAPSHOT_REF),
- eq(List.of(tableWrapper)),
- eq(null));
+ eq(new ResolvedIntent(List.of(tableWrapper), null)));
}
@Test
@@ -511,8 +500,7 @@ public class PolarisAuthorizerImplTest {
PolarisPrincipal.of("alice", Map.of(), Set.of("reader")),
Set.of(),
PolarisAuthorizableOperation.CREATE_TABLE_DIRECT,
- List.of(namespace),
- null);
+ new ResolvedIntent(List.of(namespace), null));
assertThat(missing).isEmpty();
}