You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by me...@apache.org on 2018/05/18 05:03:14 UTC
ranger git commit: RANGER-2103 : User is not able to see revoke
audits for HBASE
Repository: ranger
Updated Branches:
refs/heads/master 081af4819 -> d1521dcdc
RANGER-2103 : User is not able to see revoke audits for HBASE
Signed-off-by: Mehul Parikh <me...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/d1521dcd
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/d1521dcd
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/d1521dcd
Branch: refs/heads/master
Commit: d1521dcdc33252c79dc89b7d065c2ebdcaa8a9f4
Parents: 081af48
Author: Nikhil P <ni...@gmail.com>
Authored: Wed May 16 17:33:21 2018 +0530
Committer: Mehul Parikh <me...@apache.org>
Committed: Fri May 18 10:33:02 2018 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/ranger/rest/AssetREST.java | 10 +++++-----
.../org/apache/ranger/solr/SolrAccessAuditsService.java | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/d1521dcd/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 b2a43d2..50dc178 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
@@ -650,14 +650,14 @@ public class AssetREST {
searchUtil.extractString(request, searchCriteria, "cluster", "Cluster Name", StringUtil.VALIDATION_TEXT);
boolean isKeyAdmin = msBizUtil.isKeyAdmin();
- boolean isAuditKeyAdmin = msBizUtil.isAuditKeyAdmin();
+ boolean isAuditKeyAdmin = msBizUtil.isAuditKeyAdmin();
XXServiceDef xxServiceDef = daoManager.getXXServiceDef().findByName(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_KMS_NAME);
- if(isKeyAdmin && xxServiceDef != null || isAuditKeyAdmin && xxServiceDef != null){
+ if(isKeyAdmin && xxServiceDef != null || isAuditKeyAdmin && xxServiceDef != null){
searchCriteria.getParamList().put("repoType", xxServiceDef.getId());
}
- else if (xxServiceDef != null) {
- searchCriteria.getParamList().put("-repoType", xxServiceDef.getId());
- }
+ else if (xxServiceDef != null) {
+ searchCriteria.getParamList().put("-repoType", xxServiceDef.getId());
+ }
return assetMgr.getAccessLogs(searchCriteria);
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/d1521dcd/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java
index 397639b..593634b 100644
--- a/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java
+++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java
@@ -149,7 +149,7 @@ public class SolrAccessAuditsService {
if (!hiveQueryVisibility && "hive".equalsIgnoreCase(vXAccessAudit.getServiceType())) {
vXAccessAudit.setRequestData(null);
}
- else if("hive".equalsIgnoreCase(vXAccessAudit.getServiceType()) && "grant".equalsIgnoreCase(vXAccessAudit.getAccessType()) || "revoke".equalsIgnoreCase(vXAccessAudit.getAccessType())){
+ else if("hive".equalsIgnoreCase(vXAccessAudit.getServiceType()) && ("grant".equalsIgnoreCase(vXAccessAudit.getAccessType()) || "revoke".equalsIgnoreCase(vXAccessAudit.getAccessType()))){
try {
vXAccessAudit.setRequestData(java.net.URLDecoder.decode(vXAccessAudit.getRequestData(), "UTF-8"));
} catch (UnsupportedEncodingException e) {