From 6d217185b656aefb4afd9e88e97a824ec1b1e95e Mon Sep 17 00:00:00 2001 From: Madhan Neethiraj Date: Fri, 20 Nov 2026 16:20:30 -0800 Subject: [PATCH] RANGER-5884: audit ingestor rejects calls from PDP server --- .../apache/ranger/audit/rest/AuditREST.java | 24 +++++----- .../apache/ranger/pdp/rest/RangerPdpREST.java | 47 ++++++------------- .../ranger/pdp/rest/RangerPdpRESTTest.java | 8 ++-- 3 files changed, 32 insertions(+), 47 deletions(-) diff --git a/audit-server/audit-ingestor/src/main/java/org/apache/ranger/audit/rest/AuditREST.java b/audit-server/audit-ingestor/src/main/java/org/apache/ranger/audit/rest/AuditREST.java index d4fd97d98f..2e9cc27a1c 100644 --- a/audit-server/audit-ingestor/src/main/java/org/apache/ranger/audit/rest/AuditREST.java +++ b/audit-server/audit-ingestor/src/main/java/org/apache/ranger/audit/rest/AuditREST.java @@ -68,9 +68,11 @@ public class AuditREST { private static final String PROP_POLICY_REST_URL = RANGER_ADMIN_CONFIG_PREFIX + ".policy.rest.url"; private static final String PROP_POLICY_POLL_INTERVAL_MS = RANGER_ADMIN_CONFIG_PREFIX + ".policy.pollIntervalMs"; private static final long DEFAULT_POLL_INTERVAL_MS = 30 * 1000L; + private static final String WILDCARD_SERVICE_NAME = "*"; private static final Map> configuredAllowedUsers; + private static volatile Set wildcardServiceUsers = Collections.emptySet(); private static volatile Map> allowedServiceUsers; private static RangerAdminRESTClient rangerAdminClient; private static Timer serviceAccountUsersRefreshTimer; @@ -152,18 +154,16 @@ static Map> mergeAllowedUsers(Map> confi Set serviceAccountUsers = entry.getValue(); if (StringUtils.isNotBlank(serviceName) && serviceAccountUsers != null && !serviceAccountUsers.isEmpty()) { - Set allowedUsers = ret.get(serviceName); - - if (allowedUsers == null) { - allowedUsers = new HashSet<>(); - - ret.put(serviceName, allowedUsers); - } + Set allowedUsers = ret.computeIfAbsent(serviceName, k -> new HashSet<>()); allowedUsers.addAll(serviceAccountUsers); } } + Set wildcardServiceUsers = ret.get(WILDCARD_SERVICE_NAME); + + AuditREST.wildcardServiceUsers = wildcardServiceUsers != null ? wildcardServiceUsers : Collections.emptySet(); + return ret; } @@ -433,14 +433,16 @@ private static void initializeAuthToLocal() { * @return true if user is allowed, false otherwise */ private boolean isAllowedServiceUser(String serviceName, String userName) { - boolean ret; + final boolean ret; - if (StringUtils.isNotBlank(serviceName) && StringUtils.isNotBlank(userName)) { + if (StringUtils.isBlank(serviceName) || StringUtils.isBlank(userName)) { + ret = false; + } else if (wildcardServiceUsers.contains(userName)) { + ret = true; + } else { Set allowedUsers = allowedServiceUsers.get(serviceName); ret = allowedUsers != null && allowedUsers.contains(userName); - } else { - ret = false; } LOG.debug("isAllowedServiceUser(serviceName={}, userName={}): ret={}", serviceName, userName, ret); diff --git a/pdp/src/main/java/org/apache/ranger/pdp/rest/RangerPdpREST.java b/pdp/src/main/java/org/apache/ranger/pdp/rest/RangerPdpREST.java index 45e6af63af..f6fe48f9a6 100644 --- a/pdp/src/main/java/org/apache/ranger/pdp/rest/RangerPdpREST.java +++ b/pdp/src/main/java/org/apache/ranger/pdp/rest/RangerPdpREST.java @@ -116,6 +116,7 @@ public class RangerPdpREST { private final Map> configuredDelegationUsers = new HashMap<>(); + private volatile Set wildcardServiceUsers = Collections.emptySet(); private volatile Map> delegationUsersByService = Collections.emptyMap(); private RangerAdminRESTClient rangerAdminClient; private Timer serviceAccountUsersRefreshTimer; @@ -501,19 +502,14 @@ private void recordRequestMetrics(Response ret, long startNanos, HttpServletRequ } private boolean isDelegationUserForService(String serviceName, String userName) { - final boolean ret; - Map> currentDelegationUsersByService = delegationUsersByService; + final boolean ret; - if (currentDelegationUsersByService.isEmpty()) { - ret = false; - } else if (StringUtils.isBlank(serviceName) || StringUtils.isBlank(userName)) { + if (StringUtils.isBlank(serviceName) || StringUtils.isBlank(userName)) { ret = false; + } else if (wildcardServiceUsers.contains(userName)) { + ret = true; } else { - Set delegationUsers = currentDelegationUsersByService.get(serviceName); - - if (delegationUsers == null) { - delegationUsers = currentDelegationUsersByService.get(RangerPdpConstants.WILDCARD_SERVICE_NAME); - } + Set delegationUsers = delegationUsersByService.get(serviceName); ret = delegationUsers != null && delegationUsers.contains(userName); } @@ -568,22 +564,11 @@ void refreshDelegationUsers() { } } - static Map> mergeDelegationUsers(Map> configuredDelegationUsers, Map> serviceAccountUsersByServiceName) { - Map> ret = new HashMap<>(); - Set wildcardDelegationUsers = configuredDelegationUsers.get(WILDCARD_SERVICE_NAME); - - if (wildcardDelegationUsers == null) { - wildcardDelegationUsers = Collections.emptySet(); - } + Map> mergeDelegationUsers(Map> configuredDelegationUsers, Map> serviceAccountUsersByServiceName) { + Map> ret = new HashMap<>(); for (Map.Entry> entry : configuredDelegationUsers.entrySet()) { - Set delegationUsers = new HashSet<>(entry.getValue()); - - if (!WILDCARD_SERVICE_NAME.equals(entry.getKey())) { - delegationUsers.addAll(wildcardDelegationUsers); - } - - ret.put(entry.getKey(), delegationUsers); + ret.put(entry.getKey(), new HashSet<>(entry.getValue())); } for (Map.Entry> entry : serviceAccountUsersByServiceName.entrySet()) { @@ -591,20 +576,16 @@ static Map> mergeDelegationUsers(Map> co Set serviceAccountUsers = entry.getValue(); if (StringUtils.isNotBlank(serviceName) && serviceAccountUsers != null && !serviceAccountUsers.isEmpty()) { - Set delegationUsersForService = ret.get(serviceName); - Set delegationUsers = new HashSet<>(); - - if (delegationUsersForService != null) { - delegationUsers.addAll(delegationUsersForService); - } else if (!WILDCARD_SERVICE_NAME.equals(serviceName)) { - delegationUsers.addAll(wildcardDelegationUsers); - } + Set delegationUsers = ret.computeIfAbsent(serviceName, k -> new HashSet<>()); delegationUsers.addAll(serviceAccountUsers); - ret.put(serviceName, delegationUsers); } } + Set wildcardServiceUsers = ret.get(WILDCARD_SERVICE_NAME); + + this.wildcardServiceUsers = (wildcardServiceUsers != null) ? wildcardServiceUsers : Collections.emptySet(); + return ret; } diff --git a/pdp/src/test/java/org/apache/ranger/pdp/rest/RangerPdpRESTTest.java b/pdp/src/test/java/org/apache/ranger/pdp/rest/RangerPdpRESTTest.java index 5832a58796..017b020f03 100644 --- a/pdp/src/test/java/org/apache/ranger/pdp/rest/RangerPdpRESTTest.java +++ b/pdp/src/test/java/org/apache/ranger/pdp/rest/RangerPdpRESTTest.java @@ -221,10 +221,12 @@ public void testMergeDelegationUsersUnionsServiceAccountUsersAndWildcard() { serviceAccountUsersByServiceName.put("svc1", Collections.singleton("svc-user")); serviceAccountUsersByServiceName.put("svc2", Collections.singleton("only-dynamic")); - Map> mergedDelegationUsers = RangerPdpREST.mergeDelegationUsers(configuredDelegationUsers, serviceAccountUsersByServiceName); + RangerPdpREST pdpREST = new RangerPdpREST(); - assertEquals(new HashSet<>(Arrays.asList(CALLER_DELEGATION_ALLOWED, "wild", "svc-user")), mergedDelegationUsers.get("svc1")); - assertEquals(new HashSet<>(Arrays.asList("wild", "only-dynamic")), mergedDelegationUsers.get("svc2")); + Map> mergedDelegationUsers = pdpREST.mergeDelegationUsers(configuredDelegationUsers, serviceAccountUsersByServiceName); + + assertEquals(new HashSet<>(Arrays.asList(CALLER_DELEGATION_ALLOWED, "svc-user")), mergedDelegationUsers.get("svc1")); + assertEquals(new HashSet<>(Arrays.asList("only-dynamic")), mergedDelegationUsers.get("svc2")); assertEquals(Collections.singleton("wild"), mergedDelegationUsers.get("*")); }