[ranger] branch ranger-2.2 updated: RANGER-3371: Addendum patch to fix json parsing issue related to timestamp fields

[pr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pradeep pushed a commit to branch ranger-2.2
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/ranger-2.2 by this push:
     new 8bd0e9d  RANGER-3371: Addendum patch to fix json parsing issue related to timestamp fields
8bd0e9d is described below

commit 8bd0e9d0cbfedeb795b95a8e71e500fdb7a7d44e
Author: pradeep <pr...@apache.org>
AuthorDate: Mon Sep 13 11:08:32 2021 +0530

    RANGER-3371: Addendum patch to fix json parsing issue related to timestamp fields
---
 .../java/org/apache/ranger/plugin/util/RangerPolicyDeltaUtil.java     | 2 +-
 .../src/main/java/org/apache/ranger/db/XXPolicyChangeLogDao.java      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPolicyDeltaUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPolicyDeltaUtil.java
index 42143d0..8866eed 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPolicyDeltaUtil.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPolicyDeltaUtil.java
@@ -90,7 +90,7 @@ public class RangerPolicyDeltaUtil {
 
                         while (iter.hasNext()) {
                             RangerPolicy policy = iter.next();
-                            if (policyId.equals(policy.getId()) && changeType == RangerPolicyDelta.CHANGE_TYPE_POLICY_DELETE) {
+                            if (policyId.equals(policy.getId()) && (changeType == RangerPolicyDelta.CHANGE_TYPE_POLICY_DELETE || changeType == RangerPolicyDelta.CHANGE_TYPE_POLICY_UPDATE)) {
                                 deletedPolicies.add(policy);
                                 iter.remove();
                             }
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyChangeLogDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyChangeLogDao.java
index 6136bd3..16aaf30 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyChangeLogDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyChangeLogDao.java
@@ -26,12 +26,12 @@ import java.util.concurrent.TimeUnit;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.ranger.authorization.utils.JsonUtils;
 import org.apache.ranger.common.db.BaseDao;
 import org.apache.ranger.entity.XXPolicy;
 import org.apache.ranger.entity.XXPolicyChangeLog;
 import org.apache.ranger.plugin.model.RangerPolicy;
 import org.apache.ranger.plugin.model.RangerPolicyDelta;
-import org.apache.ranger.plugin.util.JsonUtilsV2;
 import org.springframework.stereotype.Service;
 
 /**
@@ -142,7 +142,7 @@ public class XXPolicyChangeLogDao extends BaseDao<XXPolicyChangeLog> {
                     XXPolicy xxPolicy = daoManager.getXXPolicy().getById(policyId);
                     if (xxPolicy != null) {
                         try {
-                            policy = JsonUtilsV2.jsonToObj(xxPolicy.getPolicyText(), RangerPolicy.class);
+                            policy = JsonUtils.jsonToObject(xxPolicy.getPolicyText(), RangerPolicy.class);
                             policy.setId(policyId);
                         } catch (Exception e) {
                             LOG.error("Cannot read policy:[" + policyId + "]. Should not have come here!! Offending log-record-id:[" + logRecordId + "] and returning...", e);