Skip to content

[Policy Store] Fix: Add CATALOG_MANAGE_METADATA to policy attachment privileges' super privilege set #1643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
singhpk234 merged 1 commit into from
May 22, 2025
Merged

[Policy Store] Fix: Add CATALOG_MANAGE_METADATA to policy attachment privileges' super privilege set #1643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,20 +507,28 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
POLICY_FULL_METADATA,
CATALOG_MANAGE_METADATA,
CATALOG_MANAGE_CONTENT));
SUPER_PRIVILEGES.putAll(POLICY_ATTACH, List.of(POLICY_ATTACH, CATALOG_MANAGE_CONTENT));
SUPER_PRIVILEGES.putAll(POLICY_DETACH, List.of(POLICY_DETACH, CATALOG_MANAGE_CONTENT));
SUPER_PRIVILEGES.putAll(
CATALOG_ATTACH_POLICY, List.of(CATALOG_ATTACH_POLICY, CATALOG_MANAGE_CONTENT));
POLICY_ATTACH, List.of(POLICY_ATTACH, CATALOG_MANAGE_METADATA, CATALOG_MANAGE_CONTENT));
SUPER_PRIVILEGES.putAll(
NAMESPACE_ATTACH_POLICY, List.of(NAMESPACE_ATTACH_POLICY, CATALOG_MANAGE_CONTENT));
POLICY_DETACH, List.of(POLICY_DETACH, CATALOG_MANAGE_METADATA, CATALOG_MANAGE_CONTENT));
Comment on lines -510 to +513
Copy link
Contributor

@flyrain flyrain May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change looks good to me, but Github did something weird here.

SUPER_PRIVILEGES.putAll(
TABLE_ATTACH_POLICY, List.of(TABLE_ATTACH_POLICY, CATALOG_MANAGE_CONTENT));
CATALOG_ATTACH_POLICY,
List.of(CATALOG_ATTACH_POLICY, CATALOG_MANAGE_METADATA, CATALOG_MANAGE_CONTENT));
SUPER_PRIVILEGES.putAll(
CATALOG_DETACH_POLICY, List.of(CATALOG_DETACH_POLICY, CATALOG_MANAGE_CONTENT));
NAMESPACE_ATTACH_POLICY,
List.of(NAMESPACE_ATTACH_POLICY, CATALOG_MANAGE_METADATA, CATALOG_MANAGE_CONTENT));
SUPER_PRIVILEGES.putAll(
NAMESPACE_DETACH_POLICY, List.of(NAMESPACE_DETACH_POLICY, CATALOG_MANAGE_CONTENT));
TABLE_ATTACH_POLICY,
List.of(TABLE_ATTACH_POLICY, CATALOG_MANAGE_METADATA, CATALOG_MANAGE_CONTENT));
SUPER_PRIVILEGES.putAll(
TABLE_DETACH_POLICY, List.of(TABLE_DETACH_POLICY, CATALOG_MANAGE_CONTENT));
CATALOG_DETACH_POLICY,
List.of(CATALOG_DETACH_POLICY, CATALOG_MANAGE_METADATA, CATALOG_MANAGE_CONTENT));
SUPER_PRIVILEGES.putAll(
NAMESPACE_DETACH_POLICY,
List.of(NAMESPACE_DETACH_POLICY, CATALOG_MANAGE_METADATA, CATALOG_MANAGE_CONTENT));
SUPER_PRIVILEGES.putAll(
TABLE_DETACH_POLICY,
List.of(TABLE_DETACH_POLICY, CATALOG_MANAGE_METADATA, CATALOG_MANAGE_CONTENT));
}

private final PolarisConfigurationStore featureConfig;
Expand Down
6 changes: 6 additions & 0 deletions ...c/test/java/org/apache/polaris/service/quarkus/catalog/PolicyCatalogHandlerAuthzTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ public void testAttachPolicyToCatalogSufficientPrivileges() {
doTestSufficientPrivilegeSets(
List.of(
Set.of(PolarisPrivilege.POLICY_ATTACH, PolarisPrivilege.CATALOG_ATTACH_POLICY),
Set.of(PolarisPrivilege.CATALOG_MANAGE_METADATA),
Set.of(PolarisPrivilege.CATALOG_MANAGE_CONTENT)),
() -> newWrapper(Set.of(PRINCIPAL_ROLE1)).attachPolicy(POLICY_NS1_1, attachPolicyRequest),
() -> newWrapper(Set.of(PRINCIPAL_ROLE2)).detachPolicy(POLICY_NS1_1, detachPolicyRequest),
Expand Down Expand Up @@ -405,6 +406,7 @@ public void testAttachPolicyToNamespaceSufficientPrivileges() {
doTestSufficientPrivilegeSets(
List.of(
Set.of(PolarisPrivilege.POLICY_ATTACH, PolarisPrivilege.NAMESPACE_ATTACH_POLICY),
Set.of(PolarisPrivilege.CATALOG_MANAGE_METADATA),
Set.of(PolarisPrivilege.CATALOG_MANAGE_CONTENT)),
() -> newWrapper(Set.of(PRINCIPAL_ROLE1)).attachPolicy(POLICY_NS1_1, attachPolicyRequest),
() -> newWrapper(Set.of(PRINCIPAL_ROLE2)).detachPolicy(POLICY_NS1_1, detachPolicyRequest));
Expand Down Expand Up @@ -453,6 +455,7 @@ public void testAttachPolicyToTableSufficientPrivileges() {
doTestSufficientPrivilegeSets(
List.of(
Set.of(PolarisPrivilege.POLICY_ATTACH, PolarisPrivilege.TABLE_ATTACH_POLICY),
Set.of(PolarisPrivilege.CATALOG_MANAGE_METADATA),
Set.of(PolarisPrivilege.CATALOG_MANAGE_CONTENT)),
() -> newWrapper(Set.of(PRINCIPAL_ROLE1)).attachPolicy(POLICY_NS1_1, attachPolicyRequest),
() -> newWrapper(Set.of(PRINCIPAL_ROLE2)).detachPolicy(POLICY_NS1_1, detachPolicyRequest));
Expand Down Expand Up @@ -507,6 +510,7 @@ public void testDetachPolicyFromCatalogSufficientPrivileges() {
doTestSufficientPrivilegeSets(
List.of(
Set.of(PolarisPrivilege.POLICY_DETACH, PolarisPrivilege.CATALOG_DETACH_POLICY),
Set.of(PolarisPrivilege.CATALOG_MANAGE_METADATA),
Set.of(PolarisPrivilege.CATALOG_MANAGE_CONTENT)),
() -> newWrapper(Set.of(PRINCIPAL_ROLE1)).detachPolicy(POLICY_NS1_1, detachPolicyRequest),
() ->
Expand Down Expand Up @@ -589,6 +593,7 @@ public void testDetachPolicyFromNamespaceSufficientPrivileges() {
doTestSufficientPrivilegeSets(
List.of(
Set.of(PolarisPrivilege.POLICY_DETACH, PolarisPrivilege.NAMESPACE_DETACH_POLICY),
Set.of(PolarisPrivilege.CATALOG_MANAGE_METADATA),
Set.of(PolarisPrivilege.CATALOG_MANAGE_CONTENT)),
() -> newWrapper(Set.of(PRINCIPAL_ROLE1)).detachPolicy(POLICY_NS1_1, detachPolicyRequest),
() ->
Expand Down Expand Up @@ -674,6 +679,7 @@ public void testDetachPolicyFromTableSufficientPrivileges() {
doTestSufficientPrivilegeSets(
List.of(
Set.of(PolarisPrivilege.POLICY_DETACH, PolarisPrivilege.TABLE_DETACH_POLICY),
Set.of(PolarisPrivilege.CATALOG_MANAGE_METADATA),
Set.of(PolarisPrivilege.CATALOG_MANAGE_CONTENT)),
() -> newWrapper(Set.of(PRINCIPAL_ROLE1)).detachPolicy(POLICY_NS1_1, detachPolicyRequest),
() ->
Expand Down
Loading