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 <[email protected]> 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 +- .../src/views/SecurityZone/ZoneListing.jsx | 25 +- .../src/views/ServiceManager/ImportPolicy.jsx | 26 +- .../views/ServiceManager/ServiceAuditFilter.jsx | 81 ++- .../src/views/ServiceManager/ServiceDefinition.jsx | 10 +- .../views/ServiceManager/ServiceDefinitions.jsx | 150 ++--- .../src/views/ServiceManager/ServiceForm.jsx | 232 ++++--- .../views/ServiceManager/ServiceViewDetails.jsx | 311 ++++++++++ .../src/views/SideBar/ResourceTagContent.jsx | 81 +++ .../react-webapp/src/views/SideBar/SideBar.jsx | 453 ++++++++++++++ .../react-webapp/src/views/SideBar/SideBarBody.jsx | 613 ++++++++++++++++++ .../react-webapp/src/views/SideBar/TopNavBar.jsx | 353 +++++++++++ .../UserGroupRoleListing/UserGroupRoleListing.jsx | 19 +- .../groups_details/GroupForm.jsx | 12 +- .../groups_details/GroupListing.jsx | 1 - .../UserGroupRoleListing/role_details/RoleForm.jsx | 16 +- .../role_details/RoleListing.jsx | 1 - .../users_details/AddUserView.jsx | 7 +- .../users_details/EditUserView.jsx | 12 +- .../users_details/UserFormComp.jsx | 15 +- .../users_details/UserListing.jsx | 1 - .../webapp/react-webapp/src/views/UserProfile.jsx | 9 +- 96 files changed, 4937 insertions(+), 1215 deletions(-) diff --cc agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java index 776b58480,6a3875ad5..0d9ee145c --- a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java +++ b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java @@@ -482,13 -482,20 +482,27 @@@ public class TestPolicyEngine runTestsFromResourceFiles(resourceFiles); } + @Test + public void testPolicyEngin_markerAccessTypes() { + String[] resourceFiles = {"/policyengine/test_policyengine_marker_access_types.json"}; + + runTestsFromResourceFiles(resourceFiles); + } + + @Test + public void testAnyResourceAccess_Kafka() throws Exception { + String[] resourceFiles = {"/policyengine/test_policyengine_kafka.json"}; + + runTestsFromResourceFiles(resourceFiles); + } + + @Test + public void testAnyResourceAccess_S3() throws Exception { + String[] resourceFiles = {"/policyengine/test_policyengine_aws_s3.json"}; + + runTestsFromResourceFiles(resourceFiles); + } + private void runTestsFromResourceFiles(String[] resourceNames) { for(String resourceName : resourceNames) { InputStream inStream = this.getClass().getResourceAsStream(resourceName);
