This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/RANGER-3923 by this push:
new 1c95310ae RANGER-4346: fixed incorrect computation of
GdsSharedResource.resourceSignature
1c95310ae is described below
commit 1c95310ae691a8e4215cc4efb67e7428f661388c
Author: Prashant Satam <[email protected]>
AuthorDate: Wed Aug 16 16:13:07 2023 +0530
RANGER-4346: fixed incorrect computation of
GdsSharedResource.resourceSignature
Signed-off-by: Madhan Neethiraj <[email protected]>
---
.../org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java | 4 ++++
.../org/apache/ranger/service/RangerGdsSharedResourceService.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
old mode 100644
new mode 100755
index c14811867..787705c42
---
a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
@@ -57,6 +57,10 @@ public class RangerPolicyResourceSignature {
}
}
+
+ public RangerPolicyResourceSignature(Map<String, RangerPolicyResource>
policyResources) {
+ this(new RangerPolicy(null, null, null, null, null,
policyResources, null, null, null, null, null));
+ }
/**
* Only added for testability. Do not make public
* @param string
diff --git
a/security-admin/src/main/java/org/apache/ranger/service/RangerGdsSharedResourceService.java
b/security-admin/src/main/java/org/apache/ranger/service/RangerGdsSharedResourceService.java
old mode 100644
new mode 100755
index 33fbd3ce4..6a963da60
---
a/security-admin/src/main/java/org/apache/ranger/service/RangerGdsSharedResourceService.java
+++
b/security-admin/src/main/java/org/apache/ranger/service/RangerGdsSharedResourceService.java
@@ -194,7 +194,7 @@ public class RangerGdsSharedResourceService extends
RangerGdsBaseModelService<XX
xObj.setDataShareId(vObj.getDataShareId());
xObj.setResource(JsonUtils.mapToJson(vObj.getResource()));
xObj.setSubResourceNames(JsonUtils.listToJson(vObj.getSubResourceNames()));
-
xObj.setResourceSignature(RangerPolicyResourceSignature.toSignatureString(vObj.getResource()));
+ xObj.setResourceSignature(new
RangerPolicyResourceSignature(vObj.getResource()).getSignature());
xObj.setConditionExpr(vObj.getConditionExpr());
xObj.setAccessTypes(JsonUtils.objectToJson(vObj.getAccessTypes()));
xObj.setRowFilter(JsonUtils.objectToJson(vObj.getRowFilter()));