You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2015/01/27 02:58:13 UTC
[6/6] incubator-ranger git commit: RANGER-203: HDFS plugin update to
use newly added result.getPolicyId() method.
RANGER-203: HDFS plugin update to use newly added result.getPolicyId()
method.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/d7bf8e09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/d7bf8e09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/d7bf8e09
Branch: refs/heads/stack
Commit: d7bf8e09de7c047e3f566c5ce3955ac3a25ab6fe
Parents: 7758ed1
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Mon Jan 26 17:57:32 2015 -0800
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Mon Jan 26 17:57:32 2015 -0800
----------------------------------------------------------------------
.../hdfs/server/namenode/RangerFSPermissionChecker.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d7bf8e09/hdfs-agent/src/main/java/org/apache/hadoop/hdfs/server/namenode/RangerFSPermissionChecker.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/hadoop/hdfs/server/namenode/RangerFSPermissionChecker.java b/hdfs-agent/src/main/java/org/apache/hadoop/hdfs/server/namenode/RangerFSPermissionChecker.java
index f4e6dc7..4132706 100644
--- a/hdfs-agent/src/main/java/org/apache/hadoop/hdfs/server/namenode/RangerFSPermissionChecker.java
+++ b/hdfs-agent/src/main/java/org/apache/hadoop/hdfs/server/namenode/RangerFSPermissionChecker.java
@@ -272,12 +272,8 @@ class RangerHdfsAuditHandler extends RangerDefaultAuditHandler {
RangerAccessRequest request = result.getAccessRequest();
RangerServiceDef serviceDef = result.getServiceDef();
- int serviceType = (serviceDef != null && serviceDef.getId() != null) ? serviceDef.getId().intValue() : -1;
- String serviceName = result.getServiceName();
String resourceType = getResourceName(request.getResource(), serviceDef);
String resourcePath = getResourceValueAsString(request.getResource(), serviceDef);
- Long policyId = (result.getAccessTypeResults() != null && !result.getAccessTypeResults().isEmpty())
- ? result.getAccessTypeResults().values().iterator().next().getPolicyId() : null;
auditEvent.setUser(request.getUser());
auditEvent.setResourcePath(pathToBeValidated);
@@ -287,9 +283,9 @@ class RangerHdfsAuditHandler extends RangerDefaultAuditHandler {
auditEvent.setClientIP(request.getClientIPAddress());
auditEvent.setEventTime(request.getAccessTime());
auditEvent.setAclEnforcer(RangerModuleName);
- auditEvent.setPolicyId(policyId != null ? policyId.longValue() : -1);
- auditEvent.setRepositoryType(serviceType);
- auditEvent.setRepositoryName(serviceName);
+ auditEvent.setPolicyId(result.getPolicyId());
+ auditEvent.setRepositoryType(result.getServiceType());
+ auditEvent.setRepositoryName(result.getServiceName());
auditEvent.setResultReason(resourcePath);
}