Return-Path: X-Original-To: apmail-ranger-commits-archive@www.apache.org Delivered-To: apmail-ranger-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EA7F618402 for ; Tue, 12 May 2015 06:25:07 +0000 (UTC) Received: (qmail 91446 invoked by uid 500); 12 May 2015 06:25:07 -0000 Delivered-To: apmail-ranger-commits-archive@ranger.apache.org Received: (qmail 91420 invoked by uid 500); 12 May 2015 06:25:07 -0000 Mailing-List: contact commits-help@ranger.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ranger.incubator.apache.org Delivered-To: mailing list commits@ranger.incubator.apache.org Received: (qmail 91411 invoked by uid 99); 12 May 2015 06:25:07 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2015 06:25:07 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 5D7B5C20B6 for ; Tue, 12 May 2015 06:25:07 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 5cAkS_8-v60f for ; Tue, 12 May 2015 06:24:55 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 1FB9A43E45 for ; Tue, 12 May 2015 06:24:55 +0000 (UTC) Received: (qmail 86246 invoked by uid 99); 12 May 2015 06:23:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2015 06:23:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8FD74E10A4; Tue, 12 May 2015 06:23:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: madhan@apache.org To: commits@ranger.incubator.apache.org Message-Id: <0830ae47a7b94e86906b270a9ea098d9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ranger git commit: RANGER-468: Audit logs should use ranger-acl as enforcer instead of xasecure-acl Date: Tue, 12 May 2015 06:23:39 +0000 (UTC) Repository: incubator-ranger Updated Branches: refs/heads/master fd7d0805f -> 5ef5ed1ad RANGER-468: Audit logs should use ranger-acl as enforcer instead of xasecure-acl Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/5ef5ed1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/5ef5ed1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/5ef5ed1a Branch: refs/heads/master Commit: 5ef5ed1ade1ccaf2b6ab03914d28c068ee855417 Parents: fd7d080 Author: Madhan Neethiraj Authored: Mon May 11 22:56:05 2015 -0700 Committer: Madhan Neethiraj Committed: Mon May 11 23:23:29 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/ranger/audit/test/TestEvents.java | 2 +- .../hadoop/constants/RangerHadoopConstants.java | 3 ++- hdfs-agent/conf/ranger-hdfs-security.xml | 2 +- .../org/apache/ranger/service/XAccessAuditService.java | 11 ++++++++++- 4 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/5ef5ed1a/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 87c6a8f..3e89cc4 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 @@ -125,7 +125,7 @@ public class TestEvents { event.setClientIP("127.0.0.1"); event.setAccessResult((short)(idx % 2 > 0 ? 1 : 0)); - event.setAclEnforcer("xasecure-acl"); + event.setAclEnforcer("ranger-acl"); switch(idx % 5) { case 0: http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/5ef5ed1a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/constants/RangerHadoopConstants.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/constants/RangerHadoopConstants.java b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/constants/RangerHadoopConstants.java index be5a778..a800027 100644 --- a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/constants/RangerHadoopConstants.java +++ b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/constants/RangerHadoopConstants.java @@ -49,7 +49,8 @@ public class RangerHadoopConstants { public static final String AUDITLOG_HADOOP_MODULE_ACL_NAME_PROP = "xasecure.auditlog.hadoopAcl.name" ; public static final String DEFAULT_LOG_FIELD_DELIMITOR = "|" ; - public static final String DEFAULT_RANGER_MODULE_ACL_NAME = "xasecure-acl" ; + public static final String DEFAULT_XASECURE_MODULE_ACL_NAME = "xasecure-acl" ; + public static final String DEFAULT_RANGER_MODULE_ACL_NAME = "ranger-acl" ; public static final String DEFAULT_HADOOP_MODULE_ACL_NAME = "hadoop-acl" ; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/5ef5ed1a/hdfs-agent/conf/ranger-hdfs-security.xml ---------------------------------------------------------------------- diff --git a/hdfs-agent/conf/ranger-hdfs-security.xml b/hdfs-agent/conf/ranger-hdfs-security.xml index 9e03e38..37230b7 100644 --- a/hdfs-agent/conf/ranger-hdfs-security.xml +++ b/hdfs-agent/conf/ranger-hdfs-security.xml @@ -69,7 +69,7 @@