Repository: incubator-ranger Updated Branches: refs/heads/stack 814404a97 -> 6f06c8cda
RANGER-203: Replaced AuditProviderFactory.ApplicationType with String values, since the plugin types are known only at runtime. Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/6f06c8cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/6f06c8cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/6f06c8cd Branch: refs/heads/stack Commit: 6f06c8cdad58603d2a3a1b90f379f24ac8177070 Parents: 814404a Author: Madhan Neethiraj <[email protected]> Authored: Thu Jan 22 18:18:37 2015 -0800 Committer: Madhan Neethiraj <[email protected]> Committed: Thu Jan 22 18:18:37 2015 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/ranger/audit/test/TestEvents.java | 3 +-- .../authorization/hadoop/config/RangerConfiguration.java | 2 +- .../apache/ranger/pdp/knox/filter/RangerPDPKnoxFilter.java | 2 +- .../authorization/hbase/RangerAuthorizationCoprocessor.java | 8 ++++---- .../authorization/hive/authorizer/RangerHiveAuthorizer.java | 6 +++--- .../storm/authorizer/RangerStormAuthorizer.java | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6f06c8cd/agents-audit/src/main/java/org/apache/ranger/audit/test/TestEvents.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/test/TestEvents.java b/agents-audit/src/main/java/org/apache/ranger/audit/test/TestEvents.java index bf00450..c2dc955 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/test/TestEvents.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/test/TestEvents.java @@ -25,7 +25,6 @@ import org.apache.ranger.audit.model.AuthzAuditEvent; import org.apache.ranger.audit.model.EnumRepositoryType; import org.apache.ranger.audit.provider.AuditProvider; import org.apache.ranger.audit.provider.AuditProviderFactory; -import org.apache.ranger.audit.provider.AuditProviderFactory.ApplicationType; import org.apache.commons.logging.LogFactory; import java.io.File; @@ -73,7 +72,7 @@ public class TestEvents { auditProperties.setProperty("xasecure.audit.db.batch.size", "100"); } - AuditProviderFactory.getInstance().init(auditProperties, ApplicationType.Hdfs); + AuditProviderFactory.getInstance().init(auditProperties, "hdfs"); AuditProvider provider = AuditProviderFactory.getAuditProvider(); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6f06c8cd/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java index a959b6b..796776a 100644 --- a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java +++ b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java @@ -94,7 +94,7 @@ public class RangerConfiguration extends Configuration { return config; } - public void initAudit(AuditProviderFactory.ApplicationType appType) { + public void initAudit(String appType) { AuditProviderFactory auditFactory = AuditProviderFactory.getInstance(); if(auditFactory == null) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6f06c8cd/agents-impl/src/main/java/org/apache/ranger/pdp/knox/filter/RangerPDPKnoxFilter.java ---------------------------------------------------------------------- diff --git a/agents-impl/src/main/java/org/apache/ranger/pdp/knox/filter/RangerPDPKnoxFilter.java b/agents-impl/src/main/java/org/apache/ranger/pdp/knox/filter/RangerPDPKnoxFilter.java index 948bc6a..f5608a1 100644 --- a/agents-impl/src/main/java/org/apache/ranger/pdp/knox/filter/RangerPDPKnoxFilter.java +++ b/agents-impl/src/main/java/org/apache/ranger/pdp/knox/filter/RangerPDPKnoxFilter.java @@ -62,7 +62,7 @@ public class RangerPDPKnoxFilter implements Filter { private final String REPOSITORY_NAME = RangerConfiguration.getInstance().get(RangerHadoopConstants.AUDITLOG_REPOSITORY_NAME_PROP); static { - RangerConfiguration.getInstance().initAudit(AuditProviderFactory.ApplicationType.Knox); + RangerConfiguration.getInstance().initAudit("knox"); } @Override http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6f06c8cd/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java ---------------------------------------------------------------------- diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java index 9401245..3d14575 100644 --- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java +++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java @@ -751,18 +751,18 @@ public class RangerAuthorizationCoprocessor extends RangerAuthorizationCoprocess private static final String REGIONAL_SERVER_COPROCESSOR_TYPE = "regionalServer"; @Override public void start(CoprocessorEnvironment env) throws IOException { - AuditProviderFactory.ApplicationType appType = AuditProviderFactory.ApplicationType.Unknown; + String appType = "unknown"; if (env instanceof MasterCoprocessorEnvironment) { coprocessorType = MASTER_COPROCESSOR_TYPE; - appType = AuditProviderFactory.ApplicationType.HBaseMaster; + appType = "hbaseMaster"; } else if (env instanceof RegionServerCoprocessorEnvironment) { coprocessorType = REGIONAL_SERVER_COPROCESSOR_TYPE; - appType = AuditProviderFactory.ApplicationType.HBaseRegionalServer; + appType = "hbaseRegional"; } else if (env instanceof RegionCoprocessorEnvironment) { regionEnv = (RegionCoprocessorEnvironment) env; coprocessorType = REGIONAL_COPROCESSOR_TYPE; - appType = AuditProviderFactory.ApplicationType.HBaseRegionalServer; + appType = "hbseRegional"; } RangerConfiguration.getInstance().initAudit(appType); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6f06c8cd/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java ---------------------------------------------------------------------- diff --git a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java index 81a86f1..0dcea7c 100644 --- a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java +++ b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java @@ -80,15 +80,15 @@ public class RangerHiveAuthorizer extends RangerHiveAuthorizerBase { if(!RangerConfiguration.getInstance().isAuditInitDone()) { if(sessionContext != null) { - AuditProviderFactory.ApplicationType appType = AuditProviderFactory.ApplicationType.Unknown; + String appType = "unknown"; switch(sessionContext.getClientType()) { case HIVECLI: - appType = AuditProviderFactory.ApplicationType.HiveCLI; + appType = "hiveCLI"; break; case HIVESERVER2: - appType = AuditProviderFactory.ApplicationType.HiveServer2; + appType = "hiveServer2"; break; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6f06c8cd/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java ---------------------------------------------------------------------- diff --git a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java b/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java index c49b613..726e5fb 100644 --- a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java +++ b/storm-agent/src/main/java/org/apache/ranger/authorization/storm/authorizer/RangerStormAuthorizer.java @@ -49,7 +49,7 @@ public class RangerStormAuthorizer implements IAuthorizer { private RangerStormAccessVerifier rangerVerifier = RangerStormAccessVerifierFactory.getInstance() ; static { - RangerConfiguration.getInstance().initAudit(AuditProviderFactory.ApplicationType.Storm); + RangerConfiguration.getInstance().initAudit("storm"); }
