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
commit d53934b41c2f1ffef72eda3495b72957354b02bd
Merge: be4a778a6 9dad22998
Author: Madhan Neethiraj <mad...@apache.org>
AuthorDate: Sat Nov 18 01:48:08 2023 -0800
Merge branch 'master' into RANGER-3923
...AnyOfExpectedTagsPresentConditionEvaluator.java | 18 +-
...oneOfExpectedTagsPresentConditionEvaluator.java | 16 +-
.../RangerScriptConditionEvaluator.java | 9 +-
.../RangerTagsAllPresentConditionEvaluator.java | 20 +-
.../plugin/model/RangerServiceHeaderInfo.java | 29 +
.../policyengine/RangerRequestScriptEvaluator.java | 108 ++--
.../ranger/plugin/util/RangerCommonConstants.java | 12 +-
.../plugin/util/RangerRequestExprResolver.java | 4 +-
.../apache/ranger/plugin/util/SearchFilter.java | 4 +-
.../RangerRequestScriptEvaluatorTest.java | 640 ++++++++++-----------
.../plugin/util/RangerRequestExprResolverTest.java | 1 +
.../org/apache/ranger/biz/SecurityZoneDBStore.java | 74 ++-
.../org/apache/ranger/common/RangerSearchUtil.java | 3 +
.../ranger/db/XXSecurityZoneRefServiceDao.java | 15 +-
.../ranger/db/XXSecurityZoneRefTagServiceDao.java | 15 +-
.../java/org/apache/ranger/db/XXServiceDao.java | 19 +
.../java/org/apache/ranger/rest/PublicAPIsv2.java | 26 +-
.../org/apache/ranger/rest/SecurityZoneREST.java | 12 +-
.../java/org/apache/ranger/rest/ServiceREST.java | 46 +-
.../main/resources/META-INF/jpa_named_queries.xml | 15 +-
.../org/apache/ranger/rest/TestPublicAPIsv2.java | 35 +-
21 files changed, 641 insertions(+), 480 deletions(-)
diff --cc
agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceHeaderInfo.java
index 4858c3109,e5b2bf4c2..04a8d430b
---
a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceHeaderInfo.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceHeaderInfo.java
@@@ -27,11 -29,15 +29,13 @@@ public class RangerServiceHeaderInfo ex
private static final long serialVersionUID = 1L;
private String name;
+ private String displayName;
+ private String type;
private Boolean isTagService;
+ private Boolean isGdsService;
public RangerServiceHeaderInfo() {
- super();
- setId(-1L);
- setName("");
- setIsTagService(false);
+ this(-1L, "", false, false);
}
public RangerServiceHeaderInfo(Long id, String name, boolean
isTagService) {
@@@ -43,9 -45,17 +47,18 @@@
setId(id);
setName(name);
setIsTagService(isTagService);
+ setIsGdsService(isGdsService);
}
+ public RangerServiceHeaderInfo(Long id, String name, String displayName,
String type) {
+ super();
+ setId(id);
+ setName(name);
+ setDisplayName(displayName);
+ setType(type);
+ setIsTagService(EMBEDDED_SERVICEDEF_TAG_NAME.equals(type));
+ }
+
public String getName() {
return name;
}
diff --cc
agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
index 60df0c52b,451b13afe..548963838
mode 100755,100644..100755
---
a/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
diff --cc
security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
index ab5f69b5a,de72ff140..8c9a6c13d
mode 100755,100644..100755
---
a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
+++
b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
