This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to branch RANGER-3923 in repository https://gitbox.apache.org/repos/asf/ranger.git
from d5dc40c8c Merge branch 'master' into RANGER-3923 add 58173c815 RANGER-4422: Searching for users/groups with Sync source filter on the users/groups page leads to error on Oracle DB add 0b8eb1c15 RANGER-4421: Upgrade Tomcat to 8.5.93 add 1438644b7 RANGER-4234: simplify condition/row-filter expressions that deal with delimited strings add 622a1dacb RANGER-4383: In Audit, Plugin Status tab if the record of respective service is in second page then Service Type filter for that service would show no result add 6b3bd1c85 RANGER-4381 : Difference in user lookup API request in permissions module page between React UI and BackBone UI add 0f70a24f4 RANGER-4407 : Add server side validation for service audit filter add f740ad332 RANGER-4358: Keep the usersync details popup names same as the backbone js names add e76101d28 RANGER-4379: Assorted debugging help : save policy-cache at Ranger-admin and policy-cache as well as downloaded policy-deltas on plugin side add 696d4340b RANGER-4378: Expand implied grants in the policy-items for being able to compare policy-cache dumps from server and client add e42863f2f RANGER-4437: incorrect error log from ResourceMatcher.isMatch() add 83978aa0d RANGER-4234: updated RangerRequestScriptEvaluator to handle double-brackets in expressions add 00fd78a9b RANGER-4439: fixed duplicate resource IDs in security zone service resources new f80b8c148 Merge branch 'master' into RANGER-3923 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../dev-support}/spotbugsIncludeFile.xml | 0 .../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, 892 insertions(+), 405 deletions(-) copy {dev-support => agents-common/dev-support}/spotbugsIncludeFile.xml (100%) create mode 100644 agents-common/src/main/java/org/apache/ranger/plugin/util/JavaScriptEdits.java create mode 100644 agents-common/src/test/java/org/apache/ranger/plugin/util/JavaScriptEditsTest.java