You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ab...@apache.org on 2018/04/10 15:34:20 UTC
ranger git commit: RANGER-2061: Regression in audit handling
introduced by commit 3b510f8c07271e2e51b5a9151a0d26f7084e3792
Repository: ranger
Updated Branches:
refs/heads/master 50e88f2ee -> ad0273f13
RANGER-2061: Regression in audit handling introduced by commit 3b510f8c07271e2e51b5a9151a0d26f7084e3792
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/ad0273f1
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/ad0273f1
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/ad0273f1
Branch: refs/heads/master
Commit: ad0273f135bafa2b429fdb7b878fd227815a0a5e
Parents: 50e88f2
Author: Abhay Kulkarni <ak...@hortonworks.com>
Authored: Tue Apr 10 08:11:43 2018 -0700
Committer: Abhay Kulkarni <ak...@hortonworks.com>
Committed: Tue Apr 10 08:11:43 2018 -0700
----------------------------------------------------------------------
.../org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java | 2 +-
.../apache/ranger/authorization/hbase/AuthorizationSession.java | 2 ++
.../apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/ad0273f1/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
index 0e124f1..2aca2e9 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
@@ -106,7 +106,7 @@ public class RangerDefaultAuditHandler implements RangerAccessResultProcessor {
ret.setResourceType(resourceType);
ret.setResourcePath(resourcePath);
ret.setRequestData(request.getRequestData());
- ret.setEventTime(request.getAccessTime());
+ ret.setEventTime(request.getAccessTime() != null ? request.getAccessTime() : new Date());
ret.setUser(request.getUser());
ret.setAction(request.getAccessType());
ret.setAccessResult((short) (result.getIsAllowed() ? 1 : 0));
http://git-wip-us.apache.org/repos/asf/ranger/blob/ad0273f1/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/AuthorizationSession.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/AuthorizationSession.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/AuthorizationSession.java
index fb3d0d3..cdaad00 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/AuthorizationSession.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/AuthorizationSession.java
@@ -19,6 +19,7 @@
package org.apache.ranger.authorization.hbase;
+import java.util.Date;
import java.util.List;
import java.util.Set;
@@ -199,6 +200,7 @@ public class AuthorizationSession {
request.setClientIPAddress(_remoteAddress);
request.setResourceMatchingScope(_resourceMatchingScope);
request.setClusterName(_clusterName);
+ request.setAccessTime(new Date());
_request = request;
if (LOG.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/ad0273f1/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
index ecc62a1..3697b8c 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/RangerHdfsAuthorizer.java
@@ -832,7 +832,7 @@ class RangerHdfsAuditHandler extends RangerDefaultAuditHandler {
String resourcePath = resource != null ? resource.getAsString() : null;
// Overwrite fields in original auditEvent
- auditEvent.setEventTime(request.getAccessTime());
+ auditEvent.setEventTime(request.getAccessTime() != null ? request.getAccessTime() : new Date());
auditEvent.setAccessType(request.getAction());
auditEvent.setResourcePath(this.pathToBeValidated);
auditEvent.setResultReason(resourcePath);