This is an automated email from the ASF dual-hosted git repository. rmani pushed a commit to branch RANGER-5130 in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 32bd2b43c143e04d2f05c45e4a6ca8bb968ebe4e Author: Ramesh Mani <[email protected]> AuthorDate: Wed Feb 5 17:01:04 2025 -0800 RANGER-5130:DatSet policies fail to authorize when condition expression is present --- security-admin/src/main/java/org/apache/ranger/rest/GdsREST.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/security-admin/src/main/java/org/apache/ranger/rest/GdsREST.java b/security-admin/src/main/java/org/apache/ranger/rest/GdsREST.java index 0d3ef3d767..0d7f90dba2 100755 --- a/security-admin/src/main/java/org/apache/ranger/rest/GdsREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/GdsREST.java @@ -108,8 +108,6 @@ public class GdsREST { private static final Logger LOG = LoggerFactory.getLogger(GdsREST.class); private static final Logger PERF_LOG = RangerPerfTracer.getPerfLogger("rest.GdsREST"); - public static final String GDS_POLICY_EXPR_CONDITION = "expression"; - private static final String PRINCIPAL_TYPE_USER = RangerPrincipal.PrincipalType.USER.name().toLowerCase(); private static final String PRINCIPAL_TYPE_GROUP = RangerPrincipal.PrincipalType.GROUP.name().toLowerCase(); private static final String PRINCIPAL_TYPE_ROLE = RangerPrincipal.PrincipalType.ROLE.name().toLowerCase(); @@ -117,6 +115,8 @@ public class GdsREST { private static final RangerAdminConfig config = RangerAdminConfig.getInstance(); private static final int SHARED_RESOURCES_MAX_BATCH_SIZE = config.getInt("ranger.admin.rest.gds.shared.resources.max.batch.size", 100); + public static final String GDS_POLICY_VALIDITY_SCHEDULE_CONDITION = "validitySchedule"; + @Autowired GdsDBStore gdsStore; @@ -2134,7 +2134,7 @@ private RangerPolicyItem transformGrantToPolicyItem(RangerGrant grant) { } if (CollectionUtils.isNotEmpty(conditions)) { - policyItem.setConditions(conditions.stream().map(condition -> new RangerPolicyItemCondition(GDS_POLICY_EXPR_CONDITION, Collections.singletonList(condition))).collect(Collectors.toList())); + policyItem.setConditions(conditions.stream().map(condition -> new RangerPolicyItemCondition(GDS_POLICY_VALIDITY_SCHEDULE_CONDITION, Collections.singletonList(condition))).collect(Collectors.toList())); } switch (grant.getPrincipal().getType()) {
