You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pe...@apache.org on 2019/08/19 02:06:34 UTC

[ranger] branch master updated: RANGER-2533: After setting 'xasecure.audit.is.enabled' to 'false', the audit log is still logged

This is an automated email from the ASF dual-hosted git repository.

pengjianhua pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new e00e11e  RANGER-2533: After setting 'xasecure.audit.is.enabled' to 'false', the audit log is still logged
e00e11e is described below

commit e00e11eb7afb90bfa5d86c55d30efade2a8b99a3
Author: xingpeng1 <xi...@zte.com.cn>
AuthorDate: Sat Aug 17 15:57:40 2019 +0800

    RANGER-2533: After setting 'xasecure.audit.is.enabled' to 'false', the audit log is still logged
    
    Signed-off-by: peng.jianhua <pe...@zte.com.cn>
---
 .../java/org/apache/ranger/audit/provider/AuditProviderFactory.java | 6 ++++++
 .../src/test/java/org/apache/ranger/audit/TestAuditQueue.java       | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java
index f858efe..405fb1d 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java
@@ -126,6 +126,12 @@ public class AuditProviderFactory {
 
 		boolean isEnabled = MiscUtil.getBooleanProperty(props,
 				AUDIT_IS_ENABLED_PROP, false);
+        if (!isEnabled) {
+            LOG.info("AuditProviderFactory: Audit not enabled..");
+            mProvider = getDefaultProvider();
+            return;
+        }
+
 		boolean isAuditToDbEnabled = MiscUtil.getBooleanProperty(props,
 				AUDIT_DB_IS_ENABLED_PROP, false);
 		boolean isAuditToHdfsEnabled = MiscUtil.getBooleanProperty(props,
diff --git a/security-admin/src/test/java/org/apache/ranger/audit/TestAuditQueue.java b/security-admin/src/test/java/org/apache/ranger/audit/TestAuditQueue.java
index cb0dcc4..99b7c49 100644
--- a/security-admin/src/test/java/org/apache/ranger/audit/TestAuditQueue.java
+++ b/security-admin/src/test/java/org/apache/ranger/audit/TestAuditQueue.java
@@ -179,6 +179,7 @@ public class TestAuditQueue {
 		logger.debug("testAuditSummaryByInfra()...");
 
 		Properties props = new Properties();
+		props.put(AuditProviderFactory.AUDIT_IS_ENABLED_PROP, "true");
 		// Destination
 		String propPrefix = AuditProviderFactory.AUDIT_DEST_BASE + ".test";
 		props.put(propPrefix, "enable");
@@ -594,6 +595,7 @@ public class TestAuditQueue {
 		File logFile = new File(logFolder, logFileName);
 
 		Properties props = new Properties();
+		props.put(AuditProviderFactory.AUDIT_IS_ENABLED_PROP, "true");
 		// Destination
 		String filePropPrefix = AuditProviderFactory.AUDIT_DEST_BASE + ".file";
 		props.put(filePropPrefix, "enable");