(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 65b17ec97bea57a5496d8b22fb2c25461789658a Merge: 2f7f76261 96da0c834 Author: Madhan Neethiraj AuthorDate: Mon Jan 8 17:46:29 2024 -0800 Merge branch 'master' into RANGER-3923 .../java/org/apache/ranger/plugin/service/RangerBasePlugin.java | 8 +++- .../org/apache/ranger/plugin/service/RangerChainedPlugin.java | 4 2 files changed, 11 insertions(+), 1 deletion(-)
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 fca13a78a393ce6c9de83bb49b1bff0488fa3354 Merge: 501f1cc21 8ef4e516f Author: Madhan Neethiraj AuthorDate: Fri Jan 5 14:46:29 2024 -0800 Merge branch 'master' into RANGER-3923 .../src/test/java/org/apache/ranger/rest/TestAssetREST.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 501f1cc21b29537910f2653c61ac59f06e4cb8bb Merge: 64da8ed3a 05e8bef4b Author: Madhan Neethiraj AuthorDate: Thu Jan 4 17:06:32 2024 -0800 Merge branch 'master' into RANGER-3923 .../java/org/apache/ranger/rest/AssetREST.java | 52 -- .../java/org/apache/ranger/rest/XAuditREST.java| 27 +-- 2 files changed, 72 insertions(+), 7 deletions(-)
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 64da8ed3a265f28af92d22097729fb15846b8ae3 Merge: 9b478f0b8 c2b83f576 Author: Madhan Neethiraj AuthorDate: Thu Jan 4 09:49:18 2024 -0800 Merge branch 'master' into RANGER-3923 .../main/webapp/react-webapp/src/utils/XAEnums.js | 10 +- .../src/views/AuditEvent/AccessLogDetail.jsx | 24 +++-- .../src/views/AuditEvent/AdminModal.jsx| 4 ++- .../src/views/Encryption/KeyCreate.jsx | 21 +++- .../src/views/PolicyListing/PolicyListing.jsx | 32 - .../views/PolicyListing/PolicyListingTabView.jsx | 20 +-- .../src/views/Reports/UserAccessLayout.jsx | 28 --- .../src/views/SecurityZone/SecurityZoneForm.jsx| 40 ++ .../react-webapp/src/views/SideBar/TopNavBar.jsx | 8 +++-- .../scripts/collection_bases/RangerZoneListBase.js | 3 -- .../main/webapp/scripts/controllers/Controller.js | 3 ++ .../main/webapp/scripts/controllers/NController.js | 3 ++ .../webapp/scripts/modules/globalize/message/en.js | 3 ++ 13 files changed, 84 insertions(+), 115 deletions(-) diff --cc security-admin/src/main/webapp/react-webapp/src/utils/XAEnums.js index adb02d5ec,c1887d727..842cb690e mode 100755,100644..100755 --- a/security-admin/src/main/webapp/react-webapp/src/utils/XAEnums.js +++ b/security-admin/src/main/webapp/react-webapp/src/utils/XAEnums.js
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 866b919ce35d232518eb79126752b66d1d3fafae Merge: de4a379b2 74351d624 Author: Madhan Neethiraj AuthorDate: Fri Dec 22 14:49:18 2023 -0800 Merge branch 'master' into RANGER-3923 .../java/org/apache/ranger/rest/ServiceREST.java | 49 ++ .../org/apache/ranger/rest/TestServiceREST.java| 79 +++--- 2 files changed, 108 insertions(+), 20 deletions(-)
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 7968a28a175dd6ddfdaf1a9e5282864b39f2b7be Merge: 56f9d8c08 88d7644f7 Author: Madhan Neethiraj AuthorDate: Mon Dec 11 16:11:51 2023 -0800 Merge branch 'master' into RANGER-3923
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 cf35a719dabb0598de804353c1dada71f8654c22 Merge: 7179a19c1 1d0911703 Author: Madhan Neethiraj AuthorDate: Mon Dec 4 09:08:04 2023 -0800 Merge branch 'master' into RANGER-3923 .../ranger/plugin/store/AbstractPredicateUtil.java | 7 +- .../plugin/store/SecurityZonePredicateUtil.java| 34 + .../plugin/util/RangerRequestExprResolver.java | 6 +- .../service-defs/ranger-servicedef-hive.json | 1 + .../plugin/util/RangerRequestExprResolverTest.java | 9 +- credentialbuilder/pom.xml | 6 - .../ranger/credentialapi/TestCredentialReader.java | 12 +- .../apache/ranger/credentialapi/Testbuildks.java | 14 +-- hive-agent/pom.xml | 6 - .../services/hive/HIVERangerAuthorizerTest.java| 137 +++-- .../hive/TestAllHiveOperationInRanger.java | 4 +- intg/pom.xml | 15 ++- .../java/org/apache/ranger/TestRangerClient.java | 69 ++- kms/scripts/setup.sh | 7 +- plugin-kafka/pom.xml | 6 - .../authorizer/KafkaRangerAuthorizerGSSTest.java | 16 +-- .../KafkaRangerAuthorizerSASLSSLTest.java | 17 +-- .../authorizer/KafkaRangerAuthorizerTest.java | 24 ++-- .../authorizer/KafkaRangerTopicCreationTest.java | 8 +- ranger-authn/pom.xml | 6 - ranger-common-ha/pom.xml | 6 - .../service/TestRangerServiceServerIdSelector.java | 10 +- ranger-examples/conditions-enrichers/pom.xml | 6 - .../RangerSampleSimpleMatcherTest.java | 30 ++--- security-admin/scripts/setup.sh| 7 +- .../org/apache/ranger/biz/SecurityZoneDBStore.java | 2 +- .../react-webapp/src/components/Editable.jsx | 2 +- .../views/PolicyListing/PolicyPermissionItem.jsx | 48 ++-- 28 files changed, 287 insertions(+), 228 deletions(-)
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 67dd53692e150844a447f1b2b5b31a4b0b88bf51 Merge: 6e3c22bd3 04c93b3df Author: Madhan Neethiraj AuthorDate: Wed Nov 29 00:41:15 2023 -0800 Merge branch 'master' into RANGER-3923 .../ranger/plugin/service/RangerBasePlugin.java| 6 ++ .../ranger/plugin/util/PerfDataRecorder.java | 77 +- .../plugin/util/RangerPerfCollectorTracer.java | 2 +- .../ranger/plugin/util/RangerPerfTracer.java | 5 +- 4 files changed, 72 insertions(+), 18 deletions(-) diff --cc agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java index 7d5767235,040b340e3..6edcb12c0 --- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java @@@ -48,25 -48,21 +48,28 @@@ public class RangerPerfTracer } public static RangerPerfTracer getPerfTracer(Logger logger, String tag) { - String data = ""; - String realTag = ""; - - if (tag != null) { - int indexOfTagEndMarker = StringUtils.indexOf(tag, tagEndMarker); - if (indexOfTagEndMarker != -1) { - realTag = StringUtils.substring(tag, 0, indexOfTagEndMarker); - if (!PerfDataRecorder.collectStatistics()) { - data = StringUtils.substring(tag, indexOfTagEndMarker); + if (logger.isDebugEnabled()) { + String data= ""; + String realTag = ""; + + if (tag != null) { + int indexOfTagEndMarker = StringUtils.indexOf(tag, tagEndMarker); + + if (indexOfTagEndMarker != -1) { + realTag = StringUtils.substring(tag, 0, indexOfTagEndMarker); - data= StringUtils.substring(tag, indexOfTagEndMarker); ++ ++ if (!PerfDataRecorder.collectStatistics()) { ++ data = StringUtils.substring(tag, indexOfTagEndMarker); ++ } + } else { + realTag = tag; } - } else { - realTag = tag; } + + return RangerPerfTracerFactory.getPerfTracer(logger, realTag, data); + } else { + return null; } - return RangerPerfTracerFactory.getPerfTracer(logger, realTag, data); } public static RangerPerfTracer getPerfTracer(Logger logger, String tag, String data) {
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 d5115581db779cb1631a2312c50a05bb9857dba7 Merge: ef9a05358 6c2604500 Author: Madhan Neethiraj AuthorDate: Sun Nov 26 23:37:09 2023 -0800 Merge branch 'master' into RANGER-3923 kms/scripts/setup.sh | 15 ++- ranger-metrics/pom.xml| 8 security-admin/scripts/setup.sh | 15 ++- .../test/java/org/apache/ranger/rest/TestServiceREST.java | 13 +++-- 4 files changed, 47 insertions(+), 4 deletions(-)
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 ef9a05358be5a9154be8371aa59c1a67bea1c947 Merge: 6dd92b6fa 98558adc9 Author: Madhan Neethiraj AuthorDate: Sat Nov 25 00:12:25 2023 -0800 Merge branch 'master' into RANGER-3923 .../main/webapp/libs/fsOverrides/BBFOverrides.js | 21 --- .../main/webapp/react-webapp/src/styles/style.css | 3 + .../views/PolicyListing/TagBasePermissionItem.jsx | 65 ++ .../src/main/webapp/scripts/models/RangerZone.js | 20 --- .../src/main/webapp/scripts/modules/XAOverrides.js | 4 +- .../src/main/webapp/scripts/utils/XAUtils.js | 17 -- .../webapp/scripts/views/kms/KMSTableLayout.js | 2 +- .../views/permissions/ModulePermissionForm.js | 14 ++--- .../scripts/views/policies/PermissionList.js | 10 ++-- .../views/policies/RangerPolicyConditions.js | 4 +- .../scripts/views/policies/RangerPolicyForm.js | 4 +- .../scripts/views/reports/OperationDiffDetail.js | 4 +- .../scripts/views/reports/UserAccessLayout.js | 17 +++--- .../scripts/views/security_zone/ZoneCreate.js | 5 -- .../scripts/views/security_zone/ZoneCreateForm.js | 24 .../scripts/views/service/AuditFilterConfig.js | 48 ++-- .../scripts/views/users/AddUsersOrGroupsList.js| 6 +- .../webapp/scripts/views/users/UserTableLayout.js | 2 +- security-admin/src/main/webapp/styles/xa.css | 24 +++- .../permissions/ModulePermissionForm_tmpl.html | 6 +- .../security_zone/ZoneCreateForm_tmpl.html | 2 +- .../main/webapp/templates/users/RoleForm_tmpl.html | 6 +- 22 files changed, 221 insertions(+), 87 deletions(-) diff --cc security-admin/src/main/webapp/react-webapp/src/styles/style.css index 6e514be9e,10f47923b..5931a36de mode 100755,100644..100755 --- a/security-admin/src/main/webapp/react-webapp/src/styles/style.css +++ b/security-admin/src/main/webapp/react-webapp/src/styles/style.css
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 df89f8a0d23fb972c4e3567ba77fde2a0dc341e9 Merge: a86520d03 6cdb6dafc Author: Madhan Neethiraj AuthorDate: Tue Nov 21 10:53:02 2023 -0800 Merge branch 'master' into RANGER-3923 .../src/main/webapp/react-webapp/src/App.jsx | 49 - .../react-typeahead/tokenizer/index.js | 25 - .../main/webapp/react-webapp/src/utils/XAUtils.js | 119 - .../src/views/AuditEvent/AccessLogs.jsx| 87 ++- .../main/webapp/react-webapp/src/views/Home.jsx| 49 - .../src/views/PermissionsModule/EditPermission.jsx | 9 +- .../src/views/Reports/UserAccessLayout.jsx | 4 +- .../views/ServiceManager/ServiceDefinitions.jsx| 75 - .../src/views/ServiceManager/ServiceForm.jsx | 16 --- .../react-webapp/src/views/SideBar/TopNavBar.jsx | 16 --- 10 files changed, 273 insertions(+), 176 deletions(-) diff --cc security-admin/src/main/webapp/react-webapp/src/App.jsx index 65c4b2c09,ef5f6f3c9..cd66839b1 mode 100755,100644..100755 --- a/security-admin/src/main/webapp/react-webapp/src/App.jsx +++ b/security-admin/src/main/webapp/react-webapp/src/App.jsx
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 62545bdb5c968d53bd694d0dc9d12b5bb436a948 Merge: d53934b41 9146ff44f Author: Madhan Neethiraj AuthorDate: Mon Nov 20 12:09:21 2023 -0800 Merge branch 'master' into RANGER-3923 kms/scripts/db_setup.py | 44 +++- kms/scripts/install.properties | 1 + kms/scripts/setup.sh | 2 ++ security-admin/scripts/changepasswordutil.py | 7 +++-- security-admin/scripts/db_setup.py | 10 +-- security-admin/scripts/install.properties| 1 + security-admin/scripts/setup.sh | 3 ++ 7 files changed, 43 insertions(+), 25 deletions(-)
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 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
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 be4a778a6772d8915807680a9168ead92686c86f Merge: 515a5098b 89fa06161 Author: Madhan Neethiraj AuthorDate: Fri Nov 17 17:40:38 2023 -0800 Merge branch 'master' into RANGER-3923 agents-audit/pom.xml | 24 +++- agents-common/pom.xml | 37 --- agents-cred/pom.xml| 20 +++- credentialbuilder/pom.xml | 31 -- hbase-agent/pom.xml| 95 +--- hdfs-agent/pom.xml | 14 ++- hive-agent/pom.xml | 19 +++- intg/pom.xml | 14 ++- kms/pom.xml| 123 - knox-agent/pom.xml | 38 --- plugin-kafka/pom.xml | 71 ++-- plugin-kms/pom.xml | 16 ++- plugin-kudu/pom.xml| 14 ++- plugin-kylin/pom.xml | 40 --- plugin-nifi-registry/pom.xml | 12 +- plugin-nifi/pom.xml| 12 +- plugin-presto/pom.xml | 30 +++-- plugin-schema-registry/pom.xml | 22 ++-- plugin-sqoop/pom.xml | 59 ++ plugin-trino/pom.xml | 30 +++-- pom.xml| 16 ++- ranger-authn/pom.xml | 14 ++- ranger-common-ha/pom.xml | 13 ++- ranger-examples/conditions-enrichers/pom.xml | 25 +++-- ranger-knox-plugin-shim/pom.xml| 18 ++- ranger-metrics/pom.xml | 13 ++- ranger-plugin-classloader/pom.xml | 18 ++- ranger-tools/pom.xml | 20 +++- security-admin/pom.xml | 37 --- .../main/webapp/react-webapp/src/utils/XAUtils.js | 16 ++- .../main/webapp/react-webapp/src/utils/fetchAPI.js | 6 +- .../src/views/AuditEvent/AccessLogs.jsx| 8 +- .../src/views/AuditEvent/AdminLogs.jsx | 6 +- .../src/views/AuditEvent/AuditLayout.jsx | 2 +- .../src/views/AuditEvent/LoginSessionsLogs.jsx | 4 +- .../src/views/AuditEvent/PluginStatusLogs.jsx | 4 +- .../src/views/AuditEvent/PluginsLog.jsx| 4 +- .../react-webapp/src/views/AuditEvent/UserSync.jsx | 6 +- .../src/views/Encryption/KeyManager.jsx| 4 +- .../webapp/react-webapp/src/views/ErrorPage.jsx| 11 +- .../main/webapp/react-webapp/src/views/Home.jsx| 2 +- .../main/webapp/react-webapp/src/views/Layout.jsx | 11 +- .../src/views/PermissionsModule/Permissions.jsx| 4 +- .../views/PolicyListing/AddUpdatePolicyForm.jsx| 5 +- .../src/views/PolicyListing/PolicyListing.jsx | 4 +- .../views/PolicyListing/PolicyListingTabView.jsx | 20 ++-- .../src/views/Reports/UserAccessLayout.jsx | 12 +- .../src/views/SecurityZone/SecurityZoneForm.jsx| 2 +- .../src/views/SecurityZone/ZoneListing.jsx | 14 ++- .../views/ServiceManager/ServiceDefinitions.jsx| 3 +- .../src/views/ServiceManager/ServiceForm.jsx | 2 +- .../react-webapp/src/views/SideBar/SideBar.jsx | 3 +- .../UserGroupRoleListing/UserGroupRoleListing.jsx | 2 +- .../groups_details/GroupListing.jsx| 4 +- .../role_details/RoleListing.jsx | 4 +- .../users_details/UserListing.jsx | 4 +- storm-agent/pom.xml| 17 ++- tagsync/pom.xml| 28 +++-- ugsync/pom.xml | 51 + 59 files changed, 749 insertions(+), 409 deletions(-)
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 bee10c5fb0cd57d6cd6d62bc930a6d6b5900e753 Merge: 32671b441 69f74e32e Author: Madhan Neethiraj AuthorDate: Wed Nov 8 14:29:51 2023 -0800 Merge branch 'master' into RANGER-3923 .../policyengine/RangerPolicyEngineImpl.java | 197 +--- .../RangerAbstractPolicyEvaluator.java | 198 + .../policyevaluator/RangerPolicyEvaluator.java | 4 + 3 files changed, 205 insertions(+), 194 deletions(-)
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 32671b4417b61b9a5fae3a71ba69229af6839d15 Merge: 72055fb26 7c805efe8 Author: Madhan Neethiraj AuthorDate: Wed Nov 8 13:14:11 2023 -0800 Merge branch 'master' into RANGER-3923 .../ranger/plugin/util/PerfDataRecorder.java | 49 --- .../plugin/util/RangerPerfCollectorTracer.java | 26 ++-- .../ranger/plugin/util/RangerPerfTracer.java | 41 +++-- .../plugin/util/RangerPerfTracerFactory.java | 42 - .../org/apache/ranger/common/RangerConstants.java | 2 + .../org/apache/ranger/common/RangerSearchUtil.java | 69 +- 6 files changed, 168 insertions(+), 61 deletions(-) diff --cc security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java index ecb48e251,62ff8e135..f769d2ed0 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
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 458335460517d15e6205223531eca543862fc454 Merge: 3ce76358f 7ec7ae557 Author: Madhan Neethiraj AuthorDate: Mon Nov 6 15:30:16 2023 -0800 Merge branch 'master' into RANGER-3923 .../ranger/plugin/policyengine/PolicyEngine.java | 28 -- .../RangerAbstractPolicyItemEvaluator.java | 3 +-- .../RangerAuditPolicyEvaluator.java| 2 +- .../RangerDefaultPolicyEvaluator.java | 13 -- 4 files changed, 11 insertions(+), 35 deletions(-)
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 6323d7f9fa57d7cfca2169a088e6dec7b71e7bfe Merge: fe10fa806 0558fa9cc Author: Madhan Neethiraj AuthorDate: Wed Nov 1 14:44:56 2023 -0700 Merge branch 'master' into RANGER-3923 .../ranger/plugin/policyengine/PolicyEngine.java | 177 ++--- .../policyengine/RangerSecurityZoneMatcher.java| 209 + .../ranger/plugin/service/RangerAuthContext.java | 13 +- .../plugin/policyengine/TestPolicyEngine.java | 13 +- .../TestRangerSecurityZoneMatcher.java | 159 5 files changed, 397 insertions(+), 174 deletions(-)
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 fe10fa806b580e7ef9e5d1447031cfc18dfc0602 Merge: 46781c62f 213b4abe2 Author: Madhan Neethiraj AuthorDate: Tue Oct 31 22:44:27 2023 -0700 Merge branch 'master' into RANGER-3923 .../policyengine/RangerRequestScriptEvaluator.java | 31 +++ .../ranger/plugin/util/RangerCommonConstants.java | 3 + .../ranger/plugin/util/RangerTimeRangeChecker.java | 128 + .../RangerRequestScriptEvaluatorTest.java | 29 ++ .../plugin/util/RangerTimeRangeCheckerTest.java| 291 + 5 files changed, 482 insertions(+)
(ranger) 01/01: Merge branch 'master' into RANGER-3923
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 46781c62ff1fbf48ea4cef6876b567ea6634a846 Merge: 7ff8740db 3ba5e9263 Author: Madhan Neethiraj AuthorDate: Mon Oct 30 23:25:05 2023 -0700 Merge branch 'master' into RANGER-3923 .../plugin/util/RangerSecurityZoneHelper.java | 46 +- pom.xml| 2 +- .../org/apache/ranger/rest/SecurityZoneREST.java | 20 +++--- 3 files changed, 52 insertions(+), 16 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 9422101b4ea7bac245c4f13d1eb061f8d15daf13 Merge: af4fdfd1b d29c2a471 Author: Madhan Neethiraj AuthorDate: Thu Oct 26 10:03:02 2023 -0700 Merge branch 'master' into RANGER-3923 .../react-webapp/src/components/Editable.jsx | 16 +- .../main/webapp/react-webapp/src/styles/style.css | 7 + .../webapp/react-webapp/src/utils/XAMessages.js| 4 +- .../main/webapp/react-webapp/src/utils/XAUtils.js | 28 +- .../AuditEvent/AdminLogs/PolicyViewDetails.jsx | 179 + .../views/PolicyListing/AddUpdatePolicyForm.jsx| 430 +++-- .../views/PolicyListing/PolicyConditionsComp.jsx | 2 +- .../src/views/PolicyListing/PolicyListing.jsx | 15 +- .../views/PolicyListing/PolicyPermissionItem.jsx | 106 +++-- .../src/views/Resources/ModalResourceComp.jsx | 1 + .../src/views/Resources/ResourceComp.jsx | 64 ++- .../src/views/Resources/ResourceSelectComp.jsx | 20 +- .../src/views/SecurityZone/SecurityZoneForm.jsx| 1 - .../views/ServiceManager/ServiceAuditFilter.jsx| 1 - 14 files changed, 572 insertions(+), 302 deletions(-) diff --cc security-admin/src/main/webapp/react-webapp/src/styles/style.css index f6f3f5529,46e8eeda1..7cb54b7dc mode 100755,100644..100755 --- a/security-admin/src/main/webapp/react-webapp/src/styles/style.css +++ b/security-admin/src/main/webapp/react-webapp/src/styles/style.css @@@ -2559,394 -2554,8 +2559,401 @@@ li.list-group-item:hover .text-word-break { word-break: break-all; } ++ +.gds-table { + margin-left: auto; + margin-right: auto; + width: 700px; +} + +.gds-tr { + text-align: center !important; + padding-top: 100px; + padding-bottom: 20px; + padding-left: 30px; + padding-right: 40px; +} + +.gds-header-wrapper { + background-color: #f3f8f9; + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 1rem; + border-bottom: 1px solid #d6d6d6; + position: sticky; + top: 0; + z-index: 1; +} + +.gds-form-header-wrapper { + background-color: #ff; + display: flex; + justify-content: space-between; + align-items: center; + padding: 1rem; + border-bottom: 1px solid #d6d6d6; + position: sticky; + top: 0; + z-index: 1; +} + +.gds-header { + color: #22; + font-size: 18px; + font-weight: 300; + line-height: 20px; + margin: 0; + padding: 0; + text-transform: none; + flex: 1; +} + +.gds-header-btn-grp { + display: flex; + gap: 0.875rem; +} + +.gds-form-wrap { + max-width: 880px; + margin: 0 auto; + background-color: #fff; +} + +.gds-form-header { + padding-top: 70px; + text-align: center; +} + +.gds-form-step-num { + margin-bottom: 1.5rem; + text-transform: uppercase; + font-size: 1rem; +} + +.gds-form-step-name { + font-size: 1.5rem; + margin-bottom: 3rem; +} + +.gds-form-content { + display: flex; + flex-direction: column; + gap: 2.5rem; +} + +.gds-form-input { + width: 100%; +} + +.gds-add-principle { + display: inline-flex; + justify-content: space-between; + gap: 0.875rem; + width: 100%; + align-items: flex-start; +} + +.flex-1 { + flex: 1; +} + +.gds-text-input { + min-height: 40px; + margin-bottom: 2rem; +} + +.gds-button { + height: 40px; +} + +.gds-tab-content { + width: 760px; /* 52.77% . Max screen size 1440px*/ + margin-left: 120px; + margin-top: 40px; +} + +.gds-request-content { + width: 920px; + margin: 0 auto; +} + +.gds-inline-field-grp { + display: inline-flex; + flex-direction: column; + align-items: flex-start; + gap: 1rem; + margin-bottom: 2rem; +} + +.gds-inline-listing { + border-bottom: 1px solid #eee; + margin-bottom: 1rem; + padding-bottom: 1rem; +} + +.gds-right-inline-field-grp { + display: inline-flex; + flex-direction: column; + align-items: flex-end; + gap: 1rem; + margin-bottom: 2rem; +} + +.gds-left-inline-field { + width: 160px; + flex-shrink: 0; +} + +.gds-right-inline-field { + width: 160px; + text-align: right; + flex-shrink: 0; +} + +.gds-description { + border: none; +} + +.gds-content-border { + border: 1px solid #ee; + border-radius: 16px; + padding: 1.5rem 1.25rem 2.5rem 1.25rem; +} + +.gds-content-header { + font-size: 1.125rem; + padding-bottom: 1rem; + border-bottom: 1px solid #ee; +} + +.gds-card-heading { + font-size: 1.125rem; + padding-bottom: 1rem; + border-bottom: 1px solid #dd; +} + +.gds-card-heading-border { + border-bottom: 1px solid #dd; +} + +.gds-acc-card-header { + padding: 0.5rem 0.75rem; +} + +.gds-heading-5 { + font-size: 1.125rem; +} + +/* .gds-section-title { + padding: 1.5rem 1rem 0rem 1rem; +} */ + +.gds-flex { + display:
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 12c80bfaf1fa0922e8f0c4c3cde4330e68fd3a3e Merge: 21e56d955 105f6f5ce Author: Madhan Neethiraj AuthorDate: Tue Oct 24 13:38:53 2023 -0700 Merge branch 'master' into RANGER-3923 .../plugin/policyengine/RangerResourceTrie.java| 3 - .../RangerCustomConditionEvaluator.java| 182 + .../RangerDefaultPolicyEvaluator.java | 18 +- .../RangerDefaultPolicyItemEvaluator.java | 52 +- .../apache/ranger/plugin/util/ServiceDefUtil.java | 48 ++ .../site/resources/blogs/adventures_in_abac_2.html | 2 +- .../org/apache/ranger/biz/PolicyRefUpdater.java| 3 +- .../service/RangerServiceDefServiceBase.java | 28 +--- .../service/TestRangerServiceDefService.java | 3 +- 9 files changed, 140 insertions(+), 199 deletions(-) diff --cc agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceDefUtil.java index 489476b28,d78674d51..5d1fb0be5 --- a/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceDefUtil.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceDefUtil.java @@@ -59,30 -59,13 +61,35 @@@ import java.util.Set public class ServiceDefUtil { private static final Logger LOG = LoggerFactory.getLogger(ServiceDefUtil.class); + public static final String IMPLICIT_CONDITION_EXPRESSION_EVALUATOR = RangerScriptConditionEvaluator.class.getCanonicalName(); + public static final String IMPLICIT_CONDITION_EXPRESSION_NAME = "_expression"; + public static final String IMPLICIT_CONDITION_EXPRESSION_LABEL = "Enter boolean expression"; + public static final String IMPLICIT_CONDITION_EXPRESSION_DESC = "Boolean expression"; + private static final String USER_STORE_ENRICHER = RangerUserStoreEnricher.class.getCanonicalName(); + +public static final String ACCESS_TYPE_MARKER_CREATE = "_CREATE"; +public static final String ACCESS_TYPE_MARKER_READ = "_READ"; +public static final String ACCESS_TYPE_MARKER_UPDATE = "_UPDATE"; +public static final String ACCESS_TYPE_MARKER_DELETE = "_DELETE"; +public static final String ACCESS_TYPE_MARKER_MANAGE = "_MANAGE"; +public static final String ACCESS_TYPE_MARKER_ALL= "_ALL"; +public static final Set ACCESS_TYPE_MARKERS; + +static { +Set typeMarkers = new LinkedHashSet<>(); + +typeMarkers.add(ACCESS_TYPE_MARKER_CREATE); +typeMarkers.add(ACCESS_TYPE_MARKER_READ); +typeMarkers.add(ACCESS_TYPE_MARKER_UPDATE); +typeMarkers.add(ACCESS_TYPE_MARKER_DELETE); +typeMarkers.add(ACCESS_TYPE_MARKER_MANAGE); +typeMarkers.add(ACCESS_TYPE_MARKER_ALL); + +ACCESS_TYPE_MARKERS = Collections.unmodifiableSet(typeMarkers); +} + public static boolean getOption_enableDenyAndExceptionsInPolicies(RangerServiceDef serviceDef, RangerPluginContext pluginContext) { boolean ret = false; @@@ -615,76 -612,31 +638,101 @@@ return ret; } +public static List getMarkerAccessTypes(List accessTypeDefs) { +List ret = new ArrayList<>(); +Map> markerTypeGrants = getMarkerAccessTypeGrants(accessTypeDefs); +long maxItemId= getMaxItemId(accessTypeDefs); + +for (String accessTypeMarker : ACCESS_TYPE_MARKERS) { +RangerAccessTypeDef accessTypeDef = new RangerAccessTypeDef(++maxItemId, accessTypeMarker, accessTypeMarker, null, markerTypeGrants.get(accessTypeMarker)); + +ret.add(accessTypeDef); +} + +return ret; +} + + public static RangerPolicyConditionDef createImplicitExpressionConditionDef(Long itemId) { + RangerPolicyConditionDef ret = new RangerPolicyConditionDef(itemId, IMPLICIT_CONDITION_EXPRESSION_NAME, IMPLICIT_CONDITION_EXPRESSION_EVALUATOR, new HashMap<>()); + + ret.getEvaluatorOptions().put("ui.isMultiline", "true"); + ret.setLabel(IMPLICIT_CONDITION_EXPRESSION_LABEL); + ret.setDescription(IMPLICIT_CONDITION_EXPRESSION_DESC); + ret.setUiHint("{ \"isMultiline\":true }"); + + return ret; + } + +private static Map> getMarkerAccessTypeGrants(List accessTypeDefs) { +Map> ret = new HashMap<>(); + +for (String accessTypeMarker : ACCESS_TYPE_MARKERS) { +ret.put(accessTypeMarker, new HashSet<>()); +} + +if (CollectionUtils.isNotEmpty(accessTypeDefs)) { +for (RangerAccessTypeDef accessTypeDef : accessTypeDefs) { +if (accessTypeDef == null || StringUtils.isBlank(accessTypeDef.getName()) || ACCESS_TYPE_MARKERS.contains(accessTypeDef.getName())) { +continue; +} + +
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 21e56d955c4225f6cbe0675d60652b32ba41636a Merge: 4f36557f7 19dbc93e5 Author: Madhan Neethiraj AuthorDate: Fri Oct 20 08:00:00 2023 -0700 Merge branch 'master' into RANGER-3923 .../service/RangerSecurityZoneServiceService.java | 2 + .../src/views/SecurityZone/SecurityZoneForm.jsx| 268 +++-- .../src/views/SecurityZone/ZoneDisplay.jsx | 46 3 files changed, 293 insertions(+), 23 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 4f36557f79e09ff5d11422ad92cdec1bf35d9fe3 Merge: dfe0a32b4 f4db92475 Author: Madhan Neethiraj AuthorDate: Thu Oct 19 23:45:42 2023 -0700 Merge branch 'master' into RANGER-3923 .../ranger/plugin/util/RangerSecurityZoneHelper.java | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 dfe0a32b49b5a7fb61ff66f99e3e38b4f5cdc32e Merge: 8e8f25777 c49ed48d1 Author: Madhan Neethiraj AuthorDate: Wed Oct 18 23:34:37 2023 -0700 Merge branch 'master' into RANGER-3923 .../ranger/plugin/policyengine/PolicyEngine.java | 10 +++--- .../policyengine/RangerPolicyEngineImpl.java | 6 ++-- .../policyengine/RangerRequestScriptEvaluator.java | 12 .../service/RangerDefaultRequestProcessor.java | 4 +++ .../plugin/util/RangerAccessRequestUtil.java | 36 ++ .../apache/ranger/biz/RangerPolicyAdminImpl.java | 2 +- 6 files changed, 61 insertions(+), 9 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 8e8f257775ff19f6c8b802f7d2d668ef14f99f3e Merge: 93b6992c5 bef8c899e Author: Madhan Neethiraj AuthorDate: Wed Oct 18 22:45:34 2023 -0700 Merge branch 'master' into RANGER-3923 .../org/apache/ranger/common/RangerSearchUtil.java | 36 ++ .../org/apache/ranger/common/SearchCriteria.java | 6 + .../java/org/apache/ranger/common/SearchField.java | 2 +- .../java/org/apache/ranger/common/SearchUtil.java | 91 -- .../apache/ranger/common/TestRangerSearchUtil.java | 134 + 5 files changed, 206 insertions(+), 63 deletions(-) diff --cc security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java index 719d8a900,5ddc965a4..f8b7837c5 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
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 93b6992c51f57483c2562837d81fab6d4c66f7b4 Merge: 9d62eef59 0e7d63022 Author: Madhan Neethiraj AuthorDate: Tue Oct 17 15:51:56 2023 -0700 Merge branch 'master' into RANGER-3923 .../plugin/policyengine/RangerResourceTrie.java| 71 -- .../RangerPolicyResourceMatcher.java | 1 - 2 files changed, 39 insertions(+), 33 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 811c0ece1798c018067e9f2f3c5d4e0d7c2c8df6 Merge: 2038f9235 f1d9da40c Author: Madhan Neethiraj AuthorDate: Mon Oct 16 17:05:23 2023 -0700 Merge branch 'master' into RANGER-3923 .../plugin/contextenricher/RangerTagEnricher.java | 2 +- .../plugin/policyengine/PolicyEvaluatorForTag.java | 16 ++ .../policyengine/RangerPolicyEngineImpl.java | 44 +-- .../policyengine/RangerPolicyRepository.java | 11 +- .../RangerPolicyResourceMatcher.java | 45 +++ .../plugin/contextenricher/TestTagEnricher.java| 23 ++ .../plugin/policyengine/TestPolicyEngine.java | 7 + .../policyengine/resource_hierarchy_tags.json | 91 ++ .../test_aclprovider_resource_hierarchy_tags.json | 76 +++-- .../test_policyengine_resource_hierarchy_tags.json | 239 ...policy_globalsalespartners_row_filter_sr_sp.jpg | Bin 0 -> 461403 bytes ...-policy_globalsalespartners_row_filter_abac.jpg | Bin 0 -> 331255 bytes .../fig3-policy_tag_based_on_user_role.jpg | Bin 0 -> 294345 bytes .../fig4-policy_tag_policy_abac.jpg| Bin 0 -> 271364 bytes .../table_globalsalespartners.jpg | Bin 0 -> 213507 bytes .../site/resources/blogs/adventures_in_abac_2.html | 312 + docs/src/site/xdoc/blogs.xml | 10 + .../ozone/authorizer/RangerOzoneAuthorizer.java| 2 + 18 files changed, 751 insertions(+), 127 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 d5cb672d28252467460655110c640284a2fb6f11 Merge: 0a45ab730 b2b5c5bc7 Author: Madhan Neethiraj AuthorDate: Fri Oct 13 16:20:35 2023 -0700 Merge branch 'master' into RANGER-3923 .../model/validation/RangerServiceDefHelper.java | 54 +- .../ranger/plugin/policyengine/PolicyEngine.java | 19 +- .../policyengine/RangerPolicyEngineImpl.java | 48 - .../RangerDefaultPolicyEvaluator.java | 5 + .../policyevaluator/RangerPolicyEvaluator.java | 2 + .../ranger/plugin/policyengine/TestPolicyACLs.java | 7 + .../policyengine/resource_hierarchy_tags.json | 85 + .../test_aclprovider_resource_hierarchy_tags.json | 181 +++ intg/src/main/python/README.md | 140 ++- .../client/ranger_user_mgmt_client.py | 194 + .../python/apache_ranger/model/ranger_user_mgmt.py | 119 + intg/src/main/python/setup.py | 2 +- .../sample-client/src/main/python/user_mgmt.py | 137 +++ 13 files changed, 983 insertions(+), 10 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 f85975eb4314e07dfff807359ff369ec285cf026 Merge: 3b2fb766c db665595f Author: Madhan Neethiraj AuthorDate: Fri Oct 6 09:01:46 2023 -0700 Merge branch 'master' into RANGER-3923 .../src/main/java/org/apache/ranger/biz/ServiceDBStore.java | 5 - 1 file changed, 5 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 4c0e2a1e38dab6053016d8ab68d4ce81b8184987 Merge: 2a330bbfe c9a08e683 Author: Madhan Neethiraj AuthorDate: Thu Oct 5 23:27:16 2023 -0700 Merge branch 'master' into RANGER-3923 .../kafka/authorizer/RangerKafkaAuditHandler.java | 78 ++- .../service/RangerSecurityZoneServiceService.java | 37 +- .../main/resources/META-INF/jpa_named_queries.xml | 2 +- .../react-webapp/src/components/Editable.jsx | 10 +- .../webapp/react-webapp/src/images/no-service.svg | 4 + .../main/webapp/react-webapp/src/styles/style.css | 3 + .../AuditEvent/AdminLogs/SecurityZonelogs.jsx | 530 - .../src/views/AuditEvent/OperationAdminModal.jsx | 11 +- .../views/PolicyListing/PolicyPermissionItem.jsx | 30 +- .../src/views/SecurityZone/SecurityZoneForm.jsx| 126 +++-- .../src/views/SecurityZone/ZoneDisplay.jsx | 158 +++--- .../src/views/SecurityZone/ZoneListing.jsx | 2 +- .../views/ServiceManager/ServiceDefinitions.jsx| 60 ++- 13 files changed, 579 insertions(+), 472 deletions(-) diff --cc security-admin/src/main/webapp/react-webapp/src/styles/style.css index dd4a665aa,b29d23b12..dcd19f877 mode 100755,100644..100755 --- a/security-admin/src/main/webapp/react-webapp/src/styles/style.css +++ b/security-admin/src/main/webapp/react-webapp/src/styles/style.css
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 ff6f20d23a10a907203978850a804b1cbdf0118f Merge: 249b47083 b0ae138ce Author: Madhan Neethiraj AuthorDate: Wed Oct 4 09:36:05 2023 -0700 Merge branch 'master' into RANGER-3923 .../plugin/model/RangerSecurityZoneHeaderInfo.java | 7 + .../service-defs/ranger-servicedef-kafka.json | 2 +- .../org/apache/ranger/biz/SecurityZoneDBStore.java | 7 + .../org/apache/ranger/db/XXSecurityZoneDao.java| 23 +++ .../java/org/apache/ranger/rest/PublicAPIsv2.java | 16 ++ .../org/apache/ranger/rest/SecurityZoneREST.java | 27 .../main/resources/META-INF/jpa_named_queries.xml | 12 ++ .../main/webapp/react-webapp/src/views/Home.jsx| 13 +- .../views/PolicyListing/PolicyListingTabView.jsx | 169 ++--- .../views/PolicyListing/PolicyPermissionItem.jsx | 1 + .../views/PolicyListing/TagBasePermissionItem.jsx | 81 ++ .../src/views/SecurityZone/SecurityZoneForm.jsx| 2 +- .../src/views/ServiceManager/ImportPolicy.jsx | 27 +++- .../views/ServiceManager/ServiceDefinitions.jsx| 14 +- .../react-webapp/src/views/SideBar/TopNavBar.jsx | 6 - 15 files changed, 226 insertions(+), 181 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 dd226303a1966ddc93b0dfbd00730425d192aa5e Merge: e9f02a412 d30897b67 Author: Madhan Neethiraj AuthorDate: Mon Oct 2 02:32:14 2023 -0700 Merge branch 'master' into RANGER-3923
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 f80b8c148098aa647f3fc2d7c0841150e247d086 Merge: d5dc40c8c 00fd78a9b Author: Madhan Neethiraj AuthorDate: Wed Sep 27 21:40:36 2023 -0700 Merge branch 'master' into RANGER-3923 agents-common/dev-support/spotbugsIncludeFile.xml | 64 .../apache/ranger/plugin/model/RangerPolicy.java | 4 + .../ranger/plugin/policyengine/PolicyEngine.java | 44 + .../policyengine/RangerRequestScriptEvaluator.java | 25 +++-- .../plugin/policyengine/RangerResourceTrie.java| 12 ++- .../RangerAbstractPolicyItemEvaluator.java | 59 .../RangerAuditPolicyEvaluator.java| 2 +- .../RangerDefaultPolicyEvaluator.java | 25 - .../RangerDefaultPolicyItemEvaluator.java | 107 - .../RangerDefaultRowFilterPolicyItemEvaluator.java | 9 +- .../RangerOptimizedPolicyEvaluator.java| 106 ++-- .../policyevaluator/RangerPolicyEvaluator.java | 43 +++-- .../policyevaluator/RangerPolicyItemEvaluator.java | 1 + .../plugin/resourcematcher/ResourceMatcher.java| 4 + .../ranger/plugin/service/RangerBasePlugin.java| 91 +- .../apache/ranger/plugin/util/JavaScriptEdits.java | 77 +++ .../apache/ranger/plugin/util/PolicyRefresher.java | 66 +++-- .../plugin/util/RangerSecurityZoneHelper.java | 14 +-- .../apache/ranger/plugin/util/ServicePolicies.java | 72 ++ .../ranger/plugin/util/JavaScriptEditsTest.java| 45 + pom.xml| 2 +- .../java/org/apache/ranger/biz/ServiceDBStore.java | 7 +- .../ranger/common/RangerServicePoliciesCache.java | 44 + .../org/apache/ranger/service/XGroupService.java | 2 +- .../org/apache/ranger/service/XUserService.java| 2 +- .../react-webapp/src/components/Editable.jsx | 16 +-- .../react-webapp/src/components/XATableLayout.jsx | 9 +- .../main/webapp/react-webapp/src/styles/style.css | 3 +- .../main/webapp/react-webapp/src/utils/XAEnums.js | 13 +++ .../main/webapp/react-webapp/src/utils/fetchAPI.js | 2 +- .../src/views/AuditEvent/AdminLogs/UserLogs.jsx| 6 +- .../src/views/AuditEvent/PluginStatusLogs.jsx | 9 +- .../src/views/Encryption/KeyManager.jsx| 72 +++--- .../src/views/PermissionsModule/EditPermission.jsx | 61 +++- .../views/PolicyListing/AddUpdatePolicyForm.jsx| 2 +- .../src/views/SecurityZone/SecurityZoneForm.jsx| 74 -- .../src/views/ServiceManager/ServiceDefinition.jsx | 21 +++- .../src/views/ServiceManager/ServiceForm.jsx | 79 +++ .../views/ServiceManager/ServiceViewDetails.jsx| 23 - .../UserGroupRoleListing/SyncSourceDetails.jsx | 4 +- .../groups_details/GroupListing.jsx| 3 +- .../role_details/RoleListing.jsx | 8 +- .../users_details/UserFormComp.jsx | 26 ++--- .../users_details/UserListing.jsx | 3 +- 44 files changed, 956 insertions(+), 405 deletions(-) diff --cc agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAuditPolicyEvaluator.java index 96610e2eb,9051a8ce4..1d3a16ea0 --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAuditPolicyEvaluator.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAuditPolicyEvaluator.java @@@ -100,10 -100,10 +100,10 @@@ public class RangerAuditPolicyEvaluato } @Override -protected void preprocessPolicy(RangerPolicy policy, RangerServiceDef serviceDef) { -super.preprocessPolicy(policy, serviceDef); +protected void preprocessPolicy(RangerPolicy policy, RangerServiceDef serviceDef, RangerPolicyEngineOptions options) { +super.preprocessPolicy(policy, serviceDef, options); - Map> impliedAccessGrants = options.getServiceDefHelper().getImpliedAccessGrants(); + Map> impliedAccessGrants = PolicyEngine.getImpliedAccessGrants(serviceDef); if (impliedAccessGrants == null || impliedAccessGrants.isEmpty()) { return; diff --cc agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java index 821f34631,bf7ebe86a..3ea36322e --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java @@@ -1153,8 -1165,9 +1165,9 @@@ public class RangerDefaultPolicyEvaluat if(policy == null || (!hasAllow() && !hasDeny()) || serviceDef == null) { return; } + /* -
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 d5dc40c8cc52360b8f93b75b7a3badb8dba45f4a Merge: a13a01bce 9ad41a7ca Author: Madhan Neethiraj AuthorDate: Thu Sep 21 22:47:16 2023 -0700 Merge branch 'master' into RANGER-3923 .../ranger/plugin/model/RangerPluginInfo.java | 2 +- .../plugin/util/GraalScriptEngineCreator.java | 111 - .../plugin/util/RangerSecurityZoneHelper.java | 2 +- 3 files changed, 110 insertions(+), 5 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 c197a2daa46026c0d87861a8f66549bbd28cfe60 Merge: 0371f6663 d4972f7f3 Author: Madhan Neethiraj AuthorDate: Wed Sep 13 10:48:15 2023 -0700 Merge branch 'master' into RANGER-3923 .../ranger/plugin/errors/ValidationErrorCode.java | 1 + .../model/RangerPolicyResourceSignature.java | 20 +- .../ranger/plugin/model/RangerSecurityZone.java| 46 +- .../ranger/plugin/model/RangerSecurityZoneV2.java | 507 + .../validation/RangerSecurityZoneValidator.java| 15 + .../plugin/util/RangerSecurityZoneHelper.java | 399 .../RangerSecurityZoneValidatorTest.java | 33 ++ .../python/apache_ranger/client/ranger_client.py | 72 ++- .../main/python/apache_ranger/model/ranger_base.py | 45 +- .../python/apache_ranger/model/ranger_principal.py | 10 +- .../apache_ranger/model/ranger_security_zone.py| 105 - intg/src/main/python/setup.py | 2 +- .../kafka/authorizer/RangerKafkaAuditHandler.java | 62 ++- .../src/main/python/security_zone_v2.py| 149 ++ .../java/org/apache/ranger/rest/PublicAPIsv2.java | 63 +++ .../org/apache/ranger/rest/SecurityZoneREST.java | 140 +- 16 files changed, 1617 insertions(+), 52 deletions(-) diff --cc agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java index 787705c42,bcdc86779..bcdc86779 mode 100755,100644..100755 --- 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
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 c0ea1d988a36c3993ab1d92b93b69660613fa09a Merge: a370f46d2 4d9648ba7 Author: Madhan Neethiraj AuthorDate: Wed Sep 13 00:38:13 2023 -0700 Merge branch 'master' into RANGER-3923 agents-audit/pom.xml | 12 + .../apache/ranger/audit/queue/AuditBatchQueue.java | 49 +- .../audit/utils/AbstractRangerAuditWriter.java | 74 +- .../ranger/audit/utils/RangerJSONAuditWriter.java | 27 +- .../audit/utils/RangerJSONAuditWriterTest.java | 123 +++ .../hadoop/config/RangerPluginConfig.java | 29 + .../ranger/plugin/service/RangerAuthContext.java | 27 +- .../ranger/plugin/service/RangerBasePlugin.java| 13 +- .../service/RangerDefaultRequestProcessor.java | 97 +- .../ranger/plugin/util/RangerUserStoreUtil.java| 82 +- .../apache/ranger/plugin/util/ServiceDefUtil.java |2 + docs/src/site/resources/swagger-ui-bundle.js |3 +- .../site/resources/swagger-ui-es-bundle-core.js|3 +- docs/src/site/resources/swagger-ui-es-bundle.js|3 +- .../site/resources/swagger-ui-standalone-preset.js |3 +- docs/src/site/resources/swagger-ui.css |4 +- docs/src/site/resources/swagger-ui.js |3 +- docs/src/site/resources/swagger.html |1 - .../java/org/apache/ranger/biz/ServiceDBStore.java | 1028 ++-- .../java/org/apache/ranger/rest/ServiceREST.java | 49 +- .../react-webapp/src/components/Editable.jsx |8 +- .../src/views/AuditEvent/AccessLogs.jsx| 14 +- .../views/PolicyListing/AddUpdatePolicyForm.jsx| 94 +- .../views/PolicyListing/PolicyConditionsComp.jsx | 12 +- .../src/views/Reports/UserAccessLayout.jsx | 15 +- .../views/ServiceManager/ServiceAuditFilter.jsx|6 +- .../src/views/ServiceManager/ServiceForm.jsx | 11 +- 27 files changed, 1078 insertions(+), 714 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 569ff2f27a6f6b6bf40f6d3dc226955bad2316cb Merge: 2b307095a be31caf18 Author: Madhan Neethiraj AuthorDate: Fri Sep 1 20:56:32 2023 -0700 Merge branch 'master' into RANGER-3923 .../ranger/audit/provider/AuditWriterFactory.java | 2 +- .../org/apache/ranger/audit/utils/ORCFileUtil.java | 2 +- .../ranger/plugin/errors/ValidationErrorCode.java | 3 + .../model/validation/RangerPolicyValidator.java| 45 +++- .../ranger/plugin/util/RangerCommonConstants.java | 3 + .../ranger/services/atlas/RangerServiceAtlas.java | 4 +- .../handler/jwt/RangerDefaultJwtAuthHandler.java | 4 +- .../authz/handler/jwt/RangerJwtAuthHandler.java| 22 +- .../optimized/current/ranger_core_db_mysql.sql | 1 + .../optimized/current/ranger_core_db_oracle.sql| 1 + .../optimized/current/ranger_core_db_postgres.sql | 1 + .../current/ranger_core_db_sqlanywhere.sql | 2 + .../optimized/current/ranger_core_db_sqlserver.sql | 1 + .../java/org/apache/ranger/biz/ServiceDBStore.java | 101 + .../main/java/org/apache/ranger/db/XXGroupDao.java | 67 ++ .../main/java/org/apache/ranger/db/XXUserDao.java | 68 +- ...lServiceDefForPolicyConditionUpdate_J10060.java | 118 +++ .../ranger/patch/cliutil/ChangePasswordUtil.java | 57 -- .../java/org/apache/ranger/rest/ServiceREST.java | 16 ++ .../service/RangerServiceDefServiceBase.java | 2 +- .../apache/ranger/service/XGroupServiceBase.java | 18 +- .../apache/ranger/service/XUserServiceBase.java| 18 +- .../main/resources/META-INF/jpa_named_queries.xml | 14 ++ .../react-webapp/src/components/Editable.jsx | 7 - .../webapp/react-webapp/src/utils/XAMessages.js| 8 +- .../main/webapp/react-webapp/src/utils/XAUtils.js | 2 +- .../main/webapp/react-webapp/src/utils/appState.js | 3 + .../main/webapp/react-webapp/src/utils/fetchAPI.js | 6 +- .../src/views/AuditEvent/AccessLogDetail.jsx | 10 +- .../src/views/AuditEvent/AccessLogsTable.jsx | 8 +- .../src/views/AuditEvent/AdminLogs/PolicyLogs.jsx | 8 +- .../src/views/AuditEvent/AdminLogs/UserLogs.jsx| 6 +- .../src/views/Encryption/KeyManager.jsx| 79 +++ .../src/views/Reports/SearchPolicyTable.jsx| 31 ++- .../src/views/Reports/UserAccessLayout.jsx | 34 +-- .../src/views/SecurityZone/SecurityZoneForm.jsx| 4 +- .../src/views/ServiceManager/ServiceDefinition.jsx | 20 +- .../views/ServiceManager/ServiceViewDetails.jsx| 12 +- .../react-webapp/src/views/SideBar/SideBar.jsx | 32 ++- .../react-webapp/src/views/SideBar/SideBarBody.jsx | 1 + .../users_details/EditUserView.jsx | 51 +++-- .../users_details/UserFormComp.jsx | 10 +- .../users_details/UserListing.jsx | 2 +- .../webapp/react-webapp/src/views/UserProfile.jsx | 78 ++- .../org/apache/ranger/audit/TestAuditQueue.java| 227 - 45 files changed, 937 insertions(+), 272 deletions(-) diff --cc security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java index 215c0f03c,fc1968352..8af4448b5 mode 100755,100644..100755 --- a/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java +++ b/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java @@@ -21,10 -21,13 +21,15 @@@ package org.apache.ranger.db import javax.persistence.NoResultException; + import com.google.gson.Gson; + import com.google.gson.GsonBuilder; +import org.apache.commons.collections.ListUtils; + import org.apache.commons.lang3.StringUtils; + import org.apache.ranger.common.RangerCommonEnums; import org.apache.ranger.common.db.BaseDao; import org.apache.ranger.entity.XXUser; +import org.apache.ranger.plugin.model.RangerPrincipal; + import org.apache.ranger.plugin.model.UserInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@@ -125,36 -133,59 +135,92 @@@ public class XXUserDao extends BaseDao< return users; } + public List lookupPrincipalByName(String principalName, int startIndex, int pageSize) { + List ret = new ArrayList<>(); + + try { + List results = getEntityManager().createNamedQuery("VXXPrincipal.lookupByName", Object[].class) + .setParameter("principalName", principalName + "%") + .setFirstResult(startIndex) +
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 2b307095ac1ca02c47bae2231df7c20ffa447e73 Merge: 35943801d 2da8a1f55 Author: Madhan Neethiraj AuthorDate: Sun Aug 27 19:21:44 2023 -0700 Merge branch 'master' into RANGER-3923 .../main/java/org/apache/ranger/biz/AssetMgr.java | 93 -- .../ranger/service/RangerTransactionService.java | 57 - 2 files changed, 108 insertions(+), 42 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 35943801dc74f3452a6c32cf932530f1dcdf6cd8 Merge: 25162b842 b876ae715 Author: Madhan Neethiraj AuthorDate: Sat Aug 26 18:34:38 2023 -0700 Merge branch 'master' into RANGER-3923 agents-audit/pom.xml | 22 + .../ranger/audit/utils/RangerORCAuditWriter.java | 4 +- .../ranger/plugin/util/RangerPurgeResult.java | 88 .../service-defs/ranger-servicedef-abfs.json | 3 +- .../service-defs/ranger-servicedef-kafka.json | 4 +- .../service-defs/ranger-servicedef-knox.json | 4 +- .../service-defs/ranger-servicedef-ozone.json | 4 +- .../ranger-servicedef-schema-registry.json | 4 +- .../service-defs/ranger-servicedef-solr.json | 4 +- .../service-defs/ranger-servicedef-tag.json| 3 +- distro/src/main/assembly/hbase-agent.xml | 4 + distro/src/main/assembly/hdfs-agent.xml| 4 + distro/src/main/assembly/kms.xml | 4 + distro/src/main/assembly/knox-agent.xml| 4 + distro/src/main/assembly/plugin-atlas.xml | 4 + distro/src/main/assembly/plugin-elasticsearch.xml | 4 + distro/src/main/assembly/plugin-kafka.xml | 4 + distro/src/main/assembly/plugin-kms.xml| 4 + distro/src/main/assembly/plugin-kylin.xml | 4 + distro/src/main/assembly/plugin-ozone.xml | 4 + distro/src/main/assembly/plugin-presto.xml | 4 + distro/src/main/assembly/plugin-solr.xml | 4 + distro/src/main/assembly/plugin-sqoop.xml | 4 + distro/src/main/assembly/plugin-trino.xml | 4 + distro/src/main/assembly/plugin-yarn.xml | 4 + distro/src/main/assembly/storm-agent.xml | 4 + .../ranger/server/tomcat/EmbeddedServer.java | 13 + .../tomcat/EmbeddedServerMetricsCollector.java | 128 ++ .../main/java/org/apache/ranger/RangerClient.java | 14 + .../python/apache_ranger/client/ranger_client.py | 7 + .../java/org/apache/ranger/TestRangerClient.java | 14 + pom.xml| 1 + ranger-metrics/pom.xml | 19 + .../ranger/metrics/RangerMetricsSystemWrapper.java | 2 + .../source/RangerMetricsContainerSource.java | 99 .../source/TestRangerMetricsContainerSource.java | 108 + .../main/java/org/apache/ranger/biz/AssetMgr.java | 55 ++- .../java/org/apache/ranger/biz/ServiceDBStore.java | 110 +++-- .../RangerTransactionSynchronizationAdapter.java | 107 +++-- .../apache/ranger/db/XXPolicyExportAuditDao.java | 18 + .../java/org/apache/ranger/rest/PublicAPIsv2.java | 9 +- .../java/org/apache/ranger/rest/ServiceREST.java | 43 +- .../ranger/service/RangerPluginActivityLogger.java | 56 --- .../main/resources/META-INF/jpa_named_queries.xml | 5 + .../react-webapp/src/components/Editable.jsx | 502 + .../main/webapp/react-webapp/src/utils/XAUtils.js | 19 + .../AuditEvent/AdminLogs/PolicyViewDetails.jsx | 29 +- .../views/PolicyListing/AddUpdatePolicyForm.jsx| 75 ++- .../views/PolicyListing/PolicyConditionsComp.jsx | 194 .../views/PolicyListing/PolicyPermissionItem.jsx | 126 +++--- .../views/ServiceManager/ServiceAuditFilter.jsx| 3 +- .../src/views/ServiceManager/ServiceForm.jsx | 3 +- .../org/apache/ranger/rest/TestServiceREST.java| 4 - .../service/TestRangerPluginActivityLogger.java| 74 --- 54 files changed, 1375 insertions(+), 666 deletions(-) diff --cc security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java index cce7a2f64,8f1174ac4..6a0a24129 --- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java @@@ -72,7 -74,7 +74,8 @@@ import org.apache.ranger.db.XXTrxLogDao import org.apache.ranger.entity.XXTagChangeLog; import org.apache.ranger.plugin.model.RangerSecurityZone; import org.apache.ranger.plugin.util.RangerCommonConstants; +import org.apache.ranger.plugin.util.ServiceDefUtil; + import org.apache.ranger.plugin.util.RangerPurgeResult; import org.apache.ranger.plugin.util.ServiceTags; import org.apache.ranger.plugin.model.validation.RangerServiceDefValidator; import org.apache.ranger.plugin.model.validation.RangerValidator;
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 15643298e058cc38670323869226b1aff9610f3c Merge: 8fe7e5af3 fde454390 Author: Madhan Neethiraj AuthorDate: Tue Aug 22 22:48:05 2023 -0700 Merge branch 'master' into RANGER-3923 .../java/org/apache/ranger/biz/ServiceDBStore.java | 34 ++ .../org/apache/ranger/db/XXAuthSessionDao.java | 17 ++- .../java/org/apache/ranger/db/XXTrxLogDao.java | 12 .../java/org/apache/ranger/rest/ServiceREST.java | 8 +++-- .../main/resources/META-INF/jpa_named_queries.xml | 7 + .../main/resources/conf.dist/ranger-admin-site.xml | 9 ++ 6 files changed, 78 insertions(+), 9 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 bba84d1d74fb65bbe670f45f886928a7df4e2696 Merge: 75c6a 3d69ff979 Author: Madhan Neethiraj AuthorDate: Fri Aug 11 09:46:07 2023 -0700 Merge branch 'master' into RANGER-3923 .../plugin/contextenricher/RangerTagForEval.java | 5 - .../apache/ranger/plugin/model/AuditFilter.java| 5 - .../org/apache/ranger/plugin/model/GroupInfo.java | 5 - .../ranger/plugin/model/RangerBaseModelObject.java | 6 - .../apache/ranger/plugin/model/RangerMetrics.java | 6 - .../ranger/plugin/model/RangerPluginInfo.java | 5 - .../apache/ranger/plugin/model/RangerPolicy.java | 22 -- .../ranger/plugin/model/RangerPolicyDelta.java | 6 - .../org/apache/ranger/plugin/model/RangerRole.java | 7 - .../ranger/plugin/model/RangerSecurityZone.java| 7 - .../plugin/model/RangerSecurityZoneHeaderInfo.java | 6 - .../apache/ranger/plugin/model/RangerService.java | 6 - .../ranger/plugin/model/RangerServiceDef.java | 26 --- .../plugin/model/RangerServiceHeaderInfo.java | 6 - .../ranger/plugin/model/RangerServiceResource.java | 5 - .../ranger/plugin/model/RangerServiceTags.java | 5 - .../org/apache/ranger/plugin/model/RangerTag.java | 5 - .../apache/ranger/plugin/model/RangerTagDef.java | 8 - .../ranger/plugin/model/RangerTagResourceMap.java | 6 - .../plugin/model/RangerValidityRecurrence.java | 10 - .../plugin/model/RangerValiditySchedule.java | 7 - .../ranger/plugin/model/ServiceDeleteResponse.java | 6 - .../org/apache/ranger/plugin/model/UserInfo.java | 5 - .../plugin/policyengine/RangerResourceACLs.java| 9 - .../RangerAbstractResourceMatcher.java | 125 --- .../RangerDefaultResourceMatcher.java | 76 --- .../resourcematcher/RangerPathResourceMatcher.java | 239 +++-- .../resourcematcher/RangerResourceMatcher.java | 3 + .../resourcematcher/RangerURLResourceMatcher.java | 35 ++- .../plugin/resourcematcher/ResourceMatcher.java| 165 -- .../plugin/service/ResourceLookupContext.java | 6 - .../ranger/plugin/store/StoredServiceResource.java | 6 - .../ranger/plugin/util/GrantRevokeRequest.java | 6 - .../ranger/plugin/util/GrantRevokeRoleRequest.java | 5 - .../plugin/util/RangerRequestedResources.java | 6 - .../org/apache/ranger/plugin/util/RangerRoles.java | 5 - .../apache/ranger/plugin/util/RangerUserStore.java | 5 - .../apache/ranger/plugin/util/ServicePolicies.java | 12 -- .../org/apache/ranger/plugin/util/ServiceTags.java | 6 - .../RangerAbstractResourceMatcherTest.java | 9 + .../RangerDefaultResourceMatcherTest.java | 132 ++-- .../RangerPathResourceMatcherTest.java | 73 +++ .../RangerURLResourceMatcherTest.java | 73 +++ .../java/org/apache/ranger/entity/XXDBBase.java| 2 - .../org/apache/ranger/entity/XXRangerKeyStore.java | 2 - .../apache/ranger/entity/XXRangerMasterKey.java| 4 +- .../client/json/model/KMSSchedulerResponse.java| 12 -- .../client/json/model/YarnSchedulerResponse.java | 12 -- .../java/org/apache/ranger/common/view/VEnum.java | 3 - .../apache/ranger/common/view/VEnumElement.java| 3 - .../java/org/apache/ranger/common/view/VList.java | 2 - .../org/apache/ranger/common/view/VTrxLogAttr.java | 3 - .../apache/ranger/common/view/ViewBaseBean.java| 6 +- .../org/apache/ranger/entity/XXAccessAudit.java| 2 - .../apache/ranger/entity/XXAccessAuditBase.java| 2 - .../org/apache/ranger/entity/XXAccessAuditV4.java | 2 - .../org/apache/ranger/entity/XXAccessAuditV5.java | 2 - .../org/apache/ranger/entity/XXAccessTypeDef.java | 4 +- .../ranger/entity/XXAccessTypeDefGrants.java | 4 +- .../java/org/apache/ranger/entity/XXAsset.java | 2 - .../java/org/apache/ranger/entity/XXAuditMap.java | 2 - .../org/apache/ranger/entity/XXAuthSession.java| 2 - .../apache/ranger/entity/XXContextEnricherDef.java | 4 +- .../apache/ranger/entity/XXCredentialStore.java| 2 - .../java/org/apache/ranger/entity/XXDBBase.java| 2 - .../java/org/apache/ranger/entity/XXDataHist.java | 4 +- .../apache/ranger/entity/XXDataMaskTypeDef.java| 2 - .../java/org/apache/ranger/entity/XXEnumDef.java | 4 +- .../org/apache/ranger/entity/XXEnumElementDef.java | 4 +- .../org/apache/ranger/entity/XXGlobalState.java| 2 - .../apache/ranger/entity/XXGlobalStateBase.java| 2 - .../java/org/apache/ranger/entity/XXGroup.java | 2 - .../org/apache/ranger/entity/XXGroupGroup.java | 2 - .../apache/ranger/entity/XXGroupPermission.java| 5 +- .../java/org/apache/ranger/entity/XXGroupUser.java | 2 -
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 33ea44fa4437990e510f16515b3e2329082427ca Merge: bc978af49 9acade5ab Author: Madhan Neethiraj AuthorDate: Mon Jul 24 11:19:04 2023 -0700 Merge branch 'master' into RANGER-3923 .../resourcematcher/RangerPathResourceMatcher.java | 9 +++-- .../RangerPathResourceMatcherTest.java | 44 +- .../resourcematcher/test_resourcematcher_path.json | 4 +- distro/src/main/assembly/plugin-atlas.xml | 2 + .../java/org/apache/ranger/biz/RangerBizUtil.java | 10 + .../main/java/org/apache/ranger/biz/XUserMgr.java | 8 .../org/apache/ranger/common/RESTErrorUtil.java| 31 +++ .../main/java/org/apache/ranger/rest/RoleREST.java | 12 +++--- .../org/apache/ranger/rest/SecurityZoneREST.java | 5 ++- .../java/org/apache/ranger/rest/ServiceREST.java | 17 - .../security/context/RangerContextHolder.java | 12 ++ .../RangerSecurityContextFormationFilter.java | 11 +- .../main/webapp/react-webapp/src/utils/fetchAPI.js | 2 - .../src/views/AuditEvent/AdminLogs/PolicyLogs.jsx | 4 +- .../AuditEvent/AdminLogs/PolicyViewDetails.jsx | 10 ++--- .../views/PolicyListing/AddUpdatePolicyForm.jsx| 2 +- .../users_details/EditUserView.jsx | 2 +- 17 files changed, 119 insertions(+), 66 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 18208b1cbcf35c1af5b73c7e69ba87782127be83 Merge: 4ed78aae4 433a2ffa4 Author: Madhan Neethiraj AuthorDate: Wed Jul 12 21:43:44 2023 -0700 Merge branch 'master' into RANGER-3923 .../org/apache/ranger/plugin/model/RangerRole.java | 56 +++ distro/src/main/assembly/tagsync.xml | 7 + pom.xml| 3 +- .../java/org/apache/ranger/biz/RoleDBStore.java| 10 +- .../java/org/apache/ranger/biz/RoleRefUpdater.java | 30 +- .../java/org/apache/ranger/biz/ServiceDBStore.java | 66 +++- .../main/java/org/apache/ranger/rest/RoleREST.java | 308 +++- .../java/org/apache/ranger/rest/ServiceREST.java | 21 +- .../context/RangerPreAuthSecurityHandler.java | 11 + ...erPolicyList.java => RangerExportRoleList.java} | 40 +-- .../org/apache/ranger/view/RangerPolicyList.java | 4 + .../org/apache/ranger/view/RangerRoleList.java | 4 + .../java/org/apache/ranger/rest/TestRoleREST.java | 399 + .../org/apache/ranger/rest/TestServiceREST.java| 3 +- .../rest/importRole/import_role_test_file.json | 120 +++ tagsync/conf/templates/ranger-tagsync-template.xml | 58 +++ tagsync/pom.xml| 6 +- .../tagsync/ha/TagSyncHAInitializerImpl.java | 110 ++ .../ranger/tagsync/model/AbstractTagSource.java| 7 +- .../ranger/tagsync/process/TagSyncConfig.java | 17 +- .../tagsync/process/TagSyncMetricsProducer.java| 11 +- .../ranger/tagsync/process/TagSynchronizer.java| 9 + .../tagsync/sink/tagadmin/TagAdminRESTSink.java| 51 +-- .../tagsync/source/atlas/AtlasTagSource.java | 10 +- .../source/atlasrest/AtlasRESTTagSource.java | 23 +- .../ranger/tagsync/source/file/FileTagSource.java | 7 +- tagsync/src/main/resources/ranger-tagsync-site.xml | 58 ++- 27 files changed, 1330 insertions(+), 119 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 4ed78aae45ac8c0568840ad7082526d63e2b3547 Merge: 27a074c9a 593d15a3f Author: Madhan Neethiraj AuthorDate: Mon Jul 10 13:38:36 2023 -0700 Merge branch 'master' into RANGER-3923 .../org/apache/ranger/rest/ServiceRESTUtil.java| 57 ++ .../src/components/CommonComponents.jsx| 9 ++-- .../main/webapp/react-webapp/src/styles/style.css | 2 +- .../src/views/PolicyListing/PolicyListing.jsx | 15 +++--- .../react-webapp/src/views/SideBar/SideBarBody.jsx | 2 +- .../groups_details/GroupListing.jsx| 15 +++--- .../role_details/RoleListing.jsx | 12 +++-- .../users_details/UserListing.jsx | 15 +++--- 8 files changed, 90 insertions(+), 37 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 27a074c9a6d2020861daf05ef4af2f393f46c9db Merge: 3056b6cbb 7931a6141 Author: Madhan Neethiraj AuthorDate: Fri Jul 7 13:16:38 2023 -0700 Merge branch 'master' into RANGER-3923 distro/src/main/assembly/ranger-tools.xml | 6 + ranger-tools/conf/logback-mem-sizing.xml | 45 ++ ranger-tools/scripts/ranger-mem-sizing.sh | 46 ++ .../apache/ranger/sizing/PerfMemTimeTracker.java | 140 ++ .../org/apache/ranger/sizing/RangerMemSizing.java | 470 + ranger-tools/testdata/test_roles_hive.json | 235 +++ ranger-tools/testdata/test_userstore_hive.json | 69 +++ .../src/components/CommonComponents.jsx| 23 +- .../main/webapp/react-webapp/src/styles/style.css | 74 +++- .../main/webapp/react-webapp/src/utils/XAEnums.js | 9 + .../main/webapp/react-webapp/src/utils/XAUtils.js | 19 +- .../src/views/AuditEvent/AccessLogs.jsx| 177 +++- .../src/views/AuditEvent/AccessLogsTable.jsx | 41 +- .../AuditEvent/AdminLogs/PolicyViewDetails.jsx | 15 +- .../views/PolicyListing/AddUpdatePolicyForm.jsx| 9 +- .../src/views/PolicyListing/PolicyListing.jsx | 7 +- .../src/views/Reports/UserAccessLayout.jsx | 28 +- .../src/views/Resources/ResourceComp.jsx | 158 +-- .../src/views/Resources/ResourceSelectComp.jsx | 215 ++ .../src/views/SecurityZone/ZoneDisplay.jsx | 9 +- .../src/views/ServiceManager/ServiceDefinition.jsx | 5 +- .../src/views/ServiceManager/ServiceForm.jsx | 6 +- .../react-webapp/src/views/SideBar/SideBar.jsx | 6 +- .../react-webapp/src/views/SideBar/SideBarBody.jsx | 25 +- .../react-webapp/src/views/SideBar/TopNavBar.jsx | 5 +- .../webapp/scripts/modules/globalize/message/en.js | 3 + .../src/main/webapp/scripts/utils/XAViewUtils.js | 74 ++-- .../views/reports/AuditAccessLogDetailView.js | 7 +- .../reports/AuditAccessLogDetail_tmpl.html | 39 ++ 29 files changed, 1622 insertions(+), 343 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 c39468ce9e1edee516403e6c1bf5e19e78e0a1a6 Merge: dc338c184 433da0281 Author: Madhan Neethiraj AuthorDate: Fri Jun 23 15:59:44 2023 -0700 Merge branch 'master' into RANGER-3923 .../validation/RangerSecurityZoneValidator.java| 26 ++ .../plugin/store/SecurityZonePredicateUtil.java| 9 +- .../RangerSecurityZoneValidatorTest.java | 38 + pom.xml| 4 +- security-admin/pom.xml | 6 +- .../scripts/ranger-admin-site-template.xml | 10 +-- security-admin/scripts/upgrade_admin.py| 9 +- .../org/apache/ranger/db/RangerDaoManager.java | 6 -- .../org/apache/ranger/db/XXAccessAuditDao.java | 2 +- .../src/main/resources/META-INF/persistence.xml| 10 --- .../conf.dist/ranger-admin-default-site.xml| 18 ++-- .../main/webapp/META-INF/applicationContext.xml| 98 +++--- .../main/webapp/react-webapp/src/styles/style.css | 5 +- .../src/views/AuditEvent/AccessLogs.jsx| 2 +- .../react-webapp/src/views/CustomBreadcrumb.jsx| 10 ++- .../views/ServiceManager/ServiceDefinitions.jsx| 8 +- .../react-webapp/src/views/SideBar/TopNavBar.jsx | 8 +- .../groups_details/GroupListing.jsx| 32 --- .../role_details/RoleListing.jsx | 27 +++--- .../users_details/UserListing.jsx | 27 +++--- 20 files changed, 162 insertions(+), 193 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 c57bb9496eced901cdc54c948ec08273cba3cf92 Merge: 81955dd42 846213982 Author: Madhan Neethiraj AuthorDate: Tue Jun 20 10:04:19 2023 -0700 Merge branch 'master' into RANGER-3923 .../java/org/apache/ranger/biz/ServiceDBStore.java | 4 + .../org/apache/ranger/common/RangerSearchUtil.java | 7 ++ .../java/org/apache/ranger/rest/ServiceREST.java | 28 +-- .../src/main/webapp/react-webapp/src/App.jsx | 14 .../main/webapp/react-webapp/src/utils/XAEnums.js | 6 +- .../main/webapp/react-webapp/src/utils/XAUtils.js | 8 ++ .../main/webapp/react-webapp/src/utils/fetchAPI.js | 17 +++- .../webapp/react-webapp/src/views/ErrorPage.jsx| 13 ++- .../main/webapp/react-webapp/src/views/Layout.jsx | 37 ++-- .../src/views/PermissionsModule/EditPermission.jsx | 10 +-- .../views/PolicyListing/AddUpdatePolicyForm.jsx| 95 - .../views/PolicyListing/PolicyListingTabView.jsx | 13 +-- .../src/views/SecurityZone/SecurityZoneForm.jsx| 4 +- .../src/views/SecurityZone/ZoneListing.jsx | 4 +- .../views/ServiceManager/ServiceAuditFilter.jsx| 8 +- .../src/views/ServiceManager/ServiceForm.jsx | 98 -- .../groups_details/GroupForm.jsx | 4 +- .../UserGroupRoleListing/role_details/RoleForm.jsx | 2 +- .../users_details/EditUserView.jsx | 2 +- .../scripts/model_bases/RangerServiceDefBase.js| 2 +- .../main/webapp/scripts/models/RangerServiceDef.js | 5 +- .../webapp/scripts/modules/globalize/message/en.js | 3 +- .../src/main/webapp/scripts/utils/XAUtils.js | 6 ++ .../main/webapp/scripts/views/common/ErrorView.js | 3 + .../webapp/scripts/views/service/ServiceCreate.js | 3 + 25 files changed, 267 insertions(+), 129 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 037659771bc8c1df8364de6546b13a3c25649c5d Merge: 0fbc8b383 0e80fc804 Author: Madhan Neethiraj AuthorDate: Fri Jun 16 15:19:15 2023 -0700 Merge branch 'master' into RANGER-3923 .../validation/RangerSecurityZoneValidator.java| 369 + .../validation/RangerZoneResourceMatcher.java | 10 +- .../ranger/plugin/policyengine/PolicyEngine.java | 4 +- .../plugin/policyengine/RangerResourceTrie.java| 4 +- .../ranger/plugin/service/RangerBasePlugin.java| 12 +- .../plugin/store/SecurityZonePredicateUtil.java| 33 +- .../apache/ranger/plugin/store/ServiceStore.java | 2 +- .../apache/ranger/plugin/util/PolicyRefresher.java | 36 +- .../apache/ranger/plugin/util/SearchFilter.java| 1 + .../RangerSecurityZoneValidatorTest.java | 112 ++- .../hive/authorizer/RangerHiveAuditHandler.java| 6 +- intg/src/main/python/README.md | 2 +- intg/src/main/python/setup.py | 2 +- pom.xml| 4 +- .../solr_for_audit_setup/conf/admin-extra.html | 24 -- .../conf/admin-extra.menu-bottom.html | 25 -- .../conf/admin-extra.menu-top.html | 25 -- .../contrib/solr_for_audit_setup/conf/elevate.xml | 38 --- .../optimized/current/ranger_core_db_mysql.sql | 2 +- ...-table.sql => 066-create-sz-role-ref-table.sql} | 0 .../optimized/current/ranger_core_db_oracle.sql| 2 +- ...-table.sql => 066-create-sz-ref-role-table.sql} | 0 .../optimized/current/ranger_core_db_postgres.sql | 2 +- ...-table.sql => 066-create-sz-ref-role-table.sql} | 0 .../current/ranger_core_db_sqlanywhere.sql | 2 +- ...-table.sql => 066-create-sz-ref-role-table.sql} | 0 .../optimized/current/ranger_core_db_sqlserver.sql | 2 +- ...-table.sql => 066-create-sz-ref-role-table.sql} | 0 .../java/org/apache/ranger/biz/ServiceDBStore.java | 23 +- .../java/org/apache/ranger/biz/ServiceMgr.java | 7 +- .../ranger/common/RangerServicePoliciesCache.java | 131 ++-- .../org/apache/ranger/db/XXPolicyChangeLogDao.java | 6 +- .../main/resources/META-INF/jpa_named_queries.xml | 11 +- .../main/webapp/react-webapp/src/styles/style.css | 45 ++- .../src/views/Reports/UserAccessLayout.jsx | 16 + .../src/views/SideBar/ResourceTagContent.jsx | 73 ++-- .../react-webapp/src/views/SideBar/SideBar.jsx | 7 +- .../react-webapp/src/views/SideBar/SideBarBody.jsx | 150 + .../react-webapp/src/views/SideBar/TopNavBar.jsx | 91 ++--- 39 files changed, 720 insertions(+), 559 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 ebcdc7f4d73672b0e4ade6fbfb69860937f7e2b0 Merge: 91654d2c1 338f26473 Author: Madhan Neethiraj AuthorDate: Tue Jun 6 07:29:52 2023 -0700 Merge branch 'master' into RANGER-3923 .../RangerServiceResourceMatcher.java | 5 +- .../plugin/contextenricher/RangerTagEnricher.java | 7 +- .../plugin/policyengine/RangerAccessRequest.java | 13 +- .../policyengine/RangerAccessRequestImpl.java | 11 + .../policyengine/RangerAccessRequestReadOnly.java | 3 + .../policyengine/RangerAccessRequestWrapper.java | 3 + .../policyengine/RangerPolicyEngineImpl.java | 4 +- .../policyengine/RangerPolicyRepository.java | 2 +- .../plugin/policyengine/RangerResourceTrie.java| 88 ++- .../RangerAuditPolicyEvaluator.java| 2 +- .../RangerDefaultPolicyEvaluator.java | 8 +- .../RangerDefaultPolicyResourceMatcher.java| 39 +- .../RangerPolicyResourceMatcher.java | 11 + .../RangerAbstractResourceMatcher.java | 69 ++- .../RangerDefaultResourceMatcher.java | 20 +- .../resourcematcher/RangerPathResourceMatcher.java | 215 --- .../resourcematcher/RangerResourceMatcher.java | 3 +- .../resourcematcher/RangerURLResourceMatcher.java | 20 +- .../plugin/resourcematcher/ResourceMatcher.java| 53 +- .../util/RangerResourceEvaluatorsRetriever.java| 12 +- .../plugin/policyengine/TestPathResourceTrie.java | 22 +- .../plugin/policyengine/TestPolicyEngine.java | 14 + .../RangerAbstractResourceMatcherTest.java | 3 +- .../RangerDefaultResourceMatcherTest.java | 3 +- .../RangerPathResourceMatcherTest.java | 7 +- .../RangerURLResourceMatcherTest.java | 3 +- .../resourcematcher/TestResourceMatcher.java | 3 +- .../test/resources/policyengine/aws_s3_tags.json | 33 + .../policyengine/test_policyengine_aws.json| 24 +- .../policyengine/test_policyengine_aws_s3.json | 211 +++ .../policyengine/test_policyengine_kafka.json | 157 + pom.xml| 7 +- .../src/main/webapp/react-webapp/package-lock.json | 57 +- .../src/main/webapp/react-webapp/package.json | 2 +- .../src/main/webapp/react-webapp/src/App.jsx | 40 +- .../src/components/CommonComponents.jsx| 42 +- .../react-webapp/src/components/XATableLayout.jsx | 105 ++-- .../main/webapp/react-webapp/src/images/close.svg | 3 + .../react-webapp/src/images/sidebar/account.svg| 3 + .../react-webapp/src/images/sidebar/audits.svg | 3 + .../react-webapp/src/images/sidebar/chevron.svg| 1 + .../react-webapp/src/images/sidebar/dropdown.svg | 10 + .../webapp/react-webapp/src/images/sidebar/key.svg | 3 + .../react-webapp/src/images/sidebar/pipe.svg | 3 + .../react-webapp/src/images/sidebar/ranger.svg | 12 + .../react-webapp/src/images/sidebar/reports.svg| 3 + .../react-webapp/src/images/sidebar/settings.svg | 3 + .../react-webapp/src/images/sidebar/tags.svg | 3 + .../react-webapp/src/images/sidebar/zone.svg | 3 + .../src/main/webapp/react-webapp/src/index.jsx | 4 +- .../main/webapp/react-webapp/src/styles/style.css | 687 +++-- .../main/webapp/react-webapp/src/utils/XAUtils.js | 15 +- .../main/webapp/react-webapp/src/utils/appState.js | 12 +- .../src/views/AuditEvent/AccessLogDetail.jsx | 6 +- .../AuditEvent/AdminLogs/PolicyViewDetails.jsx | 11 +- .../src/views/AuditEvent/AdminModal.jsx| 2 +- .../src/views/AuditEvent/AuditLayout.jsx | 4 +- .../src/views/AuditEvent/OperationAdminModal.jsx | 2 +- .../react-webapp/src/views/CustomBreadcrumb.jsx| 86 +-- .../src/views/Encryption/KeyCreate.jsx | 7 +- .../src/views/Encryption/KeyManager.jsx| 7 +- .../main/webapp/react-webapp/src/views/Home.jsx| 117 +++- .../main/webapp/react-webapp/src/views/Layout.jsx | 69 ++- .../src/views/PermissionsModule/EditPermission.jsx | 28 +- .../src/views/PermissionsModule/Permissions.jsx| 7 +- .../views/PolicyListing/AddUpdatePolicyForm.jsx| 335 +- .../views/PolicyListing/PolicyConditionsComp.jsx | 8 +- .../src/views/PolicyListing/PolicyListing.jsx | 17 +- .../views/PolicyListing/PolicyListingTabView.jsx | 418 + .../views/PolicyListing/PolicyPermissionItem.jsx | 98 ++- .../views/PolicyListing/TagBasePermissionItem.jsx | 33 +- .../src/views/Reports/SearchPolicyTable.jsx| 331 ++ .../src/views/Reports/UserAccessLayout.jsx | 14 +- .../src/views/SecurityZone/SecurityZoneForm.jsx| 28 +- .../src/views/SecurityZone/ZoneDisplay.jsx | 7 +-
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 91654d2c1f3a77ab3cca25a3454494eb82313584 Merge: a58595da7 883c232b0 Author: Madhan Neethiraj AuthorDate: Mon Jun 5 14:10:48 2023 -0700 Merge branch 'master' into RANGER-3923 dev-support/ranger-docker/.env | 5 + dev-support/ranger-docker/Dockerfile.ranger-base | 2 +- dev-support/ranger-docker/Dockerfile.ranger-usersync | 3 --- dev-support/ranger-docker/docker-compose.ranger-tagsync.yml | 1 + dev-support/ranger-docker/docker-compose.ranger-usersync.yml | 1 + dev-support/ranger-docker/docker-compose.ranger.yml | 1 + security-admin/scripts/setup.sh | 8 .../src/main/java/org/apache/ranger/rest/RoleREST.java | 12 +++- tagsync/scripts/setup.sh | 7 +++ unixauthservice/scripts/setup.sh | 7 +++ 10 files changed, 38 insertions(+), 9 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 a58595da7737401d26f9dd31bd873231b7622d35 Merge: 066948660 24a746b7f Author: Madhan Neethiraj AuthorDate: Wed May 31 10:28:54 2023 -0700 Merge branch 'master' into RANGER-3923 dev-support/ranger-docker/.env |2 +- .../docker-compose.ranger-postgres-mounted.yml | 23 + docs/src/site/resources/css/custom.css | 110 ++ ranger_in_docker | 28 +- .../java/org/apache/ranger/rest/MetricsREST.java | 10 +- .../org/apache/ranger/util/RangerMetricsUtil.java | 17 +- .../main/webapp/scripts/controllers/Controller.js |9 +- .../src/main/webapp/scripts/utils/XAGlobals.js |2 + .../scripts/views/policies/RangerPolicyCreate.js |2 + .../scripts/views/policymanager/ServiceLayout.js |4 +- .../views/policymanager/ServiceLayoutSidebar.js|3 +- .../webapp/scripts/views/reports/AuditLayout.js|3 +- .../scripts/views/reports/UserAccessLayout.js |1 + .../java/org/apache/ranger/biz/TestTagDBStore.java | 1187 .../org/apache/ranger/rest/TestMetricsREST.java| 87 ++ .../apache/ranger/util/TestRangerMetricsUtil.java | 51 + 16 files changed, 1510 insertions(+), 29 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 06694866098bc0b14cf800a9e167ab4e866a0113 Merge: f7a8dabb7 4c68c8549 Author: Madhan Neethiraj AuthorDate: Mon May 29 23:16:34 2023 -0700 Merge branch 'master' into RANGER-3923 .../RangerDefaultPolicyEvaluator.java | 31 +- .../apache/ranger/plugin/util/ServiceDefUtil.java | 16 + .../ranger/plugin/util/ServiceDefUtilTest.java | 28 + .../server/tomcat/SolrCollectionBootstrapper.java |8 + pom.xml|6 +- ...n-x_rms_service_resource-resource_signature.sql |3 +- .../main/java/org/apache/ranger/biz/XUserMgr.java | 14 +- .../org/apache/ranger/db/XXAuthSessionDao.java | 13 + .../java/org/apache/ranger/rest/PublicAPIsv2.java |8 + .../org/apache/ranger/rest/SecurityZoneREST.java | 18 + .../main/resources/META-INF/jpa_named_queries.xml |8 + .../src/main/webapp/react-webapp/src/App.jsx |1 + .../src/components/CommonComponents.jsx| 12 +- .../react-webapp/src/components/XATableLayout.jsx |6 +- .../structured-filter/react-datepicker/calendar.js | 33 + .../react-datepicker/date_input.js |6 +- .../react-datepicker/datepicker.js |4 + .../react-typeahead/tokenizer/index.js | 114 +- .../react-typeahead/tokenizer/token.js | 75 +- .../react-typeahead/typeahead/index.js | 65 +- .../webapp/react-webapp/src/hooks/usePrompt.js |1 - .../main/webapp/react-webapp/src/styles/style.css | 325 +-- .../main/webapp/react-webapp/src/utils/XAEnums.js | 69 +- .../main/webapp/react-webapp/src/utils/XAUtils.js | 109 +- .../src/views/AuditEvent/AccessLogs.jsx| 46 +- .../src/views/AuditEvent/AccessLogsTable.jsx |2 +- .../src/views/AuditEvent/AdminLogs.jsx | 30 +- .../src/views/AuditEvent/AdminLogs/PolicyLogs.jsx | 2430 ++-- .../AuditEvent/AdminLogs/SecurityZonelogs.jsx | 236 +- .../src/views/AuditEvent/LoginSessionsLogs.jsx | 30 +- .../src/views/AuditEvent/PluginStatusLogs.jsx | 31 +- .../src/views/AuditEvent/PluginsLog.jsx| 30 +- .../react-webapp/src/views/AuditEvent/UserSync.jsx | 36 +- .../src/views/Encryption/KeyManager.jsx| 29 +- .../webapp/react-webapp/src/views/ErrorPage.jsx| 21 +- .../main/webapp/react-webapp/src/views/Header.jsx | 62 +- .../main/webapp/react-webapp/src/views/Layout.jsx | 42 +- .../src/views/PermissionsModule/Permissions.jsx| 35 +- .../src/views/PolicyListing/PolicyListing.jsx | 75 +- .../src/views/Reports/SearchPolicyTable.jsx|4 +- .../src/views/ServiceManager/ServiceDefinition.jsx |4 + .../src/views/ServiceManager/ServiceForm.jsx |8 +- .../groups_details/GroupListing.jsx| 37 +- .../UserGroupRoleListing/role_details/RoleForm.jsx | 10 +- .../role_details/RoleListing.jsx | 42 +- .../users_details/UserListing.jsx | 60 +- .../java/org/apache/ranger/biz/TestXUserMgr.java |4 - 47 files changed, 2229 insertions(+), 2048 deletions(-) diff --cc agents-common/src/test/java/org/apache/ranger/plugin/util/ServiceDefUtilTest.java index 147cdaf2b,03aebb220..36f0b6af6 --- a/agents-common/src/test/java/org/apache/ranger/plugin/util/ServiceDefUtilTest.java +++ b/agents-common/src/test/java/org/apache/ranger/plugin/util/ServiceDefUtilTest.java @@@ -274,131 -253,34 +274,159 @@@ public class ServiceDefUtilTest } @Test + public void testNormalizeAccessTypeDefs() throws Exception { + try (InputStream inStream = this.getClass().getResourceAsStream("/test_servicedef-normalize.json")) { + InputStreamReader reader = new InputStreamReader(inStream); + ServicePolicies policies = gsonBuilder.fromJson(reader, ServicePolicies.class); + + RangerAccessTypeDef serviceMarkerAll = getAccessType(policies.getServiceDef().getMarkerAccessTypes(), ACCESS_TYPE_MARKER_ALL); + RangerAccessTypeDef tagMarkerAll = getAccessType(policies.getTagPolicies().getServiceDef().getMarkerAccessTypes(), ACCESS_TYPE_MARKER_ALL); + + assertNotEquals("accessType count", policies.getServiceDef().getAccessTypes().size(), policies.getTagPolicies().getServiceDef().getAccessTypes().size()); + assertNotEquals("impliedGrants: _ALL", new HashSet<>(serviceMarkerAll.getImpliedGrants()), new HashSet<>(tagMarkerAll.getImpliedGrants())); + assertNotEquals("dataMask.accessType count", policies.getServiceDef().getDataMaskDef().getAccessTypes().size(),
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 f7a8dabb7927ff08ec71b137b39518ac73fa3567 Merge: 56d559ed4 576cb642a Author: Madhan Neethiraj AuthorDate: Mon May 15 14:18:08 2023 -0700 Merge branch 'master' into RANGER-3923 README.md | 4 +- distro/src/main/assembly/admin-web.xml | 2 +- docs/src/site/resources/blogs/policy_model.html| 634 + docs/src/site/xdoc/blogs.xml | 28 +- plugin-ozone/pom.xml | 9 + pom.xml| 18 +- ranger-ozone-plugin-shim/pom.xml | 9 + .../apache/ranger/biz/SecurityZoneRefUpdater.java | 20 +- .../java/org/apache/ranger/rest/ServiceREST.java | 2 +- .../org/apache/ranger/biz/TestServiceDBStore.java | 2 +- 10 files changed, 700 insertions(+), 28 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 51ec55c8c66eb48927a43a60e5e84739965779b7 Merge: 1713b11cc 9f1dc5b4a Author: Madhan Neethiraj AuthorDate: Thu May 4 19:54:08 2023 -0700 Merge branch 'master' into RANGER-3923 .../ranger/plugin/util/RangerMetricsUtil.java | 13 +- .../ranger-docker/Dockerfile.ranger-usersync | 4 + dev-support/ranger-docker/README.md| 5 +- .../docker-compose.ranger-usersync.yml | 1 + .../ranger-docker/scripts/ugsync-file-source.csv | 10 + distro/src/main/assembly/usersync.xml | 6 + docs/pom.xml | 419 + docs/src/site/resources/background_design.png | Bin 0 -> 23454 bytes docs/src/site/resources/css/custom.css | 176 + docs/src/site/resources/override-banner.js | 15 + docs/src/site/resources/ranger-logo.svg| 17 + docs/src/site/resources/smooth-scroll.js | 18 + docs/src/site/site.xml | 153 +--- .../java/org/apache/ranger/biz/RangerBizUtil.java | 28 +- .../java/org/apache/ranger/biz/ServiceDBStore.java | 32 +- .../org/apache/ranger/common/RangerRoleCache.java | 8 +- .../ranger/common/RangerServicePoliciesCache.java | 5 + .../ranger/common/RangerServiceTagsCache.java | 4 + .../apache/ranger/common/RangerUserStoreCache.java | 4 +- .../org/apache/ranger/biz/TestServiceDBStore.java | 71 +++- ugsync/pom.xml | 13 + .../unixusersync/config/UserGroupSyncConfig.java | 22 ++ .../unixusersync/ha/UserSyncHAInitializerImpl.java | 110 ++ .../process/PolicyMgrUserGroupBuilder.java | 26 +- .../apache/ranger/usergroupsync/UserGroupSync.java | 56 +-- .../usergroupsync/UserSyncMetricsProducer.java | 10 + unixauthservice/scripts/setup.sh | 8 + .../scripts/templates/ranger-ugsync-template.xml | 58 +++ .../authentication/UnixAuthenticationService.java | 7 + 29 files changed, 1099 insertions(+), 200 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 1713b11cc85d6ea692e3e3d498a672db6818cd9c Merge: 01ced14fc 18c53d5d1 Author: Madhan Neethiraj AuthorDate: Mon May 1 23:10:02 2023 -0700 Merge branch 'master' into RANGER-3923 .github/pull_request_template.md | 11 + .gitignore | 1 + .../plugin/contextenricher/RangerTagEnricher.java | 64 ++- .../ranger/plugin/model/RangerPolicyDelta.java | 2 +- .../ranger/plugin/policyengine/PolicyEngine.java | 14 +- .../RangerDefaultDataMaskPolicyItemEvaluator.java | 6 - .../RangerDefaultPolicyEvaluator.java | 4 +- .../RangerDefaultRowFilterPolicyItemEvaluator.java | 19 +- .../ranger/plugin/service/RangerBaseService.java | 14 +- .../ranger/plugin/util/RangerPolicyDeltaUtil.java | 2 +- .../org/apache/ranger/plugin/util/ServiceTags.java | 3 + credentialbuilder/pom.xml | 10 + dev-support/ranger-docker/.env | 13 + dev-support/ranger-docker/Dockerfile.ranger| 5 + dev-support/ranger-docker/Dockerfile.ranger-base | 6 +- dev-support/ranger-docker/Dockerfile.ranger-build | 5 + .../ranger-docker/docker-compose.ranger-base.yml | 1 + .../ranger-docker/docker-compose.ranger-build.yml | 2 + .../ranger-docker/docker-compose.ranger.yml| 1 + distro/src/main/assembly/kms.xml | 7 + docs/pom.xml | 217 +- .../fig01-policy_ussales_rib.jpg | Bin 0 -> 285015 bytes .../fig02-policy_globalsales_highly_sensitive.jpg | Bin 0 -> 271338 bytes .../fig03-policy_globalsales_sensitive.jpg | Bin 0 -> 260322 bytes .../fig04-policy_globalsales_non_sensitive.jpg | Bin 0 -> 278120 bytes ...-policy_globalsales_row_filter_sales_region.jpg | Bin 0 -> 294414 bytes .../fig06-roles_capturing_sl_sr.jpg| Bin 0 -> 232289 bytes .../fig07-policy_ussales_tag_attribute_based.jpg | Bin 0 -> 273108 bytes .../fig08-policy_tag_based_sl.jpg | Bin 0 -> 278600 bytes ...ig09-policy_globalsales_row_filter_sr_roles.jpg | Bin 0 -> 277497 bytes .../fig10-roles_capturing_sl_sr_sp.jpg | Bin 0 -> 261623 bytes ...policy_globalsalespartners_row_filter_sr_sp.jpg | Bin 0 -> 461403 bytes .../table_globalsales.jpg | Bin 0 -> 196162 bytes .../table_globalsalespartners.jpg | Bin 0 -> 213507 bytes .../adventures_in_abac_1.files/table_ussales.jpg | Bin 0 -> 125498 bytes .../site/resources/blogs/adventures_in_abac_1.html | 437 + docs/src/site/site.xml | 2 + docs/src/site/xdoc/blogs.xml | 34 ++ docs/src/site/xdoc/download.xml| 30 +- docs/src/site/xdoc/quick_start_guide.xml | 14 +- embeddedwebserver/scripts/ranger-admin-services.sh | 6 +- hbase-agent/pom.xml| 13 + hive-agent/pom.xml | 15 + .../main/java/org/apache/ranger/RangerClient.java | 6 + .../python/apache_ranger/client/ranger_client.py | 35 +- intg/src/main/python/apache_ranger/utils.py| 13 +- .../java/org/apache/ranger/TestRangerClient.java | 29 ++ kms/pom.xml| 5 + .../apache/hadoop/crypto/key/kms/server/KMS.java | 76 +++- .../key/kms/server/KMSAuthenticationFilter.java| 3 + .../hadoop/crypto/key/kms/server/KMSWebApp.java| 29 +- .../hadoop/crypto/key/kms/server/MetricREST.java | 81 .../ranger/kms/metrics/KMSMetricWrapper.java | 115 ++ .../org/apache/ranger/kms/metrics/KMSMetrics.java | 100 + .../kms/metrics/collector/KMSMetricsCollector.java | 95 + .../ranger/kms/metrics/source/KMSMetricSource.java | 112 ++ kms/src/main/resources/hadoop-metrics2.properties | 54 +++ .../ranger/kms/metrics/TestKMSMetricsWrapper.java | 89 + kms/src/test/resources/hadoop-metrics2.properties | 54 +++ pom.xml| 28 +- ranger-common-ha/pom.xml | 124 ++ .../org/apache/ranger/RangerHAInitializer.java | 62 +++ .../ranger/ha/ActiveInstanceElectorService.java| 187 + .../org/apache/ranger/ha/ActiveInstanceState.java | 124 ++ .../apache/ranger/ha/ActiveStateChangeHandler.java | 53 +++ .../java/org/apache/ranger/ha/CuratorFactory.java | 211 ++ .../java/org/apache/ranger/ha/HAConfiguration.java | 269 + .../ranger/ha/RangerServiceServerIdSelector.java | 91 + .../java/org/apache/ranger/ha/ServiceState.java| 113 ++ .../ranger/ha/ZookeeperSecurityProperties.java | 80 .../org/apache/ranger/ha/annotation/HAService.java | 22 +-
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 429e22ade7ae98cdc532f29c3a98213c6920ee35 Merge: 0178b002e 0165fbd52 Author: Madhan Neethiraj AuthorDate: Sun Apr 9 15:17:05 2023 -0700 Merge branch 'master' into RANGER-3923 dev-support/ranger-docker/.env |7 + dev-support/ranger-docker/Dockerfile.ranger-base |4 +- dev-support/ranger-docker/Dockerfile.ranger-mysql |3 +- .../ranger-docker/Dockerfile.ranger-postgres |3 +- dev-support/ranger-docker/Dockerfile.ranger-solr |3 +- dev-support/ranger-docker/Dockerfile.ranger-zk |3 +- .../ranger-docker/docker-compose.ranger-base.yml |2 + .../ranger-docker/docker-compose.ranger-mysql.yml |2 + .../docker-compose.ranger-postgres.yml |2 + .../ranger-docker/docker-compose.ranger.yml|4 + docs/pom.xml |4 + plugin-kafka/pom.xml |1 + .../authorizer/KafkaRangerAuthorizerTest.java | 15 +- pom.xml|2 +- .../src/main/webapp/react-webapp/README.md |7 + .../src/main/webapp/react-webapp/package-lock.json | 3445 ++-- .../src/main/webapp/react-webapp/package.json | 37 +- .../structured-filter/react-datepicker/popover.js | 18 +- .../src/main/webapp/react-webapp/src/index.jsx | 11 +- .../src/views/AuditEvent/AccessLogDetail.jsx |4 +- .../src/views/AuditEvent/AccessLogs.jsx| 18 +- .../AuditEvent/AdminLogs/PolicyViewDetails.jsx | 153 +- .../views/PolicyListing/AddUpdatePolicyForm.jsx| 234 +- .../views/PolicyListing/TagBasePermissionItem.jsx | 108 +- .../src/views/Reports/SearchPolicyTable.jsx| 107 +- .../src/views/Resources/ResourceComp.jsx | 68 +- .../src/views/SecurityZone/SecurityZoneForm.jsx|2 +- 27 files changed, 2242 insertions(+), 2025 deletions(-)
[ranger] 01/01: Merge branch 'master' into RANGER-3923
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 0178b002e6e9743b8ee5f4d5760fcf720b2dddca Merge: f338a0dc0 cdc873177 Author: Madhan Neethiraj AuthorDate: Sun Apr 2 08:34:52 2023 -0700 Merge branch 'master' into RANGER-3923 .../react-webapp/src/components/Editable.jsx | 136 ++--- .../react-webapp/src/components/XATableLayout.jsx | 88 ++--- .../react-typeahead/typeahead/index.js | 2 - .../main/webapp/react-webapp/src/styles/style.css | 13 +- .../main/webapp/react-webapp/src/utils/XAEnums.js | 54 .../main/webapp/react-webapp/src/utils/XAUtils.js | 15 --- .../src/views/AuditEvent/AccessLogs.jsx| 6 +- .../src/views/AuditEvent/AdminLogs.jsx | 10 +- .../src/views/AuditEvent/LoginSessionsLogs.jsx | 10 +- .../src/views/AuditEvent/PluginStatusLogs.jsx | 11 +- .../src/views/AuditEvent/PluginsLog.jsx| 10 +- .../react-webapp/src/views/AuditEvent/UserSync.jsx | 11 +- .../src/views/Encryption/KeyManager.jsx| 13 +- .../main/webapp/react-webapp/src/views/Header.jsx | 2 +- .../src/views/PermissionsModule/EditPermission.jsx | 17 +-- .../src/views/PermissionsModule/Permissions.jsx| 18 --- .../views/PolicyListing/AddUpdatePolicyForm.jsx| 2 +- .../src/views/PolicyListing/PolicyListing.jsx | 92 ++ .../views/PolicyListing/PolicyPermissionItem.jsx | 20 +-- .../views/PolicyListing/TagBasePermissionItem.jsx | 24 ++-- .../views/ServiceManager/ServiceDefinitions.jsx| 2 +- .../GroupAssociateUserDetails.jsx | 84 + .../groups_details/GroupListing.jsx| 111 - .../role_details/RoleListing.jsx | 28 ++--- .../users_details/UserListing.jsx | 124 ++- .../src/main/webapp/scripts/utils/XAUtils.js | 2 +- .../views/policies/NRangerPolicyTableLayout.js | 25 ++-- .../views/policies/RangerPolicyTableLayout.js | 31 +++-- tagsync/scripts/ranger-tagsync-services.sh | 6 +- tagsync/scripts/setup.py | 4 + 30 files changed, 573 insertions(+), 398 deletions(-)