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/10/27 02:08:45 UTC
[27/33] incubator-ranger git commit: RANGER-697 : KeyAdmin role user
should see only KMS related audit access logs in Audit tab
RANGER-697 : KeyAdmin role user should see only KMS related audit access logs in Audit tab
Signed-off-by: Velmurugan Periasamy <ve...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/cd584199
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/cd584199
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/cd584199
Branch: refs/heads/tag-policy
Commit: cd58419919aaac19a59e4f59981b0ff34374bb7a
Parents: 22d3ad0
Author: Gautam Borad <ga...@apache.org>
Authored: Tue Oct 13 17:34:13 2015 +0530
Committer: Velmurugan Periasamy <ve...@apache.org>
Committed: Tue Oct 13 20:32:31 2015 -0400
----------------------------------------------------------------------
.../main/java/org/apache/ranger/rest/AssetREST.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/cd584199/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java b/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
index 79cea02..775c647 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
@@ -51,8 +51,11 @@ import org.apache.ranger.common.ServiceUtil;
import org.apache.ranger.common.StringUtil;
import org.apache.ranger.common.annotation.RangerAnnotationClassName;
import org.apache.ranger.common.annotation.RangerAnnotationJSMgrName;
+import org.apache.ranger.db.RangerDaoManager;
+import org.apache.ranger.entity.XXServiceDef;
import org.apache.ranger.plugin.model.RangerPolicy;
import org.apache.ranger.plugin.model.RangerService;
+import org.apache.ranger.plugin.store.EmbeddedServiceDefsUtil;
import org.apache.ranger.plugin.util.GrantRevokeRequest;
import org.apache.ranger.plugin.util.SearchFilter;
import org.apache.ranger.plugin.util.ServicePolicies;
@@ -134,7 +137,9 @@ public class AssetREST {
@Autowired
ServiceREST serviceREST;
-
+ @Autowired
+ RangerDaoManager daoManager;
+
@GET
@Path("/assets/{id}")
@Produces({ "application/xml", "application/json" })
@@ -645,6 +650,13 @@ public class AssetREST {
"startDate", "MM/dd/yyyy");
searchUtil.extractDate(request, searchCriteria, "endDate", "endDate",
"MM/dd/yyyy");
+
+ boolean isKeyAdmin = msBizUtil.isKeyAdmin();
+ XXServiceDef xxServiceDef = daoManager.getXXServiceDef().findByName(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_KMS_NAME);
+ if(isKeyAdmin && xxServiceDef != null){
+ searchCriteria.getParamList().put("repoType", xxServiceDef.getId());
+ }
+
return assetMgr.getAccessLogs(searchCriteria);
}