dimas-b commented on code in PR #2048: URL: https://github.com/apache/polaris/pull/2048#discussion_r2208541242
########## polaris-core/src/main/java/org/apache/polaris/core/policy/content/AccessControlPolicyContent.java: ########## @@ -0,0 +1,120 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.polaris.core.policy.content; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.google.common.base.Strings; +import java.util.List; +import java.util.Set; +import org.apache.iceberg.expressions.Expression; +import org.apache.polaris.core.policy.validator.InvalidPolicyException; + +public class AccessControlPolicyContent implements PolicyContent { + + // Optional, if there means policies is applicable to the role + private String principalRole; + + // TODO: model them as iceberg transforms Review Comment: Is there a plan to redo this policy definition after merging or before merging this PR? ########## polaris-core/src/main/java/org/apache/polaris/core/policy/PredefinedPolicyTypes.java: ########## @@ -28,7 +28,8 @@ public enum PredefinedPolicyTypes implements PolicyType { DATA_COMPACTION(0, "system.data-compaction", true), METADATA_COMPACTION(1, "system.metadata-compaction", true), ORPHAN_FILE_REMOVAL(2, "system.orphan-file-removal", true), - SNAPSHOT_EXPIRY(3, "system.snapshot-expiry", true); + SNAPSHOT_EXPIRY(3, "system.snapshot-expiry", true), + ACCESS_CONTROL(4, "system.access-control", false); Review Comment: The term `ACCESS_CONTROL` is too generic IMHO. How about `TABLE_DATA_ACCESS_EXPRESSIONS`? The "expression" part related to the fact that this policy uses Iceberg expressions to represent filters. ########## polaris-core/src/main/java/org/apache/polaris/core/policy/content/AccessControlPolicyContent.java: ########## @@ -0,0 +1,120 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.polaris.core.policy.content; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.google.common.base.Strings; +import java.util.List; +import java.util.Set; +import org.apache.iceberg.expressions.Expression; +import org.apache.polaris.core.policy.validator.InvalidPolicyException; + +public class AccessControlPolicyContent implements PolicyContent { + + // Optional, if there means policies is applicable to the role + private String principalRole; + + // TODO: model them as iceberg transforms + private List<String> columnProjections; + + // Iceberg expressions without context functions for now. + // Use a custom deserializer for the list of Iceberg Expressions + @JsonDeserialize(using = IcebergExpressionListDeserializer.class) + @JsonSerialize(using = IcebergExpressionListSerializer.class) + private List<Expression> rowFilters; Review Comment: How can this work "without context functions"? How will Polaris code interface with these expressions? ########## polaris-core/src/main/java/org/apache/polaris/core/policy/content/AccessControlPolicyContent.java: ########## @@ -0,0 +1,120 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.polaris.core.policy.content; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.google.common.base.Strings; +import java.util.List; +import java.util.Set; +import org.apache.iceberg.expressions.Expression; +import org.apache.polaris.core.policy.validator.InvalidPolicyException; + +public class AccessControlPolicyContent implements PolicyContent { + + // Optional, if there means policies is applicable to the role + private String principalRole; + + // TODO: model them as iceberg transforms + private List<String> columnProjections; + + // Iceberg expressions without context functions for now. + // Use a custom deserializer for the list of Iceberg Expressions + @JsonDeserialize(using = IcebergExpressionListDeserializer.class) + @JsonSerialize(using = IcebergExpressionListSerializer.class) Review Comment: This binds Polaris API to internal serialization code in Iceberg. Iceberg changes in `Expression` serialization will affect Polaris APIs. I'd like to avoid this dependency. ########## service/common/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalog.java: ########## @@ -525,16 +535,17 @@ private static Policy constructPolicy(PolicyEntity policyEntity) { .build(); } - private static ApplicablePolicy constructApplicablePolicy( - PolicyEntity policyEntity, boolean inherited) { + private ApplicablePolicy constructApplicablePolicy(PolicyEntity policyEntity, boolean inherited) { Namespace parentNamespace = policyEntity.getParentNamespace(); return ApplicablePolicy.builder() .setPolicyType(policyEntity.getPolicyType().getName()) .setInheritable(policyEntity.getPolicyType().isInheritable()) .setName(policyEntity.getName()) .setDescription(policyEntity.getDescription()) - .setContent(policyEntity.getContent()) + .setContent( + PolicyUtil.replaceContextVariable( + policyEntity.getContent(), policyEntity.getPolicyType(), authenticatedPrincipal)) Review Comment: It would be nice to have a more flexible / extensible approach to connecting policies with the security context than a simple reference to `AuthenticatedPolarisPrincipal`. The Principal may not be the only factor in making access decisions. ########## polaris-core/src/main/java/org/apache/polaris/core/policy/content/AccessControlPolicyContent.java: ########## @@ -0,0 +1,120 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.polaris.core.policy.content; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.google.common.base.Strings; +import java.util.List; +import java.util.Set; +import org.apache.iceberg.expressions.Expression; +import org.apache.polaris.core.policy.validator.InvalidPolicyException; + +public class AccessControlPolicyContent implements PolicyContent { + + // Optional, if there means policies is applicable to the role + private String principalRole; Review Comment: How does this policy apply to a role? What is the mechanism? I could not find this in the linked doc :thinking: ########## polaris-core/src/main/java/org/apache/polaris/core/policy/PolicyUtil.java: ########## @@ -0,0 +1,108 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.polaris.core.policy; + +import static org.apache.polaris.core.policy.PredefinedPolicyTypes.ACCESS_CONTROL; + +import com.google.common.collect.Lists; +import java.util.List; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.Expressions; +import org.apache.iceberg.expressions.UnboundPredicate; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.policy.content.AccessControlPolicyContent; + +public class PolicyUtil { + private PolicyUtil() {} + + public static String replaceContextVariable( + String content, PolicyType policyType, AuthenticatedPolarisPrincipal authenticatedPrincipal) { + if (policyType == ACCESS_CONTROL) { Review Comment: Why force all policies to go through this `if`? Would it be possible to refactor the code to leverage java types for invoking type-specific replacements? ########## polaris-core/src/main/java/org/apache/polaris/core/policy/validator/PolicyValidators.java: ########## @@ -98,6 +102,10 @@ public static boolean canAttach(PolicyEntity policy, PolarisEntity targetEntity) case ORPHAN_FILE_REMOVAL: return BaseMaintenancePolicyValidator.INSTANCE.canAttach(entityType, entitySubType); + case ACCESS_CONTROL: + // TODO: Add validator for attaching this only to table Review Comment: What's the reason for deferring this? ########## polaris-core/src/main/java/org/apache/polaris/core/policy/content/AccessControlPolicyContent.java: ########## @@ -0,0 +1,120 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.polaris.core.policy.content; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.google.common.base.Strings; +import java.util.List; +import java.util.Set; +import org.apache.iceberg.expressions.Expression; +import org.apache.polaris.core.policy.validator.InvalidPolicyException; + +public class AccessControlPolicyContent implements PolicyContent { + + // Optional, if there means policies is applicable to the role + private String principalRole; + + // TODO: model them as iceberg transforms + private List<String> columnProjections; + + // Iceberg expressions without context functions for now. + // Use a custom deserializer for the list of Iceberg Expressions + @JsonDeserialize(using = IcebergExpressionListDeserializer.class) + @JsonSerialize(using = IcebergExpressionListSerializer.class) + private List<Expression> rowFilters; + + private static final String DEFAULT_POLICY_SCHEMA_VERSION = "2025-02-03"; + private static final Set<String> POLICY_SCHEMA_VERSIONS = Set.of(DEFAULT_POLICY_SCHEMA_VERSION); Review Comment: unused? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@polaris.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
