Merge remote-tracking branch 'upstream/ranger-2.2' into beta

atlanhq · Nov 29, 2021 · 1dad72c · 1dad72c
2 parents 6d5a0a8 + dd297ce
commit 1dad72c
Show file tree

Hide file tree

Showing 88 changed files with 216 additions and 358 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache Ranger
-Copyright 2014-2019 The Apache Software Foundation
+Copyright 2014-2021 The Apache Software Foundation
 
 This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
 This product includes software developed by Spring Security Project (http://www.springframework.org/security)

diff --git a/README.txt b/README.txt
@@ -58,6 +58,9 @@ Build Process
    ranger-<version>-yarn-plugin.tar.gz
    ranger-<version>-kylin-plugin.tar.gz
    ranger-<version>-elasticsearch-plugin.tar.gz
+   ranger-<version>-ozone-plugin.tar.gz
+   ranger-<version>-presto-plugin.tar.gz
+   ranger-<version>-schema-registry-plugin.tar.gz
 
 Importing Apache Ranger Project into Eclipse
 ============================================
@@ -85,6 +88,9 @@ Installation Host Information
     (h)  Sqoop plugin needs to be installed on Sqoop2 hosts
     (i)  Kylin plugin needs to be installed on Kylin hosts
     (j)  Elasticsearch plugin needs to be installed on Elasticsearch hosts
+    (k)  Ozone plugin needs to be installed on Ozone hosts
+    (l)  Presto plugin needs to be installed on Presto hosts
+    (m)  Schema Registry plugin needs to be installed on Schema Registry hosts
 
 Installation Process
 ~~~~~~~~~~~~~~~~~~~~

diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.ranger</groupId>
         <artifactId>ranger</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.0</version>
         <relativePath>..</relativePath>
     </parent>
     <dependencies>
@@ -303,11 +303,6 @@
             <artifactId>log4j-api</artifactId>
             <version>${log4j.core.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>${httpcomponents.httpcore.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-storage-api</artifactId>

diff --git a/agents-common/pom.xml b/agents-common/pom.xml
@@ -39,7 +39,7 @@
     <parent>
         <groupId>org.apache.ranger</groupId>
         <artifactId>ranger</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.0</version>
         <relativePath>..</relativePath>
     </parent>
     <dependencies>

diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/PolicyEngine.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/PolicyEngine.java
@@ -849,22 +849,16 @@ private void getDeltasSortedByZones(PolicyEngine current, ServicePolicies servic
             Map<String, List<RangerPolicyDelta>> zoneDeltasMap = new HashMap<>();
 
             for (Map.Entry<String, ServicePolicies.SecurityZoneInfo> zone : servicePolicies.getSecurityZones().entrySet()) {
-                List<RangerPolicyDelta> deltas = zone.getValue().getPolicyDeltas();
+                String                  zoneName   = zone.getKey();
+                List<RangerPolicyDelta> deltas     = zone.getValue().getPolicyDeltas();
+                List<RangerPolicyDelta> zoneDeltas = new ArrayList<>();
 
-                for (RangerPolicyDelta delta : deltas) {
-                    String zoneName = delta.getZoneName();
-
-                    if (StringUtils.isNotEmpty(zoneName)) {
-                        List<RangerPolicyDelta> zoneDeltas = zoneDeltasMap.get(zoneName);
-
-                        if (zoneDeltas == null) {
-                            zoneDeltas = new ArrayList<>();
-                            zoneDeltasMap.put(zoneName, zoneDeltas);
-                        }
+                if (StringUtils.isNotEmpty(zoneName)) {
+                    zoneDeltasMap.put(zoneName, zoneDeltas);
 
+                    for (RangerPolicyDelta delta : deltas) {
+                        zoneDeltas = zoneDeltasMap.get(zoneName);
                         zoneDeltas.add(delta);
-                    } else {
-                        LOG.warn("policyDelta : [" + delta + "] does not belong to any zone. Should not have come here.");
                     }
                 }
             }

diff --git a/...ts-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java b/...ts-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
@@ -988,14 +988,12 @@ private void init(RangerPolicyEngineOptions options) {
                 LOG.debug("rowFilter policy evaluation order: #" + (++order) + " - policy id=" + policy.getId() + "; name=" + policy.getName() + "; evalOrder=" + policyEvaluator.getEvalOrder());
             }
 
-            LOG.debug("audit policy evaluation order: " + ((this.auditPolicyEvaluators != null) ? this.auditPolicyEvaluators.size() : 0  + " policies"));
-            if (this.auditPolicyEvaluators != null) {
-                order = 0;
-                for(RangerPolicyEvaluator policyEvaluator : this.auditPolicyEvaluators) {
-                    RangerPolicy policy = policyEvaluator.getPolicy();
+            LOG.debug("audit policy evaluation order: " + this.auditPolicyEvaluators.size() + " policies");
+            order = 0;
+            for(RangerPolicyEvaluator policyEvaluator : this.auditPolicyEvaluators) {
+                RangerPolicy policy = policyEvaluator.getPolicy();
 
-                    LOG.debug("rowFilter policy evaluation order: #" + (++order) + " - policy id=" + policy.getId() + "; name=" + policy.getName() + "; evalOrder=" + policyEvaluator.getEvalOrder());
-                }
+                LOG.debug("rowFilter policy evaluation order: #" + (++order) + " - policy id=" + policy.getId() + "; name=" + policy.getName() + "; evalOrder=" + policyEvaluator.getEvalOrder());
             }
         }
     }

diff --git a/.../src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java b/.../src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java
@@ -138,6 +138,8 @@ public void init(RangerPolicy policy, RangerServiceDef serviceDef, RangerPolicyE
 		if(policy != null) {
 			validityScheduleEvaluators = createValidityScheduleEvaluators(policy);
 
+			this.disableRoleResolution = options.disableRoleResolution;
+
 			if (!options.disableAccessEvaluationWithPolicyACLSummary) {
 				aclSummary = createPolicyACLSummary();
 			}
@@ -152,7 +154,7 @@ public void init(RangerPolicy policy, RangerServiceDef serviceDef, RangerPolicyE
 			} else {
 				allowEvaluators          = createPolicyItemEvaluators(policy, serviceDef, options, RangerPolicyItemEvaluator.POLICY_ITEM_TYPE_ALLOW);
 
-				if (ServiceDefUtil.getOption_enableDenyAndExceptionsInPolicies(serviceDef, getPluginContext())) {
+				if (ServiceDefUtil.getOption_enableDenyAndExceptionsInPolicies(serviceDef, pluginContext)) {
 					denyEvaluators           = createPolicyItemEvaluators(policy, serviceDef, options, RangerPolicyItemEvaluator.POLICY_ITEM_TYPE_DENY);
 					allowExceptionEvaluators = createPolicyItemEvaluators(policy, serviceDef, options, RangerPolicyItemEvaluator.POLICY_ITEM_TYPE_ALLOW_EXCEPTIONS);
 					denyExceptionEvaluators  = createPolicyItemEvaluators(policy, serviceDef, options, RangerPolicyItemEvaluator.POLICY_ITEM_TYPE_DENY_EXCEPTIONS);

diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPolicyDeltaUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPolicyDeltaUtil.java
@@ -134,7 +134,7 @@ public static List<RangerPolicy> applyDeltas(List<RangerPolicy> policies, List<R
             }
         } else {
             if (LOG.isDebugEnabled()) {
-                LOG.warn("Unexpected : applyDeltas called with deltas=null");
+                LOG.debug("applyDeltas called with empty deltas. Will return policies without change");
             }
             ret = policies;
         }

diff --git a/agents-cred/pom.xml b/agents-cred/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.ranger</groupId>
         <artifactId>ranger</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.0</version>
         <relativePath>..</relativePath>
     </parent>
     <dependencies>

diff --git a/agents-installer/pom.xml b/agents-installer/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.ranger</groupId>
         <artifactId>ranger</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.0</version>
         <relativePath>..</relativePath>
     </parent>
     <dependencies>

diff --git a/credentialbuilder/pom.xml b/credentialbuilder/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.ranger</groupId>
         <artifactId>ranger</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.0</version>
         <relativePath>..</relativePath>
     </parent>
     <dependencies>

diff --git a/dev-support/ranger-docker/.env b/dev-support/ranger-docker/.env
@@ -1,13 +1,13 @@
 BUILD_HOST_SRC=true
 SKIPTESTS=true
 GIT_URL=https://github.com/apache/ranger.git
-BRANCH=master
+BRANCH=ranger-2.2
 
 POSTGRES_PASSWORD=rangerR0cks!
 
-RANGER_VERSION=3.0.0-SNAPSHOT
+RANGER_VERSION=2.2.0
 HADOOP_VERSION=3.3.0
 HBASE_VERSION=2.2.6
 HIVE_VERSION=3.1.2
-HIVE_HADOOP_VERSION=3.1.0
+HIVE_HADOOP_VERSION=3.1.1
 KAFKA_VERSION=2.5.0
diff --git a/dev-support/ranger-docker/scripts/ranger-build.sh b/dev-support/ranger-docker/scripts/ranger-build.sh
@@ -19,7 +19,7 @@
 
 if [ "${BRANCH}" == "" ]
 then
-  BRANCH=master
+  BRANCH=ranger-2.1
 fi
 
 if [ "${GIT_URL}" == "" ]

diff --git a/distro/pom.xml b/distro/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.ranger</groupId>
         <artifactId>ranger</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.0</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/distro/src/main/assembly/admin-web.xml b/distro/src/main/assembly/admin-web.xml
@@ -269,7 +269,6 @@
           <include>joda-time:joda-time</include>
           <include>org.apache.ranger:ranger-plugins-cred</include>
           <include>org.apache.ranger:ugsyn-util</include>
-          <include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
           <include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
         </includes>
       </binaries>

diff --git a/distro/src/main/assembly/plugin-kafka.xml b/distro/src/main/assembly/plugin-kafka.xml
@@ -87,6 +87,7 @@
 					<include>org.elasticsearch.plugin:lang-mustache-client</include>
 					<include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
 					<include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
+					<include>org.apache.htrace:htrace-core4</include>
 					<include>org.apache.lucene:lucene-core</include>
 					<include>joda-time:joda-time</include>
 					<include>com.carrotsearch:hppc</include>

diff --git a/docs/NOTICE b/docs/NOTICE
@@ -1,5 +1,5 @@
 Apache Ranger
-Copyright 2014-2016 The Apache Software Foundation
+Copyright 2014-2021 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/docs/pom.xml b/docs/pom.xml
@@ -24,7 +24,7 @@
     <url>http://ranger.apache.org/</url>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.ranger</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>2.2.0</version>
     <artifactId>ranger</artifactId>
     <packaging>pom</packaging>
     <licenses>

diff --git a/embeddedwebserver/pom.xml b/embeddedwebserver/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.ranger</groupId>
         <artifactId>ranger</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.0</version>
         <relativePath>..</relativePath>
     </parent>
     <dependencies>

diff --git a/hbase-agent/pom.xml b/hbase-agent/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.ranger</groupId>
         <artifactId>ranger</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.0</version>
         <relativePath>..</relativePath>
     </parent>
     <dependencies>

diff --git a/hdfs-agent/pom.xml b/hdfs-agent/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.ranger</groupId>
         <artifactId>ranger</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.0</version>
         <relativePath>..</relativePath>
     </parent>
     <dependencies>

diff --git a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
@@ -192,6 +192,7 @@ public AccessControlEnforcer getExternalAccessControlEnforcer(AccessControlEnfor
 		return rangerAce;
 	}
 
+
 	// for testing
 	public Configuration getConfig() {
 		return rangerPlugin.getConfig();

diff --git a/hive-agent/pom.xml b/hive-agent/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.ranger</groupId>
         <artifactId>ranger</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.0</version>
         <relativePath>..</relativePath>
     </parent>
     <dependencies>