(ranger) branch ranger-2.6 updated: RANGER-4961: fix REST API to retrieve policies for a resource to include tag-based policies as well

[madhan]

This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch ranger-2.6
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/ranger-2.6 by this push:
     new ebf00c959 RANGER-4961: fix REST API to retrieve policies for a 
resource to include tag-based policies as well
ebf00c959 is described below

commit ebf00c959a9b2696ebe09521be19e275feced6f8
Author: Madhan Neethiraj <mad...@apache.org>
AuthorDate: Wed Oct 16 09:53:37 2024 -0700

    RANGER-4961: fix REST API to retrieve policies for a resource to include 
tag-based policies as well
    
    (cherry picked from commit 41de6c6ebb775945b4f8ef3494a6266df06c1f38)
---
 .../plugin/policyengine/RangerPolicyRepository.java  | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git 
a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
 
b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
index e02d3a32d..5185b7426 100644
--- 
a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
+++ 
b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
@@ -1009,17 +1009,19 @@ public class RangerPolicyRepository {
                     }
                 }
 
-                if (!options.disableContextEnrichers) {
-                    RangerServiceDef.RangerContextEnricherDef 
contextEnricherDef = enricherDef;
-
-                    // Following will be true only if the engine is 
initialized within ranger-admin
-                    if (options.enableTagEnricherWithLocalRefresher && 
StringUtils.equals(enricherDef.getEnricher(), 
RangerTagEnricher.class.getName())) {
-                        contextEnricherDef = new 
RangerServiceDef.RangerContextEnricherDef(enricherDef.getItemId(), 
enricherDef.getName(), "org.apache.ranger.common.RangerAdminTagEnricher", null);
-                    } else if 
(options.enableUserStoreEnricherWithLocalRefresher && 
StringUtils.equals(enricherDef.getEnricher(), 
RangerUserStoreEnricher.class.getName())) {
-                        contextEnricherDef = new 
RangerServiceDef.RangerContextEnricherDef(enricherDef.getItemId(), 
enricherDef.getName(), "org.apache.ranger.common.RangerAdminUserStoreEnricher", 
null);
+                // Following 2 cases will be true only if the engine is 
initialized within ranger-admin
+                if (options.enableTagEnricherWithLocalRefresher && 
StringUtils.equals(enricherDef.getEnricher(), 
RangerTagEnricher.class.getName())) {
+                    enricherDef = new 
RangerServiceDef.RangerContextEnricherDef(enricherDef.getItemId(), 
enricherDef.getName(), "org.apache.ranger.common.RangerAdminTagEnricher", null);
+                } else if (options.enableUserStoreEnricherWithLocalRefresher 
&& StringUtils.equals(enricherDef.getEnricher(), 
RangerUserStoreEnricher.class.getName())) {
+                    enricherDef = new 
RangerServiceDef.RangerContextEnricherDef(enricherDef.getItemId(), 
enricherDef.getName(), "org.apache.ranger.common.RangerAdminUserStoreEnricher", 
null);
+                } else {
+                    if (options.disableContextEnrichers) {
+                        enricherDef = null;
                     }
+                }
 
-                    RangerContextEnricher contextEnricher = 
buildContextEnricher(contextEnricherDef, options);
+                if (enricherDef != null) {
+                    RangerContextEnricher contextEnricher = 
buildContextEnricher(enricherDef, options);
 
                     if (contextEnricher != null) {
                         contextEnrichers.add(contextEnricher);