You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by co...@apache.org on 2017/05/10 08:45:23 UTC

[1/3] ranger git commit: RANGER-1549 - Add COMPONENT_INSTALL_DIR_NAME to the Storm install.properties

Repository: ranger
Updated Branches:
  refs/heads/master a3a5e2a7b -> cfb6a6d70


RANGER-1549 - Add COMPONENT_INSTALL_DIR_NAME to the Storm install.properties

Signed-off-by: Colm O hEigeartaigh <co...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/1327c553
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/1327c553
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/1327c553

Branch: refs/heads/master
Commit: 1327c5530746d10cb2ccf2789ce99000b80c1efd
Parents: a3a5e2a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Apr 27 17:51:17 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed May 10 09:43:30 2017 +0100

----------------------------------------------------------------------
 storm-agent/scripts/install.properties | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ranger/blob/1327c553/storm-agent/scripts/install.properties
----------------------------------------------------------------------
diff --git a/storm-agent/scripts/install.properties b/storm-agent/scripts/install.properties
index 7aaa32f..e805b75 100644
--- a/storm-agent/scripts/install.properties
+++ b/storm-agent/scripts/install.properties
@@ -29,6 +29,11 @@ POLICY_MGR_URL=
 #
 REPOSITORY_NAME=
 
+#
+# Apache Storm installation path
+#
+COMPONENT_INSTALL_DIR_NAME=storm
+
 # AUDIT configuration with V3 properties
 
 # Enable audit logs to Solr


[2/3] ranger git commit: RANGER-1524 - Add tag based authorization tests for Apache Storm

Posted by co...@apache.org.
RANGER-1524 - Add tag based authorization tests for Apache Storm

Signed-off-by: Colm O hEigeartaigh <co...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/8e19fc43
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/8e19fc43
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/8e19fc43

Branch: refs/heads/master
Commit: 8e19fc4370f6ff93a5387dd56cd4ed97faae74c6
Parents: 1327c55
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Apr 18 11:26:17 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed May 10 09:43:56 2017 +0100

----------------------------------------------------------------------
 .../storm/RangerAdminClientImpl.java            |  10 +-
 .../storm/StormRangerAuthorizerTest.java        |  36 +
 .../ranger/authorization/storm/WordSpout.java   |   2 +-
 .../test/resources/ranger-storm-security.xml    |   2 +-
 .../src/test/resources/storm-policies-tag.json  |  37 +
 .../src/test/resources/storm-policies.json      | 900 ++++++++++++++++++-
 6 files changed, 939 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ranger/blob/8e19fc43/storm-agent/src/test/java/org/apache/ranger/authorization/storm/RangerAdminClientImpl.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/RangerAdminClientImpl.java b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/RangerAdminClientImpl.java
index ade034d..5a7c7db 100644
--- a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/RangerAdminClientImpl.java
+++ b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/RangerAdminClientImpl.java
@@ -38,6 +38,7 @@ import com.google.gson.GsonBuilder;
 public class RangerAdminClientImpl implements RangerAdminClient {
     private static final Logger LOG = LoggerFactory.getLogger(RangerAdminClientImpl.class);
     private final static String cacheFilename = "storm-policies.json";
+    private final static String tagFilename = "storm-policies-tag.json";
     private Gson gson;
 
     public void init(String serviceName, String appId, String configPropertyPrefix) {
@@ -72,8 +73,15 @@ public class RangerAdminClientImpl implements RangerAdminClient {
     }
 
     public ServiceTags getServiceTagsIfUpdated(long lastKnownVersion, long lastActivationTimeInMillis) throws Exception {
-        return null;
+        String basedir = System.getProperty("basedir");
+        if (basedir == null) {
+            basedir = new File(".").getCanonicalPath();
+        }
+
+        java.nio.file.Path cachePath = FileSystems.getDefault().getPath(basedir, "/src/test/resources/" + tagFilename);
+        byte[] cacheBytes = Files.readAllBytes(cachePath);
 
+        return gson.fromJson(new String(cacheBytes), ServiceTags.class);
     }
 
     public List<String> getTagTypes(String tagTypePattern) throws Exception {

http://git-wip-us.apache.org/repos/asf/ranger/blob/8e19fc43/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java
index fc648b3..5317307 100644
--- a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java
+++ b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java
@@ -33,6 +33,10 @@ import org.junit.Test;
  * A simple test that wires a WordSpout + WordCounterBolt into a topology and runs it. The "RangerStormAuthorizer" takes care of authorization.
  * The policies state that "bob" can do anything with the "word-count" topology. In addition, "bob" can create/kill the "temp*" topologies, but do
  * nothing else.
+ *
+ * In addition we have some TAG based policies created in Atlas and synced into Ranger:
+ *
+ * a) The tag "StormTopologyTag" is associated with "create/kill" permissions to the "bob" user for the "stormdev" topology.
  */
 public class StormRangerAuthorizerTest {
 
@@ -173,6 +177,38 @@ public class StormRangerAuthorizerTest {
         });
     }
 
+    @Test
+    public void testTAGBasedPolicy() throws Exception {
+        final Config conf = new Config();
+        conf.setDebug(true);
+
+        final TopologyBuilder builder = new TopologyBuilder();
+        builder.setSpout("words", new WordSpout());
+        builder.setBolt("counter", new WordCounterBolt()).shuffleGrouping("words");
+
+        final Subject subject = new Subject();
+
+        subject.getPrincipals().add(new SimplePrincipal("bob"));
+        Subject.doAs(subject, new PrivilegedExceptionAction<Void>() {
+            public Void run() throws Exception {
+                // bob can create the "stormdev" topology
+                cluster.submitTopology("stormdev", conf, builder.createTopology());
+
+                cluster.killTopology("stormdev");
+
+                // but not the "stormdev2" topology
+                try {
+                    cluster.submitTopology("stormdev2", conf, builder.createTopology());
+                    Assert.fail("Authorization failure expected");
+                } catch (Throwable ex) {
+                    // expected
+                }
+
+                return null;
+            }
+        });
+
+    }
 
     private static class SimplePrincipal implements Principal {
 

http://git-wip-us.apache.org/repos/asf/ranger/blob/8e19fc43/storm-agent/src/test/java/org/apache/ranger/authorization/storm/WordSpout.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/WordSpout.java b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/WordSpout.java
index 809c998..8ec950e 100644
--- a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/WordSpout.java
+++ b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/WordSpout.java
@@ -20,7 +20,7 @@ package org.apache.ranger.authorization.storm;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.storm.shade.org.apache.commons.io.IOUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.storm.spout.SpoutOutputCollector;
 import org.apache.storm.task.TopologyContext;
 import org.apache.storm.topology.OutputFieldsDeclarer;

http://git-wip-us.apache.org/repos/asf/ranger/blob/8e19fc43/storm-agent/src/test/resources/ranger-storm-security.xml
----------------------------------------------------------------------
diff --git a/storm-agent/src/test/resources/ranger-storm-security.xml b/storm-agent/src/test/resources/ranger-storm-security.xml
index adff2b9..97510e5 100644
--- a/storm-agent/src/test/resources/ranger-storm-security.xml
+++ b/storm-agent/src/test/resources/ranger-storm-security.xml
@@ -20,7 +20,7 @@
 
 	<property>
 		<name>ranger.plugin.storm.service.name</name>
-		<value>StormTest</value>
+		<value>cl1_storm</value>
 		<description>
 			Name of the Ranger service containing policies for this SampleApp instance
 		</description>

http://git-wip-us.apache.org/repos/asf/ranger/blob/8e19fc43/storm-agent/src/test/resources/storm-policies-tag.json
----------------------------------------------------------------------
diff --git a/storm-agent/src/test/resources/storm-policies-tag.json b/storm-agent/src/test/resources/storm-policies-tag.json
new file mode 100644
index 0000000..31bfbc8
--- /dev/null
+++ b/storm-agent/src/test/resources/storm-policies-tag.json
@@ -0,0 +1,37 @@
+{
+  "op": "add_or_update",
+  "serviceName": "cl1_storm",
+  "tagVersion": 2,
+  "tagDefinitions": {},
+  "tags": {
+    "1": {
+      "type": "StormTopologyTag",
+      "owner": 0,
+      "attributes": {},
+      "id": 1,
+      "isEnabled": true,
+      "version": 1
+    }
+  },
+  "serviceResources": [
+    {
+      "resourceElements": {
+        "topology": {
+          "values": [
+            "stormdev"
+          ],
+          "isExcludes": false,
+          "isRecursive": true
+        }
+      },
+      "id": 1,
+      "isEnabled": true,
+      "version": 5
+    }
+  ],
+  "resourceToTagIds": {
+    "1": [
+      1
+    ]
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ranger/blob/8e19fc43/storm-agent/src/test/resources/storm-policies.json
----------------------------------------------------------------------
diff --git a/storm-agent/src/test/resources/storm-policies.json b/storm-agent/src/test/resources/storm-policies.json
index 5c04b5d..b89410a 100644
--- a/storm-agent/src/test/resources/storm-policies.json
+++ b/storm-agent/src/test/resources/storm-policies.json
@@ -1,19 +1,19 @@
 {
-  "serviceName": "StormTest",
-  "serviceId": 10,
-  "policyVersion": 12,
-  "policyUpdateTime": "20160704-15:53:20.000-+0100",
+  "serviceName": "cl1_storm",
+  "serviceId": 1,
+  "policyVersion": 9,
+  "policyUpdateTime": "20170307-11:42:26.000-+0000",
   "policies": [
     {
-      "service": "StormTest",
-      "name": "WordCount",
-      "description": "",
-      "resourceSignature": "25dc26943b5859a6e5f904388cd02830",
+      "service": "cl1_storm",
+      "name": "all - topology",
+      "policyType": 0,
+      "description": "Policy for all - topology",
       "isAuditEnabled": true,
       "resources": {
         "topology": {
           "values": [
-            "word-count"
+            "*"
           ],
           "isExcludes": false,
           "isRecursive": false
@@ -31,11 +31,87 @@
               "isAllowed": true
             },
             {
-              "type": "getNimbusConf",
+              "type": "fileDownload",
+              "isAllowed": true
+            },
+            {
+              "type": "killTopology",
+              "isAllowed": true
+            },
+            {
+              "type": "rebalance",
+              "isAllowed": true
+            },
+            {
+              "type": "activate",
+              "isAllowed": true
+            },
+            {
+              "type": "deactivate",
+              "isAllowed": true
+            },
+            {
+              "type": "getTopologyConf",
+              "isAllowed": true
+            },
+            {
+              "type": "getTopology",
+              "isAllowed": true
+            },
+            {
+              "type": "getUserTopology",
+              "isAllowed": true
+            },
+            {
+              "type": "getTopologyInfo",
+              "isAllowed": true
+            },
+            {
+              "type": "uploadNewCredentials",
+              "isAllowed": true
+            }
+          ],
+          "users": [
+            "asf"
+          ],
+          "groups": [],
+          "conditions": [],
+          "delegateAdmin": true
+        }
+      ],
+      "denyPolicyItems": [],
+      "allowExceptions": [],
+      "denyExceptions": [],
+      "dataMaskPolicyItems": [],
+      "rowFilterPolicyItems": [],
+      "id": 1,
+      "isEnabled": true,
+      "version": 1
+    },
+    {
+      "service": "cl1_storm",
+      "name": "WordCountPolicy",
+      "policyType": 0,
+      "description": "",
+      "isAuditEnabled": true,
+      "resources": {
+        "topology": {
+          "values": [
+            "word-count"
+          ],
+          "isExcludes": false,
+          "isRecursive": false
+        }
+      },
+      "policyItems": [
+        {
+          "accesses": [
+            {
+              "type": "submitTopology",
               "isAllowed": true
             },
             {
-              "type": "getClusterInfo",
+              "type": "fileUpload",
               "isAllowed": true
             },
             {
@@ -92,20 +168,15 @@
       "denyExceptions": [],
       "dataMaskPolicyItems": [],
       "rowFilterPolicyItems": [],
-      "id": 40,
-      "guid": "1467386247700_275_2404",
+      "id": 2,
       "isEnabled": true,
-      "createdBy": "Admin",
-      "updatedBy": "Admin",
-      "createTime": "20160701-16:17:27.000-+0100",
-      "updateTime": "20160704-14:51:01.000-+0100",
-      "version": 6
+      "version": 1
     },
     {
-      "service": "StormTest",
+      "service": "cl1_storm",
       "name": "TempPolicy",
+      "policyType": 0,
       "description": "",
-      "resourceSignature": "1e4cafdc98da3cec11b565ef03cfab14",
       "isAuditEnabled": true,
       "resources": {
         "topology": {
@@ -124,10 +195,6 @@
               "isAllowed": true
             },
             {
-              "type": "getClusterInfo",
-              "isAllowed": true
-            },
-            {
               "type": "killTopology",
               "isAllowed": true
             }
@@ -145,14 +212,9 @@
       "denyExceptions": [],
       "dataMaskPolicyItems": [],
       "rowFilterPolicyItems": [],
-      "id": 42,
-      "guid": "1467641649473_569_2619",
+      "id": 3,
       "isEnabled": true,
-      "createdBy": "Admin",
-      "updatedBy": "Admin",
-      "createTime": "20160704-15:14:09.000-+0100",
-      "updateTime": "20160704-15:53:20.000-+0100",
-      "version": 5
+      "version": 1
     }
   ],
   "serviceDef": {
@@ -243,18 +305,6 @@
         "impliedGrants": []
       },
       {
-        "itemId": 3,
-        "name": "getNimbusConf",
-        "label": "Get Nimbus Conf",
-        "impliedGrants": []
-      },
-      {
-        "itemId": 4,
-        "name": "getClusterInfo",
-        "label": "Get Cluster Info",
-        "impliedGrants": []
-      },
-      {
         "itemId": 5,
         "name": "fileDownload",
         "label": "File Download",
@@ -330,8 +380,768 @@
     "id": 6,
     "guid": "2a60f427-edcf-4e20-834c-a9a267b5b963",
     "isEnabled": true,
-    "createTime": "20160314-14:39:35.000-+0000",
-    "updateTime": "20160314-14:39:35.000-+0000",
+    "createTime": "20170302-11:21:21.000-+0000",
+    "updateTime": "20170302-11:21:21.000-+0000",
     "version": 1
+  },
+  "auditMode": "audit-default",
+  "tagPolicies": {
+    "serviceName": "AtlasService",
+    "serviceId": 2,
+    "policyVersion": 7,
+    "policyUpdateTime": "20170307-11:42:26.000-+0000",
+    "policies": [
+      {
+        "service": "AtlasService",
+        "name": "EXPIRES_ON",
+        "policyType": 0,
+        "description": "Policy for data with EXPIRES_ON tag",
+        "isAuditEnabled": true,
+        "resources": {
+          "tag": {
+            "values": [
+              "EXPIRES_ON"
+            ],
+            "isExcludes": false,
+            "isRecursive": false
+          }
+        },
+        "policyItems": [],
+        "denyPolicyItems": [
+          {
+            "accesses": [
+              {
+                "type": "hdfs:read",
+                "isAllowed": true
+              },
+              {
+                "type": "hdfs:write",
+                "isAllowed": true
+              },
+              {
+                "type": "hdfs:execute",
+                "isAllowed": true
+              },
+              {
+                "type": "hbase:read",
+                "isAllowed": true
+              },
+              {
+                "type": "hbase:write",
+                "isAllowed": true
+              },
+              {
+                "type": "hbase:create",
+                "isAllowed": true
+              },
+              {
+                "type": "hbase:admin",
+                "isAllowed": true
+              },
+              {
+                "type": "hive:select",
+                "isAllowed": true
+              },
+              {
+                "type": "hive:update",
+                "isAllowed": true
+              },
+              {
+                "type": "hive:create",
+                "isAllowed": true
+              },
+              {
+                "type": "hive:drop",
+                "isAllowed": true
+              },
+              {
+                "type": "hive:alter",
+                "isAllowed": true
+              },
+              {
+                "type": "hive:index",
+                "isAllowed": true
+              },
+              {
+                "type": "hive:lock",
+                "isAllowed": true
+              },
+              {
+                "type": "hive:all",
+                "isAllowed": true
+              },
+              {
+                "type": "yarn:submit-app",
+                "isAllowed": true
+              },
+              {
+                "type": "yarn:admin-queue",
+                "isAllowed": true
+              },
+              {
+                "type": "knox:allow",
+                "isAllowed": true
+              },
+              {
+                "type": "storm:submitTopology",
+                "isAllowed": true
+              },
+              {
+                "type": "storm:fileUpload",
+                "isAllowed": true
+              },
+              {
+                "type": "storm:fileDownload",
+                "isAllowed": true
+              },
+              {
+                "type": "storm:killTopology",
+                "isAllowed": true
+              },
+              {
+                "type": "storm:rebalance",
+                "isAllowed": true
+              },
+              {
+                "type": "storm:activate",
+                "isAllowed": true
+              },
+              {
+                "type": "storm:deactivate",
+                "isAllowed": true
+              },
+              {
+                "type": "storm:getTopologyConf",
+                "isAllowed": true
+              },
+              {
+                "type": "storm:getTopology",
+                "isAllowed": true
+              },
+              {
+                "type": "storm:getUserTopology",
+                "isAllowed": true
+              },
+              {
+                "type": "storm:getTopologyInfo",
+                "isAllowed": true
+              },
+              {
+                "type": "storm:uploadNewCredentials",
+                "isAllowed": true
+              },
+              {
+                "type": "kms:create",
+                "isAllowed": true
+              },
+              {
+                "type": "kms:delete",
+                "isAllowed": true
+              },
+              {
+                "type": "kms:rollover",
+                "isAllowed": true
+              },
+              {
+                "type": "kms:setkeymaterial",
+                "isAllowed": true
+              },
+              {
+                "type": "kms:get",
+                "isAllowed": true
+              },
+              {
+                "type": "kms:getkeys",
+                "isAllowed": true
+              },
+              {
+                "type": "kms:getmetadata",
+                "isAllowed": true
+              },
+              {
+                "type": "kms:generateeek",
+                "isAllowed": true
+              },
+              {
+                "type": "kms:decrypteek",
+                "isAllowed": true
+              },
+              {
+                "type": "solr:query",
+                "isAllowed": true
+              },
+              {
+                "type": "solr:update",
+                "isAllowed": true
+              },
+              {
+                "type": "solr:others",
+                "isAllowed": true
+              },
+              {
+                "type": "solr:solr_admin",
+                "isAllowed": true
+              },
+              {
+                "type": "kafka:publish",
+                "isAllowed": true
+              },
+              {
+                "type": "kafka:consume",
+                "isAllowed": true
+              },
+              {
+                "type": "kafka:configure",
+                "isAllowed": true
+              },
+              {
+                "type": "kafka:describe",
+                "isAllowed": true
+              },
+              {
+                "type": "kafka:create",
+                "isAllowed": true
+              },
+              {
+                "type": "kafka:delete",
+                "isAllowed": true
+              },
+              {
+                "type": "kafka:kafka_admin",
+                "isAllowed": true
+              },
+              {
+                "type": "atlas:read",
+                "isAllowed": true
+              },
+              {
+                "type": "atlas:create",
+                "isAllowed": true
+              },
+              {
+                "type": "atlas:update",
+                "isAllowed": true
+              },
+              {
+                "type": "atlas:delete",
+                "isAllowed": true
+              },
+              {
+                "type": "atlas:all",
+                "isAllowed": true
+              }
+            ],
+            "users": [],
+            "groups": [
+              "public"
+            ],
+            "conditions": [
+              {
+                "type": "accessed-after-expiry",
+                "values": [
+                  "yes"
+                ]
+              }
+            ],
+            "delegateAdmin": false
+          }
+        ],
+        "allowExceptions": [],
+        "denyExceptions": [],
+        "dataMaskPolicyItems": [],
+        "rowFilterPolicyItems": [],
+        "id": 4,
+        "isEnabled": true,
+        "version": 1
+      },
+      {
+        "service": "AtlasService",
+        "name": "StormDevPolicy",
+        "policyType": 0,
+        "description": "",
+        "isAuditEnabled": true,
+        "resources": {
+          "tag": {
+            "values": [
+              "StormTopologyTag"
+            ],
+            "isExcludes": false,
+            "isRecursive": false
+          }
+        },
+        "policyItems": [
+          {
+            "accesses": [
+              {
+                "type": "storm:submitTopology",
+                "isAllowed": true
+              },
+              {
+                "type": "storm:killTopology",
+                "isAllowed": true
+              }
+            ],
+            "users": [
+              "bob"
+            ],
+            "groups": [],
+            "conditions": [],
+            "delegateAdmin": false
+          }
+        ],
+        "denyPolicyItems": [],
+        "allowExceptions": [],
+        "denyExceptions": [],
+        "dataMaskPolicyItems": [],
+        "rowFilterPolicyItems": [],
+        "id": 5,
+        "isEnabled": true,
+        "version": 5
+      }
+    ],
+    "serviceDef": {
+      "name": "tag",
+      "implClass": "org.apache.ranger.services.tag.RangerServiceTag",
+      "label": "TAG",
+      "description": "TAG Service Definition",
+      "options": {
+        "ui.pages": "tag-based-policies"
+      },
+      "configs": [],
+      "resources": [
+        {
+          "itemId": 1,
+          "name": "tag",
+          "type": "string",
+          "level": 1,
+          "mandatory": true,
+          "lookupSupported": true,
+          "recursiveSupported": false,
+          "excludesSupported": false,
+          "matcher": "org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher",
+          "matcherOptions": {
+            "wildCard": "false",
+            "ignoreCase": "false"
+          },
+          "validationRegEx": "",
+          "validationMessage": "",
+          "uiHint": "{ \"singleValue\":true }",
+          "label": "TAG",
+          "description": "TAG"
+        }
+      ],
+      "accessTypes": [
+        {
+          "itemId": 1002,
+          "name": "hdfs:read",
+          "label": "Read",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 1003,
+          "name": "hdfs:write",
+          "label": "Write",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 1004,
+          "name": "hdfs:execute",
+          "label": "Execute",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 2003,
+          "name": "hbase:read",
+          "label": "Read",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 2004,
+          "name": "hbase:write",
+          "label": "Write",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 2005,
+          "name": "hbase:create",
+          "label": "Create",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 2006,
+          "name": "hbase:admin",
+          "label": "Admin",
+          "impliedGrants": [
+            "hbase:read",
+            "hbase:write",
+            "hbase:create"
+          ]
+        },
+        {
+          "itemId": 3004,
+          "name": "hive:select",
+          "label": "select",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 3005,
+          "name": "hive:update",
+          "label": "update",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 3006,
+          "name": "hive:create",
+          "label": "Create",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 3007,
+          "name": "hive:drop",
+          "label": "Drop",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 3008,
+          "name": "hive:alter",
+          "label": "Alter",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 3009,
+          "name": "hive:index",
+          "label": "Index",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 3010,
+          "name": "hive:lock",
+          "label": "Lock",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 3011,
+          "name": "hive:all",
+          "label": "All",
+          "impliedGrants": [
+            "hive:select",
+            "hive:update",
+            "hive:create",
+            "hive:drop",
+            "hive:alter",
+            "hive:index",
+            "hive:lock"
+          ]
+        },
+        {
+          "itemId": 4005,
+          "name": "yarn:submit-app",
+          "label": "submit-app",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 4006,
+          "name": "yarn:admin-queue",
+          "label": "admin-queue",
+          "impliedGrants": [
+            "yarn:submit-app"
+          ]
+        },
+        {
+          "itemId": 5006,
+          "name": "knox:allow",
+          "label": "Allow",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 6007,
+          "name": "storm:submitTopology",
+          "label": "Submit Topology",
+          "impliedGrants": [
+            "storm:fileUpload",
+            "storm:fileDownload"
+          ]
+        },
+        {
+          "itemId": 6008,
+          "name": "storm:fileUpload",
+          "label": "File Upload",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 6011,
+          "name": "storm:fileDownload",
+          "label": "File Download",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 6012,
+          "name": "storm:killTopology",
+          "label": "Kill Topology",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 6013,
+          "name": "storm:rebalance",
+          "label": "Rebalance",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 6014,
+          "name": "storm:activate",
+          "label": "Activate",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 6015,
+          "name": "storm:deactivate",
+          "label": "Deactivate",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 6016,
+          "name": "storm:getTopologyConf",
+          "label": "Get Topology Conf",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 6017,
+          "name": "storm:getTopology",
+          "label": "Get Topology",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 6018,
+          "name": "storm:getUserTopology",
+          "label": "Get User Topology",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 6019,
+          "name": "storm:getTopologyInfo",
+          "label": "Get Topology Info",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 6020,
+          "name": "storm:uploadNewCredentials",
+          "label": "Upload New Credential",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 7008,
+          "name": "kms:create",
+          "label": "Create",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 7009,
+          "name": "kms:delete",
+          "label": "Delete",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 7010,
+          "name": "kms:rollover",
+          "label": "Rollover",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 7011,
+          "name": "kms:setkeymaterial",
+          "label": "Set Key Material",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 7012,
+          "name": "kms:get",
+          "label": "Get",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 7013,
+          "name": "kms:getkeys",
+          "label": "Get Keys",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 7014,
+          "name": "kms:getmetadata",
+          "label": "Get Metadata",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 7015,
+          "name": "kms:generateeek",
+          "label": "Generate EEK",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 7016,
+          "name": "kms:decrypteek",
+          "label": "Decrypt EEK",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 8108,
+          "name": "solr:query",
+          "label": "Query",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 8208,
+          "name": "solr:update",
+          "label": "Update",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 8308,
+          "name": "solr:others",
+          "label": "Others",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 8908,
+          "name": "solr:solr_admin",
+          "label": "Solr Admin",
+          "impliedGrants": [
+            "solr:query",
+            "solr:update",
+            "solr:others"
+          ]
+        },
+        {
+          "itemId": 9010,
+          "name": "kafka:publish",
+          "label": "Publish",
+          "impliedGrants": [
+            "kafka:describe"
+          ]
+        },
+        {
+          "itemId": 9011,
+          "name": "kafka:consume",
+          "label": "Consume",
+          "impliedGrants": [
+            "kafka:describe"
+          ]
+        },
+        {
+          "itemId": 9014,
+          "name": "kafka:configure",
+          "label": "Configure",
+          "impliedGrants": [
+            "kafka:describe"
+          ]
+        },
+        {
+          "itemId": 9015,
+          "name": "kafka:describe",
+          "label": "Describe",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 9017,
+          "name": "kafka:create",
+          "label": "Create",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 9018,
+          "name": "kafka:delete",
+          "label": "Delete",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 9016,
+          "name": "kafka:kafka_admin",
+          "label": "Kafka Admin",
+          "impliedGrants": [
+            "kafka:publish",
+            "kafka:consume",
+            "kafka:configure",
+            "kafka:describe",
+            "kafka:create",
+            "kafka:delete"
+          ]
+        },
+        {
+          "itemId": 11012,
+          "name": "atlas:read",
+          "label": "read",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 11013,
+          "name": "atlas:create",
+          "label": "create",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 11014,
+          "name": "atlas:update",
+          "label": "update",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 11015,
+          "name": "atlas:delete",
+          "label": "delete",
+          "impliedGrants": []
+        },
+        {
+          "itemId": 11016,
+          "name": "atlas:all",
+          "label": "All",
+          "impliedGrants": [
+            "atlas:read",
+            "atlas:create",
+            "atlas:update",
+            "atlas:delete"
+          ]
+        }
+      ],
+      "policyConditions": [
+        {
+          "itemId": 1,
+          "name": "accessed-after-expiry",
+          "evaluator": "org.apache.ranger.plugin.conditionevaluator.RangerScriptTemplateConditionEvaluator",
+          "evaluatorOptions": {
+            "scriptTemplate": "ctx.isAccessedAfter(\u0027expiry_date\u0027);"
+          },
+          "uiHint": "{ \"singleValue\":true }",
+          "label": "Accessed after expiry_date (yes/no)?",
+          "description": "Accessed after expiry_date? (yes/no)"
+        }
+      ],
+      "contextEnrichers": [
+        {
+          "itemId": 1,
+          "name": "TagEnricher",
+          "enricher": "org.apache.ranger.plugin.contextenricher.RangerTagEnricher",
+          "enricherOptions": {
+            "tagRetrieverClassName": "org.apache.ranger.plugin.contextenricher.RangerAdminTagRetriever",
+            "tagRefresherPollingInterval": "60000"
+          }
+        }
+      ],
+      "enums": [],
+      "dataMaskDef": {
+        "maskTypes": [],
+        "accessTypes": [],
+        "resources": []
+      },
+      "rowFilterDef": {
+        "accessTypes": [],
+        "resources": []
+      },
+      "id": 100,
+      "guid": "0d047248-baff-4cf9-8e9e-d5d377284b2e",
+      "isEnabled": true,
+      "createTime": "20170302-11:21:21.000-+0000",
+      "updateTime": "20170302-11:21:23.000-+0000",
+      "version": 11
+    },
+    "auditMode": "audit-default"
   }
 }
\ No newline at end of file


[3/3] ranger git commit: RANGER-1529 - Remove tez dependency from Hive/HDFS plugins

Posted by co...@apache.org.
RANGER-1529 - Remove tez dependency from Hive/HDFS plugins

Signed-off-by: Colm O hEigeartaigh <co...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/cfb6a6d7
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/cfb6a6d7
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/cfb6a6d7

Branch: refs/heads/master
Commit: cfb6a6d701b2922a342bbefb33ee9155619b54f7
Parents: 8e19fc4
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue May 9 15:42:08 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed May 10 09:45:04 2017 +0100

----------------------------------------------------------------------
 hdfs-agent/pom.xml | 24 ------------------------
 hive-agent/pom.xml | 24 ------------------------
 pom.xml            |  1 -
 3 files changed, 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ranger/blob/cfb6a6d7/hdfs-agent/pom.xml
----------------------------------------------------------------------
diff --git a/hdfs-agent/pom.xml b/hdfs-agent/pom.xml
index 348cd7c..9f62060 100644
--- a/hdfs-agent/pom.xml
+++ b/hdfs-agent/pom.xml
@@ -46,30 +46,6 @@
             <version>${javax.servlet.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.tez</groupId>
-            <artifactId>tez-api</artifactId>
-            <version>${tez.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tez</groupId>
-            <artifactId>tez-runtime-library</artifactId>
-            <version>${tez.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tez</groupId>
-            <artifactId>tez-runtime-internals</artifactId>
-            <version>${tez.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tez</groupId>
-            <artifactId>tez-mapreduce</artifactId>
-            <version>${tez.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
             <version>${hadoop.version}</version>

http://git-wip-us.apache.org/repos/asf/ranger/blob/cfb6a6d7/hive-agent/pom.xml
----------------------------------------------------------------------
diff --git a/hive-agent/pom.xml b/hive-agent/pom.xml
index 037ea28..a2b4aa8 100644
--- a/hive-agent/pom.xml
+++ b/hive-agent/pom.xml
@@ -32,30 +32,6 @@
     </parent>
     <dependencies>
         <dependency>
-            <groupId>org.apache.tez</groupId>
-            <artifactId>tez-api</artifactId>
-            <version>${tez.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tez</groupId>
-            <artifactId>tez-runtime-library</artifactId>
-            <version>${tez.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tez</groupId>
-            <artifactId>tez-runtime-internals</artifactId>
-            <version>${tez.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tez</groupId>
-            <artifactId>tez-mapreduce</artifactId>
-            <version>${tez.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
             <version>${commons.lang.version}</version>

http://git-wip-us.apache.org/repos/asf/ranger/blob/cfb6a6d7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e2a0f92..19ceca8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,7 +213,6 @@
         <springframework.test.version>3.2.10.RELEASE</springframework.test.version>
         <springframework.version>3.2.10.RELEASE</springframework.version>
         <storm.version>1.0.2</storm.version>
-        <tez.version>0.5.2</tez.version>
         <tomcat.embed.version>7.0.77</tomcat.embed.version>
         <velocity.version>1.7</velocity.version>
         <xmlenc.version>0.52</xmlenc.version>