Repository: incubator-ranger Updated Branches: refs/heads/stack 23f2a09f0 -> 67dbdc45a
RANGER-203: service-definitions updated to include resource-def flags 'excludesSupported' and 'recursiveSupported'. Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/67dbdc45 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/67dbdc45 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/67dbdc45 Branch: refs/heads/stack Commit: 67dbdc45ad85a6dbccc8a6dd83ebfd43f881b08b Parents: 23f2a09 Author: Madhan Neethiraj <[email protected]> Authored: Wed Jan 28 14:19:54 2015 -0800 Committer: Madhan Neethiraj <[email protected]> Committed: Wed Jan 28 14:19:54 2015 -0800 ---------------------------------------------------------------------- .../service-defs/ranger-servicedef-hbase.json | 32 ++++++++--------- .../service-defs/ranger-servicedef-hdfs.json | 30 ++++++++-------- .../service-defs/ranger-servicedef-hive.json | 28 +++++++-------- .../service-defs/ranger-servicedef-knox.json | 12 +++---- .../service-defs/ranger-servicedef-storm.json | 38 ++++++++++---------- 5 files changed, 70 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67dbdc45/plugin-common/src/main/resources/service-defs/ranger-servicedef-hbase.json ---------------------------------------------------------------------- diff --git a/plugin-common/src/main/resources/service-defs/ranger-servicedef-hbase.json b/plugin-common/src/main/resources/service-defs/ranger-servicedef-hbase.json index f9ead37..9c79c01 100644 --- a/plugin-common/src/main/resources/service-defs/ranger-servicedef-hbase.json +++ b/plugin-common/src/main/resources/service-defs/ranger-servicedef-hbase.json @@ -14,35 +14,35 @@ "name":"authnType", "elements": [ - {"name":"simple","label":"Simple"}, - {"name":"kerberos","label":"Kerberos"}, + {"name":"simple", "label":"Simple"}, + {"name":"kerberos","label":"Kerberos"} ], "defaultIndex":0 } ], "configs": [ - {"name":"username","type":"string","mandatory":true,"label":"Username"}, - {"name":"password","type":"password","mandatory":true,"label":"Password"}, - {"name":"hadoop.security.authentication","type":"enum","subType":"authnType","mandatory":true,"defaultValue":"simple"}, - {"name":"hbase.master.kerberos.principal","type":"string","mandatory":false,"defaultValue":""}, - {"name":"hbase.security.authentication","type":"enum","subType":"authnType","mandatory":true,"defaultValue":"simple"}, - {"name":"hbase.zookeeper.property.clientPort","type":"int","mandatory":true,"defaultValue":"2181"}, - {"name":"hbase.zookeeper.quorum","type":"string","mandatory":true,"defaultValue":""}, - {"name":"zookeeper.znode.parent","type":"string","mandatory":true,"defaultValue":"/hbase"} + {"name":"username", "type":"string", "subType":"", "mandatory":true, "label":"Username"}, + {"name":"password", "type":"password","subType":"", "mandatory":true, "label":"Password"}, + {"name":"hadoop.security.authentication", "type":"enum", "subType":"authnType","mandatory":true, "defaultValue":"simple"}, + {"name":"hbase.master.kerberos.principal", "type":"string", "subType":"", "mandatory":false,"defaultValue":""}, + {"name":"hbase.security.authentication", "type":"enum", "subType":"authnType","mandatory":true, "defaultValue":"simple"}, + {"name":"hbase.zookeeper.property.clientPort","type":"int", "subType":"", "mandatory":true, "defaultValue":"2181"}, + {"name":"hbase.zookeeper.quorum", "type":"string", "subType":"", "mandatory":true, "defaultValue":""}, + {"name":"zookeeper.znode.parent", "type":"string", "subType":"", "mandatory":true, "defaultValue":"/hbase"} ], "resources": [ - {"name":"table","type":"string","level":1,"parent":"","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"HBase Table","description":"HBase Table"}, - {"name":"column-family","type":"string","level":2,"parent":"table","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"HBase Column-family","description":"HBase Column-family"}, - {"name":"column","type":"string","level":3,"parent":"column-family","mandatory":true,"lookupSupported":false,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"HBase Column","description":"HBase Column"} + {"name":"table", "type":"string","level":1,"parent":"", "mandatory":true,"lookupSupported":true, "recursiveSupported":false,"excludesSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"HBase Table","description":"HBase Table"}, + {"name":"column-family","type":"string","level":2,"parent":"table", "mandatory":true,"lookupSupported":true, "recursiveSupported":false,"excludesSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"HBase Column-family","description":"HBase Column-family"}, + {"name":"column", "type":"string","level":3,"parent":"column-family","mandatory":true,"lookupSupported":false,"recursiveSupported":false,"excludesSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"HBase Column","description":"HBase Column"} ], "accessTypes": [ - {"name":"read","label":"Read"}, - {"name":"write","label":"Write"}, + {"name":"read", "label":"Read"}, + {"name":"write", "label":"Write"}, {"name":"create","label":"Create"}, - {"name":"admin","label":"Admin","impliedGrants":["read","write","create"]} + {"name":"admin", "label":"Admin","impliedGrants":["read","write","create"]} ], "policyConditions": [ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67dbdc45/plugin-common/src/main/resources/service-defs/ranger-servicedef-hdfs.json ---------------------------------------------------------------------- diff --git a/plugin-common/src/main/resources/service-defs/ranger-servicedef-hdfs.json b/plugin-common/src/main/resources/service-defs/ranger-servicedef-hdfs.json index ca5ced8..ee56f12 100644 --- a/plugin-common/src/main/resources/service-defs/ranger-servicedef-hdfs.json +++ b/plugin-common/src/main/resources/service-defs/ranger-servicedef-hdfs.json @@ -14,7 +14,7 @@ "name":"authnType", "elements": [ - {"name":"simple","label":"Simple"}, + {"name":"simple", "label":"Simple"}, {"name":"kerberos","label":"Kerberos"} ], "defaultIndex":0 @@ -24,29 +24,29 @@ "elements": [ {"name":"authentication","label":"Authentication"}, - {"name":"integrity","label":"Integrity"}, - {"name":"privacy","label":"Privacy"} + {"name":"integrity", "label":"Integrity"}, + {"name":"privacy", "label":"Privacy"} ], "defaultIndex":0 }, ], "configs": [ - {"name":"username","type":"string","mandatory":true,"label":"Username"}, - {"name":"password","type":"password","mandatory":true,"label":"Password"}, - {"name":"fs.default.name","type":"string","mandatory":true,"label":"Namenode URL"}, - {"name":"hadoop.security.authorization","type":"bool","subType":"TrueFalse","mandatory":true,"defaultValue":"false"}, - {"name":"hadoop.security.authentication","type":"enum","subType":"authnType","mandatory":true,"defaultValue":"simple"}, - {"name":"hadoop.security.auth_to_local","type":"string","mandatory":false}, - {"name":"dfs.datanode.kerberos.principal","type":"string","mandatory":false}, - {"name":"dfs.namenode.kerberos.principal","type":"string","mandatory":false}, - {"name":"dfs.secondary.namenode.kerberos.principal","type":"string","mandatory":false}, - {"name":"hadoop.rpc.protection","type":"enum","subType":"rpcProtection","mandatory":false,"defaultValue":"authentication"}, - {"name":"certificate.cn","type":"string","mandatory":false,"label":"Common Name for Certificate"} + {"name":"username", "type":"string", "subType":"", "mandatory":true, "label":"Username"}, + {"name":"password", "type":"password","subType":"", "mandatory":true, "label":"Password"}, + {"name":"fs.default.name", "type":"string", "subType":"", "mandatory":true, "label":"Namenode URL"}, + {"name":"hadoop.security.authorization", "type":"bool", "subType":"TrueFalse", "mandatory":true, "defaultValue":"false"}, + {"name":"hadoop.security.authentication", "type":"enum", "subType":"authnType", "mandatory":true, "defaultValue":"simple"}, + {"name":"hadoop.security.auth_to_local", "type":"string", "subType":"", "mandatory":false}, + {"name":"dfs.datanode.kerberos.principal", "type":"string", "subType":"", "mandatory":false}, + {"name":"dfs.namenode.kerberos.principal", "type":"string", "subType":"", "mandatory":false}, + {"name":"dfs.secondary.namenode.kerberos.principal","type":"string", "subType":"", "mandatory":false}, + {"name":"hadoop.rpc.protection", "type":"enum", "subType":"rpcProtection","mandatory":false,"defaultValue":"authentication"}, + {"name":"certificate.cn", "type":"string", "subType":"", "mandatory":false,"label":"Common Name for Certificate"} ], "resources": [ - {"name":"path","type":"path","level":1,"mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerPathResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Resource Path","description":"HDFS file or directory path"} + {"name":"path","type":"path","level":1,"parent":"","mandatory":true,"lookupSupported":true,"recursiveSupported":true,"excludesSupported":false,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerPathResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Resource Path","description":"HDFS file or directory path"} ], "accessTypes": [ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67dbdc45/plugin-common/src/main/resources/service-defs/ranger-servicedef-hive.json ---------------------------------------------------------------------- diff --git a/plugin-common/src/main/resources/service-defs/ranger-servicedef-hive.json b/plugin-common/src/main/resources/service-defs/ranger-servicedef-hive.json index 81cf928..e07caae 100644 --- a/plugin-common/src/main/resources/service-defs/ranger-servicedef-hive.json +++ b/plugin-common/src/main/resources/service-defs/ranger-servicedef-hive.json @@ -13,29 +13,29 @@ ], "configs": [ - {"name":"username","type":"string","mandatory":true,"label":"Username"}, - {"name":"password","type":"password","mandatory":true,"label":"Password"}, - {"name":"jdbc.driverClassName","type":"string","mandatory":true,"defaultValue":"org.apache.hive.jdbc.HiveDriver"}, - {"name":"jdbc.url","type":"string","mandatory":true,"defaultValue":""}, - {"name":"certificate.cn","type":"string","mandatory":false,"label":"Common Name for Certificate"} + {"name":"username", "type":"string", "mandatory":true, "label":"Username"}, + {"name":"password", "type":"password","mandatory":true, "label":"Password"}, + {"name":"jdbc.driverClassName","type":"string", "mandatory":true, "defaultValue":"org.apache.hive.jdbc.HiveDriver"}, + {"name":"jdbc.url", "type":"string", "mandatory":true, "defaultValue":""}, + {"name":"certificate.cn", "type":"string", "mandatory":false,"label":"Common Name for Certificate"} ], "resources": [ - {"name":"database","type":"string","level":1,"mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive Database","description":"Hive Database"}, - {"name":"table","type":"string","level":2,"parent":"database","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive Table","description":"Hive Table"}, - {"name":"udf","type":"string","level":2,"parent":"database","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive UDF","description":"Hive UDF"}, - {"name":"column","type":"string","level":3,"parent":"table","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive Column","description":"Hive Column"} + {"name":"database","type":"string","level":1,"parent":"", "mandatory":true,"lookupSupported":true,"recursiveSupported":false,"excludesSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive Database","description":"Hive Database"}, + {"name":"table", "type":"string","level":2,"parent":"database","mandatory":true,"lookupSupported":true,"recursiveSupported":false,"excludesSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive Table","description":"Hive Table"}, + {"name":"udf", "type":"string","level":2,"parent":"database","mandatory":true,"lookupSupported":true,"recursiveSupported":false,"excludesSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive UDF","description":"Hive UDF"}, + {"name":"column", "type":"string","level":3,"parent":"table", "mandatory":true,"lookupSupported":true,"recursiveSupported":false,"excludesSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive Column","description":"Hive Column"} ], "accessTypes": [ {"name":"select","label":"select"}, {"name":"update","label":"update"}, {"name":"create","label":"Create"}, - {"name":"drop","label":"Drop"}, - {"name":"alter","label":"Alter"}, - {"name":"index","label":"Index"}, - {"name":"lock","label":"Lock"}, - {"name":"all","label":"All"} + {"name":"drop", "label":"Drop"}, + {"name":"alter", "label":"Alter"}, + {"name":"index", "label":"Index"}, + {"name":"lock", "label":"Lock"}, + {"name":"all", "label":"All"} ], "policyConditions": [ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67dbdc45/plugin-common/src/main/resources/service-defs/ranger-servicedef-knox.json ---------------------------------------------------------------------- diff --git a/plugin-common/src/main/resources/service-defs/ranger-servicedef-knox.json b/plugin-common/src/main/resources/service-defs/ranger-servicedef-knox.json index 3368bee..9e775ec 100644 --- a/plugin-common/src/main/resources/service-defs/ranger-servicedef-knox.json +++ b/plugin-common/src/main/resources/service-defs/ranger-servicedef-knox.json @@ -13,15 +13,15 @@ ], "configs": [ - {"name":"username","type":"string","mandatory":true,"label":"Username"}, - {"name":"password","type":"password","mandatory":true,"label":"Password"}, - {"name":"knox.url","type":"string","mandatory":true,"defaultValue":""}, - {"name":"certificate.cn","type":"string","mandatory":false,"label":"Common Name for Certificate"} + {"name":"username", "type":"string", "mandatory":true, "label":"Username"}, + {"name":"password", "type":"password","mandatory":true, "label":"Password"}, + {"name":"knox.url", "type":"string", "mandatory":true, "defaultValue":""}, + {"name":"certificate.cn","type":"string", "mandatory":false,"label":"Common Name for Certificate"} ], "resources": [ - {"name":"topology","type":"string","level":1,"mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Knox Topology","description":"Knox Topology"}, - {"name":"service","type":"string","level":2,"parent":"topology","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Knox Service","description":"Knox Service"} + {"name":"topology","type":"string","level":1,"parent":"", "mandatory":true,"lookupSupported":true,"recursiveSupported":false,"excludesSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Knox Topology","description":"Knox Topology"}, + {"name":"service", "type":"string","level":2,"parent":"topology","mandatory":true,"lookupSupported":true,"recursiveSupported":false,"excludesSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Knox Service","description":"Knox Service"} ], "accessTypes": [ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/67dbdc45/plugin-common/src/main/resources/service-defs/ranger-servicedef-storm.json ---------------------------------------------------------------------- diff --git a/plugin-common/src/main/resources/service-defs/ranger-servicedef-storm.json b/plugin-common/src/main/resources/service-defs/ranger-servicedef-storm.json index 6a7d8bb..9570eb3 100644 --- a/plugin-common/src/main/resources/service-defs/ranger-servicedef-storm.json +++ b/plugin-common/src/main/resources/service-defs/ranger-servicedef-storm.json @@ -13,31 +13,31 @@ ], "configs": [ - {"name":"username","type":"string","mandatory":true,"label":"Username"}, - {"name":"password","type":"password","mandatory":true,"label":"Password"}, - {"name":"nimbus.url","type":"string","mandatory":true,"defaultValue":"","label":"Nimbus URL"}, - {"name":"certificate.cn","type":"string","mandatory":false,"label":"Common Name for Certificate"} + {"name":"username", "type":"string", "mandatory":true, "label":"Username"}, + {"name":"password", "type":"password","mandatory":true, "label":"Password"}, + {"name":"nimbus.url", "type":"string", "mandatory":true, "label":"Nimbus URL","defaultValue":""}, + {"name":"certificate.cn","type":"string", "mandatory":false,"label":"Common Name for Certificate"} ], "resources": [ - {"name":"topology","type":"string","level":1,"mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Storm Topology","description":"Storm Topology"} + {"name":"topology","type":"string","level":1,"mandatory":true,"lookupSupported":true,"recursiveSupported":false,"excludesSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Storm Topology","description":"Storm Topology"} ], "accessTypes": [ - {"name":"topology-submit","label":"Submit Topology"}, - {"name":"file-upload","label":"File Upload"}, - {"name":"nimbus-conf-get","label":"Get Nimbus Conf"}, - {"name":"cluster-conf-get","label":"Get Cluster Conf"}, - {"name":"cluster-info-get","label":"Get Cluster Info"}, - {"name":"file-download","label":"File Download"}, - {"name":"topology-kill","label":"Kill Topology"}, - {"name":"rebalance","label":"Rebalance"}, - {"name":"activate","label":"Activate"}, - {"name":"deactivate","label":"Deactivate"}, - {"name":"topology-conf-get","label":"Get Topology Conf"}, - {"name":"topology-get","label":"Get Topology"}, - {"name":"topology-user-get","label":"Get User Topology"}, - {"name":"topology-info-get","label":"Get Topology Info"}, + {"name":"topology-submit", "label":"Submit Topology"}, + {"name":"file-upload", "label":"File Upload"}, + {"name":"nimbus-conf-get", "label":"Get Nimbus Conf"}, + {"name":"cluster-conf-get", "label":"Get Cluster Conf"}, + {"name":"cluster-info-get", "label":"Get Cluster Info"}, + {"name":"file-download", "label":"File Download"}, + {"name":"topology-kill", "label":"Kill Topology"}, + {"name":"rebalance", "label":"Rebalance"}, + {"name":"activate", "label":"Activate"}, + {"name":"deactivate", "label":"Deactivate"}, + {"name":"topology-conf-get", "label":"Get Topology Conf"}, + {"name":"topology-get", "label":"Get Topology"}, + {"name":"topology-user-get", "label":"Get User Topology"}, + {"name":"topology-info-get", "label":"Get Topology Info"}, {"name":"new-credential-upload","label":"Upload New Credential"} ], "policyConditions":
