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/09/05 04:53:50 UTC
ranger git commit: RANGER-2204: Fixed issue where audit log values
for policy service are not processed properly
Repository: ranger
Updated Branches:
refs/heads/ranger-1 418e1ebd8 -> c1c299eca
RANGER-2204: Fixed issue where audit log values for policy service are not processed properly
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/c1c299ec
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/c1c299ec
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/c1c299ec
Branch: refs/heads/ranger-1
Commit: c1c299eca620c99f8aad225db05473f45e67e86c
Parents: 418e1eb
Author: Sailaja Polavarapu <sp...@hortonworks.com>
Authored: Fri Aug 31 10:02:23 2018 -0700
Committer: Mehul Parikh <me...@apache.org>
Committed: Wed Sep 5 10:23:39 2018 +0530
----------------------------------------------------------------------
.../ranger/service/RangerPolicyService.java | 43 +++++++++++++-------
1 file changed, 28 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/c1c299ec/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyService.java
index ad3984d..08baf89 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyService.java
@@ -147,7 +147,7 @@ public class RangerPolicyService extends RangerPolicyServiceBase<XXPolicy, Range
}
List<XXTrxLog> trxLogList = new ArrayList<XXTrxLog>();
Field[] fields = vObj.getClass().getDeclaredFields();
-
+
try {
Field nameField = vObj.getClass().getDeclaredField("name");
@@ -236,14 +236,16 @@ public class RangerPolicyService extends RangerPolicyServiceBase<XXPolicy, Range
}
} else if (ROWFILTER_POLICY_ITEM_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
value = processRowFilterPolicyItemForTrxLog(field.get(vObj));
- } else if (IS_ENABLED_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
- value = String.valueOf(processIsEnabledClassFieldNameForTrxLog(field.get(vObj)));
- } else if (POLICY_LABELS_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
- value = processPolicyLabelsClassFieldNameForTrxLog(field.get(vObj));
- } else if (POLICY_VALIDITYSCHEDULES_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
- value = processValiditySchedulesClassFieldNameForTrxLog(field.get(vObj));
- } else if (POLICY_PRIORITY_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
+ } else if (IS_ENABLED_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
+ value = processIsEnabledClassFieldNameForTrxLog(field.get(vObj));
+ } else if (POLICY_LABELS_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
+ value = processPolicyLabelsClassFieldNameForTrxLog(field.get(vObj));
+ } else if (POLICY_VALIDITYSCHEDULES_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
+ value = processValiditySchedulesClassFieldNameForTrxLog(field.get(vObj));
+ } else if (POLICY_PRIORITY_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
value = processPriorityClassFieldNameForTrxLog(field.get(vObj));
+ } else if (IS_AUDIT_ENABLED_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
+ value = processIsAuditEnabledClassFieldNameForTrxLog(field.get(vObj));
} else {
value = "" + field.get(vObj);
}
@@ -330,9 +332,13 @@ public class RangerPolicyService extends RangerPolicyServiceBase<XXPolicy, Range
}
}else if (IS_ENABLED_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
if (oldPolicy != null) {
- oldValue = String.valueOf(processIsEnabledClassFieldNameForTrxLog(oldPolicy.getIsEnabled()));
+ oldValue = processIsEnabledClassFieldNameForTrxLog(oldPolicy.getIsEnabled());
}
- } else if (POLICY_LABELS_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
+ } else if (IS_AUDIT_ENABLED_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
+ if (oldPolicy != null) {
+ oldValue = processIsAuditEnabledClassFieldNameForTrxLog(oldPolicy.getIsAuditEnabled());
+ }
+ }else if (POLICY_LABELS_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
oldValue = processPolicyLabelsClassFieldNameForTrxLog(oldPolicy.getPolicyLabels());
} else if (POLICY_VALIDITYSCHEDULES_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
oldValue = processValiditySchedulesClassFieldNameForTrxLog(oldPolicy.getValiditySchedules());
@@ -399,11 +405,11 @@ public class RangerPolicyService extends RangerPolicyServiceBase<XXPolicy, Range
return null;
}
} else if (IS_AUDIT_ENABLED_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
- if (compareTwoPolicyName(value, oldValue)) {
- return null;
- }
- } else if (POLICY_LABELS_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
- if (compareTwoPolicyLabelList(value, oldValue)) {
+ if (compareTwoPolicyName(value, oldValue)) {
+ return null;
+ }
+ } else if (POLICY_LABELS_CLASS_FIELD_NAME.equalsIgnoreCase(fieldName)) {
+ if (compareTwoPolicyLabelList(value, oldValue)) {
return null;
}
}
@@ -664,6 +670,13 @@ public class RangerPolicyService extends RangerPolicyServiceBase<XXPolicy, Range
return isEnabled;
}
+ private String processIsAuditEnabledClassFieldNameForTrxLog(Object value) {
+ if(value == null)
+ return null;
+ String isAuditEnabled = String.valueOf(value);
+ return isAuditEnabled;
+ }
+
private boolean compareTwoDataMaskingPolicyItemList(String value, String oldValue) {
if (value == null && oldValue == null) {
return true;