Merge branch 'master' into tag-policy
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/f796d82b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/f796d82b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/f796d82b Branch: refs/heads/tag-policy Commit: f796d82bdb3104dd3f74afa51d36c414e9e88041 Parents: 51fba28 80c46f2 Author: Madhan Neethiraj <[email protected]> Authored: Tue May 26 19:52:06 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Tue May 26 19:52:06 2015 -0700 ---------------------------------------------------------------------- .../ranger/plugin/service/RangerBasePlugin.java | 197 ++++++++----------- .../plugin/store/EmbeddedServiceDefsUtil.java | 14 ++ src/main/assembly/admin-web.xml | 65 ++++++ 3 files changed, 158 insertions(+), 118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f796d82b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java ---------------------------------------------------------------------- diff --cc agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java index fc5b954,574dd5b..26ef659 --- a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java @@@ -90,43 -91,20 +91,20 @@@ public class RangerBasePlugin public void init() { cleanup(); - RangerConfiguration.getInstance().addResourcesForServiceType( - serviceType); + RangerConfiguration.getInstance().addResourcesForServiceType(serviceType); RangerConfiguration.getInstance().initAudit(appId); - String propertyPrefix = "ranger.plugin." + serviceType; - long pollingIntervalMs = RangerConfiguration.getInstance().getLong( - propertyPrefix + ".policy.pollIntervalMs", 30 * 1000); - String cacheDir = RangerConfiguration.getInstance().get( - propertyPrefix + ".policy.cache.dir"); - - serviceName = RangerConfiguration.getInstance().get( - propertyPrefix + ".service.name"); - - policyEngineOptions.evaluatorType = RangerConfiguration.getInstance() - .get(propertyPrefix + ".policyengine.option.evaluator.type", - RangerPolicyEvaluator.EVALUATOR_TYPE_CACHED); - policyEngineOptions.cacheAuditResults = RangerConfiguration - .getInstance().getBoolean( - propertyPrefix - + ".policyengine.option.cache.audit.results", - true); - policyEngineOptions.disableContextEnrichers = RangerConfiguration - .getInstance() - .getBoolean( - propertyPrefix - + ".policyengine.option.disable.context.enrichers", - false); - policyEngineOptions.disableCustomConditions = RangerConfiguration - .getInstance() - .getBoolean( - propertyPrefix - + ".policyengine.option.disable.custom.conditions", - false); - policyEngineOptions.disableTagPolicyEvaluation = RangerConfiguration - .getInstance().getBoolean( - propertyPrefix - + ".policyengine.option.disable.tagpolicy.evaluation", false); + String propertyPrefix = "ranger.plugin." + serviceType; + long pollingIntervalMs = RangerConfiguration.getInstance().getLong(propertyPrefix + ".policy.pollIntervalMs", 30 * 1000); + String cacheDir = RangerConfiguration.getInstance().get(propertyPrefix + ".policy.cache.dir"); + + serviceName = RangerConfiguration.getInstance().get(propertyPrefix + ".service.name"); + + policyEngineOptions.evaluatorType = RangerConfiguration.getInstance().get(propertyPrefix + ".policyengine.option.evaluator.type", RangerPolicyEvaluator.EVALUATOR_TYPE_CACHED); + policyEngineOptions.cacheAuditResults = RangerConfiguration.getInstance().getBoolean(propertyPrefix + ".policyengine.option.cache.audit.results", true); + policyEngineOptions.disableContextEnrichers = RangerConfiguration.getInstance().getBoolean(propertyPrefix + ".policyengine.option.disable.context.enrichers", false); + policyEngineOptions.disableCustomConditions = RangerConfiguration.getInstance().getBoolean(propertyPrefix + ".policyengine.option.disable.custom.conditions", false); - ++ policyEngineOptions.disableTagPolicyEvaluation = RangerConfiguration.getInstance().getBoolean(propertyPrefix + ".policyengine.option.disable.tagpolicy.evaluation", false); RangerAdminClient admin = createAdminClient(propertyPrefix); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f796d82b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java ---------------------------------------------------------------------- diff --cc agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java index dcf6288,2115256..664f877 --- a/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java @@@ -92,9 -93,8 +96,11 @@@ public class EmbeddedServiceDefsUtil stormServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_STORM_NAME); yarnServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_YARN_NAME); kmsServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_KMS_NAME); + kafkaServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_KAFKA_NAME); + solrServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_SOLR_NAME); + + // Ensure that tag service def is updated with access types of all service defs + store.updateTagServiceDefForAccessTypes(); } catch(Throwable excp) { LOG.fatal("EmbeddedServiceDefsUtil.init(): failed", excp); }
