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 <[email protected]> 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 +- .../apache/ranger/ha/service/HARangerService.java | 19 +- .../apache/ranger/ha/service/ServiceManager.java | 71 ++++ .../service/TestRangerServiceServerIdSelector.java | 54 +++ ranger-common-ha/src/test/resources/log4j.xml | 70 ++++ .../src/test/resources/ranger-tagsync-site.xml | 199 ++++++++++ ranger-hbase-plugin-shim/pom.xml | 9 + ranger-hive-plugin-shim/pom.xml | 21 + ranger-metrics/.gitignore | 1 + ranger-metrics/pom.xml | 55 +++ .../apache/ranger/metrics/RangerMetricsInfo.java | 28 +- .../ranger/metrics/RangerMetricsSystemWrapper.java | 99 +++++ .../ranger/metrics/sink/RangerMetricsJsonSink.java | 85 ++++ .../metrics/sink/RangerMetricsPrometheusSink.java | 114 ++++++ .../metrics/source/RangerMetricsJvmSource.java | 125 ++++++ .../ranger/metrics/source/RangerMetricsSource.java | 30 +- .../metrics/wrapper/RangerMetricsSinkWrapper.java | 32 +- .../wrapper/RangerMetricsSourceWrapper.java | 53 +++ .../classloader/RangerPluginClassLoader.java | 2 +- security-admin/pom.xml | 5 + .../org/apache/ranger/biz/PolicyRefUpdater.java | 14 +- .../java/org/apache/ranger/biz/RangerBizUtil.java | 7 + .../org/apache/ranger/biz/RangerPolicyAdmin.java | 3 + .../apache/ranger/biz/RangerPolicyAdminImpl.java | 25 ++ .../java/org/apache/ranger/biz/ServiceDBStore.java | 65 ++- .../java/org/apache/ranger/biz/TagDBStore.java | 3 + .../main/java/org/apache/ranger/biz/XUserMgr.java | 4 + .../ranger/common/RangerServicePoliciesCache.java | 2 +- .../RangerTransactionSynchronizationAdapter.java | 15 +- .../java/org/apache/ranger/db/XXPortalUserDao.java | 19 + .../java/org/apache/ranger/db/XXServiceDao.java | 1 - .../java/org/apache/ranger/db/XXServiceDefDao.java | 71 ++++ .../main/java/org/apache/ranger/db/XXUserDao.java | 1 - .../ranger/metrics/RangerAdminMetricsWrapper.java | 109 +++++ .../ranger/metrics/RangerMetricsFetcher.java | 124 ++++++ .../source/RangerAdminMetricsSourceBase.java | 72 ++++ .../RangerAdminMetricsSourceContextEnricher.java} | 29 +- .../RangerAdminMetricsSourceDenyConditions.java} | 29 +- .../RangerAdminMetricsSourcePolicyMasking.java} | 30 +- ...gerAdminMetricsSourcePolicyResourceAccess.java} | 31 +- ...angerAdminMetricsSourcePolicyRowFiltering.java} | 30 +- .../source/RangerAdminMetricsSourceService.java} | 29 +- .../source/RangerAdminMetricsSourceUserGroup.java} | 30 +- .../java/org/apache/ranger/rest/MetricsREST.java | 46 +++ .../java/org/apache/ranger/rest/PublicAPIsv2.java | 9 + .../org/apache/ranger/rest/SecurityZoneREST.java | 33 ++ .../java/org/apache/ranger/rest/ServiceREST.java | 2 +- .../apache/ranger/rest/ServiceTagsProcessor.java | 4 +- .../security/context/RangerAdminOpContext.java | 8 + .../RangerSecurityContextFormationFilter.java | 20 + .../org/apache/ranger/service/XGroupService.java | 4 + .../main/resources/META-INF/jpa_named_queries.xml | 24 +- .../conf.dist/security-applicationContext.xml | 7 +- .../src/main/resources/hadoop-metrics2.properties | 54 +++ .../webapp/react-webapp/src/utils/XAMessages.js | 13 +- .../AuditEvent/AdminLogs/PolicyViewDetails.jsx | 29 +- .../react-webapp/src/views/CustomBreadcrumb.jsx | 4 +- .../src/views/Encryption/KeyCreate.jsx | 35 +- .../src/views/Encryption/KeyManager.jsx | 22 +- .../main/webapp/react-webapp/src/views/Header.jsx | 50 ++- .../main/webapp/react-webapp/src/views/Layout.jsx | 2 +- .../views/PolicyListing/AddUpdatePolicyForm.jsx | 65 ++- .../views/PolicyListing/PolicyConditionsComp.jsx | 2 - .../src/views/PolicyListing/PolicyListing.jsx | 72 ++-- .../PolicyListing/PolicyValidityPeriodComp.jsx | 1 - .../src/views/Resources/ResourceComp.jsx | 49 ++- .../src/views/SecurityZone/SecurityZoneForm.jsx | 37 +- .../src/views/SecurityZone/ZoneDisplay.jsx | 35 +- .../src/views/SecurityZone/ZoneListing.jsx | 27 +- .../views/ServiceManager/ServiceAuditFilter.jsx | 89 ++--- .../src/views/ServiceManager/ServiceDefinition.jsx | 9 +- .../views/ServiceManager/ServiceDefinitions.jsx | 35 +- .../src/views/ServiceManager/ServiceForm.jsx | 125 +++--- .../groups_details/GroupForm.jsx | 2 +- .../UserGroupRoleListing/role_details/RoleForm.jsx | 6 +- .../users_details/UserFormComp.jsx | 2 +- .../webapp/react-webapp/src/views/UserProfile.jsx | 3 +- .../source/atlas/AtlasOzoneResourceMapper.java | 2 +- .../tagsync/source/atlas/AtlasTagSource.java | 68 ++-- .../tagsync/process/TestOzoneResourceMapper.java | 4 +- 150 files changed, 5292 insertions(+), 740 deletions(-)
