This is an automated email from the ASF dual-hosted git repository.
jialiang pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
from bf141bcc61 Revert "AMBARI-26428: Fix Ambari Server Startup Failure
with Jetty SSL and Mu…" (#3976)
new f1dfbfc486 AMBARI-26288:Preliminary upgrade of Spring and Jetty
dependencies (#3930)
new 2aece240fb AMBARI-26292: Upgrade jetty version to 2.1 (#3932)
new 89764d1f98 AMBARI-26293: upgrade guice to 6.0 (#3933)
new 195d864bc5 AMBARI-26294: upgrade JPA (#3935)
new 14fb532df3 AMBARI-26296: Fix security related issues after spring
upgrade (#3951)
new d5645e887f AMBARI-26185: Upgrade commons-collections to resolve CVEs
(#3936)
new 0b66697c93 AMBARI-26357: Errors occur when compiling ambari after
upgrading jetty (#3964)
The 7 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:
ambari-admin/pom.xml | 1 -
ambari-agent/pom.xml | 1 -
ambari-agent/src/packages/tarball/all.xml | 3 +-
ambari-funtest/pom.xml | 1 -
ambari-project/pom.xml | 22 ++---
ambari-server-spi/pom.xml | 1 -
ambari-server/checkstyle.xml | 2 +-
ambari-server/pom.xml | 41 ++++++---
.../inject/persist/jpa/AmbariJpaPersistModule.java | 6 +-
.../persist/jpa/AmbariJpaPersistService.java | 4 +-
.../DisableBatchingRemoteEndpointFactory.java | 23 +++--
.../server/actionmanager/ActionScheduler.java | 2 +-
.../ambari/server/agent/HeartBeatHandler.java | 2 +-
.../server/agent/stomp/AgentClusterDataHolder.java | 2 +-
.../server/agent/stomp/AgentHostDataHolder.java | 2 +-
.../server/agent/stomp/AgentReportsController.java | 4 +-
.../server/agent/stomp/AlertDefinitionsHolder.java | 6 +-
.../server/agent/stomp/HeartbeatController.java | 2 +-
.../server/api/AmbariCsrfProtectionFilter.java | 10 +-
.../ambari/server/api/AmbariErrorHandler.java | 6 +-
.../ambari/server/api/AmbariPersistFilter.java | 12 +--
.../server/api/AmbariViewErrorHandlerProxy.java | 21 +----
.../server/api/ContentTypeOverrideFilter.java | 28 +++---
.../apache/ambari/server/api/GsonJsonProvider.java | 16 ++--
.../ambari/server/api/MethodOverrideFilter.java | 18 ++--
.../ambari/server/api/UserNameOverrideFilter.java | 16 ++--
.../server/api/query/JpaPredicateVisitor.java | 32 +++----
.../ambari/server/api/query/JpaSortBuilder.java | 12 +--
.../ambari/server/api/rest/BootStrapResource.java | 22 ++---
.../apache/ambari/server/api/rest/HealthCheck.java | 8 +-
.../api/rest/KdcServerReachabilityCheck.java | 16 ++--
.../ambari/server/api/services/ActionService.java | 24 ++---
.../api/services/AlertDefinitionService.java | 22 ++---
.../server/api/services/AlertGroupService.java | 22 ++---
.../server/api/services/AlertHistoryService.java | 16 ++--
.../server/api/services/AlertNoticeService.java | 16 ++--
.../ambari/server/api/services/AlertService.java | 16 ++--
.../server/api/services/AlertTargetService.java | 22 ++---
.../api/services/AmbariPrivilegeService.java | 2 +-
.../ambari/server/api/services/BaseRequest.java | 4 +-
.../ambari/server/api/services/BaseService.java | 13 +--
.../server/api/services/BlueprintService.java | 22 ++---
.../services/ClusterKerberosDescriptorService.java | 16 ++--
.../ambari/server/api/services/ClusterService.java | 74 +++++++--------
.../api/services/ClusterStackVersionService.java | 22 ++---
.../CompatibleRepositoryVersionService.java | 16 ++--
.../server/api/services/ComponentService.java | 24 ++---
.../server/api/services/ConfigGroupService.java | 24 ++---
.../server/api/services/ConfigurationService.java | 18 ++--
.../server/api/services/CredentialService.java | 22 ++---
.../ambari/server/api/services/DeleteRequest.java | 4 +-
.../server/api/services/ExtensionLinksService.java | 22 ++---
.../server/api/services/ExtensionsService.java | 16 ++--
.../ambari/server/api/services/FeedService.java | 22 ++---
.../ambari/server/api/services/GetRequest.java | 4 +-
.../server/api/services/HostComponentService.java | 26 +++---
.../api/services/HostKerberosIdentityService.java | 20 ++--
.../ambari/server/api/services/HostService.java | 26 +++---
.../api/services/HostStackVersionService.java | 18 ++--
.../server/api/services/InstanceService.java | 22 ++---
.../ambari/server/api/services/JobService.java | 16 ++--
.../api/services/KerberosDescriptorService.java | 20 ++--
.../ambari/server/api/services/KeyService.java | 9 +-
.../server/api/services/LdapSyncEventService.java | 22 ++---
.../ambari/server/api/services/LocalUriInfo.java | 10 +-
.../ambari/server/api/services/LoggingService.java | 18 ++--
.../ambari/server/api/services/LogoutService.java | 12 +--
.../ambari/server/api/services/MpacksService.java | 22 ++---
.../api/services/OperatingSystemService.java | 16 ++--
.../server/api/services/PermissionService.java | 24 ++---
.../server/api/services/PersistKeyValueImpl.java | 4 +-
.../api/services/PersistKeyValueService.java | 17 ++--
.../ambari/server/api/services/PostRequest.java | 4 +-
.../api/services/PreUpgradeCheckService.java | 12 +--
.../server/api/services/PrivilegeService.java | 22 ++---
.../ambari/server/api/services/PutRequest.java | 4 +-
.../server/api/services/QueryPostRequest.java | 4 +-
.../server/api/services/RecommendationService.java | 18 ++--
.../server/api/services/RemoteClustersService.java | 22 ++---
.../server/api/services/RepositoryService.java | 20 ++--
.../api/services/RepositoryVersionService.java | 22 ++---
.../ambari/server/api/services/RequestFactory.java | 4 +-
.../api/services/RequestScheduleService.java | 24 ++---
.../ambari/server/api/services/RequestService.java | 22 ++---
.../api/services/RoleAuthorizationService.java | 16 ++--
.../RootServiceComponentConfigurationService.java | 24 ++---
.../server/api/services/RootServiceService.java | 20 ++--
.../api/services/ServiceConfigVersionService.java | 14 +--
.../ambari/server/api/services/ServiceService.java | 26 +++---
.../ambari/server/api/services/SettingService.java | 24 ++---
.../ambari/server/api/services/StacksService.java | 18 ++--
.../ambari/server/api/services/StageService.java | 20 ++--
.../server/api/services/TargetClusterService.java | 22 ++---
.../server/api/services/TaskAttemptService.java | 16 ++--
.../ambari/server/api/services/TaskService.java | 16 ++--
.../server/api/services/UpgradeGroupService.java | 16 ++--
.../server/api/services/UpgradeItemService.java | 18 ++--
.../ambari/server/api/services/UpgradeService.java | 20 ++--
.../server/api/services/UpgradeSummaryService.java | 16 ++--
.../server/api/services/ValidationService.java | 18 ++--
.../api/services/VersionDefinitionService.java | 22 ++---
.../server/api/services/WidgetLayoutService.java | 22 ++---
.../ambari/server/api/services/WidgetService.java | 22 ++---
.../server/api/services/WorkflowService.java | 16 ++--
.../api/services/groups/GroupPrivilegeService.java | 16 ++--
.../server/api/services/groups/GroupService.java | 20 ++--
.../server/api/services/groups/MemberService.java | 22 ++---
.../stackadvisor/commands/StackAdvisorCommand.java | 6 +-
.../services/users/ActiveWidgetLayoutService.java | 18 ++--
.../server/api/services/users/AuthService.java | 14 +--
.../users/UserAuthenticationSourceService.java | 22 ++---
.../services/users/UserAuthorizationService.java | 16 ++--
.../api/services/users/UserPrivilegeService.java | 16 ++--
.../server/api/services/users/UserService.java | 22 ++---
.../services/views/ViewDataMigrationService.java | 10 +-
.../views/ViewExternalSubResourceService.java | 16 ++--
.../api/services/views/ViewInstanceService.java | 28 +++---
.../api/services/views/ViewPermissionService.java | 24 ++---
.../api/services/views/ViewPrivilegeService.java | 24 ++---
.../server/api/services/views/ViewService.java | 24 ++---
.../api/services/views/ViewSubResourceService.java | 12 +--
.../server/api/services/views/ViewUrlsService.java | 24 ++---
.../api/services/views/ViewVersionService.java | 24 ++---
.../checks/DatabaseConsistencyCheckHelper.java | 9 +-
.../ambari/server/cleanup/CleanupServiceImpl.java | 2 +-
.../spring/AgentRegisteringQueueChecker.java | 9 +-
.../configuration/spring/AgentStompConfig.java | 17 ++--
.../configuration/spring/ApiSecurityConfig.java | 101 +++++++++------------
.../configuration/spring/ApiStompConfig.java | 5 +-
.../configuration/spring/RootStompConfig.java | 8 +-
.../server/controller/ActionRequestSwagger.java | 2 +-
.../controller/ActiveWidgetLayoutRequest.java | 4 +-
.../controller/ActiveWidgetLayoutResponse.java | 4 +-
.../server/controller/AmbariHandlerList.java | 13 ++-
.../controller/AmbariManagementControllerImpl.java | 3 +-
.../server/controller/AmbariManagementHelper.java | 2 +-
.../ambari/server/controller/AmbariServer.java | 73 ++++++++++-----
.../server/controller/AmbariSessionManager.java | 6 +-
.../server/controller/ClusterArtifactRequest.java | 2 +-
.../controller/ClusterServiceArtifactRequest.java | 2 +-
.../controller/ComponentDependencyResponse.java | 2 +-
.../server/controller/GroupPrivilegeResponse.java | 4 +-
.../server/controller/QuickLinksResponse.java | 2 +-
.../server/controller/RequestPostRequest.java | 2 +-
.../server/controller/RequestPostResponse.java | 2 +-
.../server/controller/RequestPutRequest.java | 2 +-
.../ambari/server/controller/RequestResponse.java | 2 +-
.../server/controller/ResourceProviderFactory.java | 2 +-
.../server/controller/ServiceRequestSwagger.java | 2 +-
.../controller/StackServiceArtifactResponse.java | 2 +-
.../ambari/server/controller/ThemeResponse.java | 2 +-
.../controller/UserAuthorizationResponse.java | 4 +-
.../server/controller/UserPrivilegeResponse.java | 4 +-
.../server/controller/ViewInstanceRequest.java | 4 +-
.../server/controller/ViewInstanceResponse.java | 4 +-
.../server/controller/ViewPermissionResponse.java | 4 +-
.../server/controller/ViewPrivilegeRequest.java | 4 +-
.../server/controller/ViewPrivilegeResponse.java | 4 +-
.../ambari/server/controller/ViewResponse.java | 4 +-
.../server/controller/ViewVersionResponse.java | 4 +-
.../KerberosDescriptorResourceProvider.java | 2 +-
.../internal/StackAdvisorResourceProvider.java | 6 +-
.../controller/internal/StageResourceProvider.java | 4 +-
.../logging/LoggingRequestHelperFactoryImpl.java | 2 +-
.../metrics/timeline/MetricsRequestHelper.java | 2 +-
.../apache/ambari/server/events/jpa/JPAEvent.java | 2 +-
.../alerts/AlertDefinitionsUIUpdateListener.java | 2 +-
.../ambari/server/hooks/users/UserHookService.java | 4 +-
.../server/ldap/service/AmbariLdapFacade.java | 4 +-
.../ads/DefaultLdapAttributeDetectionService.java | 4 +-
.../ads/DefaultLdapConfigurationService.java | 4 +-
.../ads/DefaultLdapConnectionConfigService.java | 5 +-
.../service/ads/LdapConnectionTemplateFactory.java | 6 +-
.../ads/detectors/AttributeDetectorFactory.java | 6 +-
.../ads/detectors/ChainedAttributeDetector.java | 4 +-
.../ads/detectors/GroupMemberAttrDetector.java | 2 +-
.../ads/detectors/GroupNameAttrDetector.java | 2 +-
.../ads/detectors/GroupObjectClassDetector.java | 2 +-
.../ads/detectors/UserGroupMemberAttrDetector.java | 2 +-
.../ads/detectors/UserNameAttrDetector.java | 4 +-
.../ads/detectors/UserObjectClassDetector.java | 2 +-
.../listeners/WebSocketInitializerListener.java | 65 +++++++++++++
.../server/orm/AmbariJpaLocalTxnInterceptor.java | 6 +-
.../ambari/server/orm/dao/AlertDefinitionDAO.java | 4 +-
.../ambari/server/orm/dao/AlertDispatchDAO.java | 14 +--
.../apache/ambari/server/orm/dao/AlertsDAO.java | 18 ++--
.../server/orm/dao/AmbariConfigurationDAO.java | 10 +-
.../apache/ambari/server/orm/dao/ArtifactDAO.java | 6 +-
.../apache/ambari/server/orm/dao/BlueprintDAO.java | 4 +-
.../apache/ambari/server/orm/dao/ClusterDAO.java | 12 +--
.../ambari/server/orm/dao/ClusterServiceDAO.java | 6 +-
.../ambari/server/orm/dao/ClusterStateDAO.java | 2 +-
.../orm/dao/ConfigGroupConfigMappingDAO.java | 4 +-
.../ambari/server/orm/dao/ConfigGroupDAO.java | 6 +-
.../server/orm/dao/ConfigGroupHostMappingDAO.java | 4 +-
.../org/apache/ambari/server/orm/dao/CrudDAO.java | 4 +-
.../org/apache/ambari/server/orm/dao/DaoUtils.java | 14 +--
.../ambari/server/orm/dao/ExecutionCommandDAO.java | 2 +-
.../apache/ambari/server/orm/dao/ExtensionDAO.java | 4 +-
.../ambari/server/orm/dao/ExtensionLinkDAO.java | 4 +-
.../org/apache/ambari/server/orm/dao/GroupDAO.java | 6 +-
.../orm/dao/HostComponentDesiredStateDAO.java | 6 +-
.../server/orm/dao/HostComponentStateDAO.java | 6 +-
.../server/orm/dao/HostConfigMappingDAO.java | 4 +-
.../org/apache/ambari/server/orm/dao/HostDAO.java | 6 +-
.../ambari/server/orm/dao/HostRoleCommandDAO.java | 14 +--
.../apache/ambari/server/orm/dao/HostStateDAO.java | 2 +-
.../ambari/server/orm/dao/HostVersionDAO.java | 4 +-
.../server/orm/dao/KerberosDescriptorDAO.java | 10 +-
.../ambari/server/orm/dao/KerberosKeytabDAO.java | 4 +-
.../server/orm/dao/KerberosKeytabPrincipalDAO.java | 15 +--
.../server/orm/dao/KerberosPrincipalDAO.java | 4 +-
.../apache/ambari/server/orm/dao/KeyValueDAO.java | 4 +-
.../apache/ambari/server/orm/dao/MemberDAO.java | 6 +-
.../apache/ambari/server/orm/dao/MetainfoDAO.java | 4 +-
.../org/apache/ambari/server/orm/dao/MpackDAO.java | 4 +-
.../ambari/server/orm/dao/PermissionDAO.java | 4 +-
.../apache/ambari/server/orm/dao/PrincipalDAO.java | 4 +-
.../ambari/server/orm/dao/PrincipalTypeDAO.java | 4 +-
.../apache/ambari/server/orm/dao/PrivilegeDAO.java | 4 +-
.../server/orm/dao/RemoteAmbariClusterDAO.java | 4 +-
.../server/orm/dao/RepositoryVersionDAO.java | 2 +-
.../apache/ambari/server/orm/dao/RequestDAO.java | 4 +-
.../server/orm/dao/RequestOperationLevelDAO.java | 4 +-
.../orm/dao/RequestScheduleBatchRequestDAO.java | 6 +-
.../ambari/server/orm/dao/RequestScheduleDAO.java | 6 +-
.../apache/ambari/server/orm/dao/ResourceDAO.java | 6 +-
.../ambari/server/orm/dao/ResourceTypeDAO.java | 4 +-
.../server/orm/dao/RoleAuthorizationDAO.java | 4 +-
.../server/orm/dao/RoleSuccessCriteriaDAO.java | 2 +-
.../orm/dao/ServiceComponentDesiredStateDAO.java | 14 +--
.../ambari/server/orm/dao/ServiceConfigDAO.java | 12 +--
.../server/orm/dao/ServiceDesiredStateDAO.java | 6 +-
.../apache/ambari/server/orm/dao/SettingDAO.java | 4 +-
.../org/apache/ambari/server/orm/dao/StackDAO.java | 4 +-
.../org/apache/ambari/server/orm/dao/StageDAO.java | 14 +--
.../server/orm/dao/TopologyHostGroupDAO.java | 4 +-
.../ambari/server/orm/dao/TopologyHostInfoDAO.java | 6 +-
.../server/orm/dao/TopologyHostRequestDAO.java | 2 +-
.../ambari/server/orm/dao/TopologyHostTaskDAO.java | 4 +-
.../server/orm/dao/TopologyLogicalRequestDAO.java | 4 +-
.../server/orm/dao/TopologyLogicalTaskDAO.java | 4 +-
.../ambari/server/orm/dao/TopologyRequestDAO.java | 4 +-
.../apache/ambari/server/orm/dao/UpgradeDAO.java | 4 +-
.../server/orm/dao/UserAuthenticationDAO.java | 4 +-
.../org/apache/ambari/server/orm/dao/UserDAO.java | 6 +-
.../org/apache/ambari/server/orm/dao/ViewDAO.java | 4 +-
.../ambari/server/orm/dao/ViewInstanceDAO.java | 6 +-
.../apache/ambari/server/orm/dao/ViewURLDAO.java | 6 +-
.../apache/ambari/server/orm/dao/WidgetDAO.java | 4 +-
.../ambari/server/orm/dao/WidgetLayoutDAO.java | 4 +-
.../server/orm/entities/AlertCurrentEntity.java | 30 +++---
.../server/orm/entities/AlertCurrentEntity_.java | 8 +-
.../server/orm/entities/AlertDefinitionEntity.java | 44 ++++-----
.../orm/entities/AlertDefinitionEntity_.java | 8 +-
.../server/orm/entities/AlertGroupEntity.java | 30 +++---
.../server/orm/entities/AlertHistoryEntity.java | 28 +++---
.../server/orm/entities/AlertHistoryEntity_.java | 8 +-
.../server/orm/entities/AlertNoticeEntity.java | 30 +++---
.../server/orm/entities/AlertNoticeEntity_.java | 8 +-
.../server/orm/entities/AlertTargetEntity.java | 44 ++++-----
.../server/orm/entities/AlertTargetEntity_.java | 8 +-
.../orm/entities/AmbariConfigurationEntity.java | 14 +--
.../ambari/server/orm/entities/ArtifactEntity.java | 20 ++--
.../server/orm/entities/ArtifactEntityPK.java | 4 +-
.../server/orm/entities/BlueprintConfigEntity.java | 20 ++--
.../orm/entities/BlueprintConfigEntityPK.java | 4 +-
.../server/orm/entities/BlueprintEntity.java | 24 ++---
.../orm/entities/BlueprintSettingEntity.java | 26 +++---
.../server/orm/entities/ClusterConfigEntity.java | 36 ++++----
.../ambari/server/orm/entities/ClusterEntity.java | 38 ++++----
.../server/orm/entities/ClusterServiceEntity.java | 28 +++---
.../orm/entities/ClusterServiceEntityPK.java | 4 +-
.../server/orm/entities/ClusterStateEntity.java | 16 ++--
.../entities/ConfigGroupConfigMappingEntity.java | 20 ++--
.../entities/ConfigGroupConfigMappingEntityPK.java | 4 +-
.../server/orm/entities/ConfigGroupEntity.java | 26 +++---
.../orm/entities/ConfigGroupHostMappingEntity.java | 20 ++--
.../entities/ConfigGroupHostMappingEntityPK.java | 4 +-
.../orm/entities/ExecutionCommandEntity.java | 20 ++--
.../server/orm/entities/ExtensionEntity.java | 20 ++--
.../server/orm/entities/ExtensionLinkEntity.java | 24 ++---
.../ambari/server/orm/entities/GroupEntity.java | 36 ++++----
.../entities/HostComponentDesiredStateEntity.java | 32 +++----
.../orm/entities/HostComponentStateEntity.java | 28 +++---
.../orm/entities/HostConfigMappingEntity.java | 14 +--
.../orm/entities/HostConfigMappingEntityPK.java | 4 +-
.../ambari/server/orm/entities/HostEntity.java | 36 ++++----
.../ambari/server/orm/entities/HostEntity_.java | 4 +-
.../orm/entities/HostGroupComponentEntity.java | 16 ++--
.../orm/entities/HostGroupComponentEntityPK.java | 4 +-
.../server/orm/entities/HostGroupConfigEntity.java | 22 ++---
.../orm/entities/HostGroupConfigEntityPK.java | 4 +-
.../server/orm/entities/HostGroupEntity.java | 20 ++--
.../server/orm/entities/HostGroupEntityPK.java | 4 +-
.../server/orm/entities/HostRoleCommandEntity.java | 40 ++++----
.../orm/entities/HostRoleCommandEntity_.java | 6 +-
.../server/orm/entities/HostStateEntity.java | 26 +++---
.../server/orm/entities/HostVersionEntity.java | 28 +++---
.../orm/entities/KerberosDescriptorEntity.java | 10 +-
.../server/orm/entities/KerberosKeytabEntity.java | 20 ++--
.../entities/KerberosKeytabPrincipalEntity.java | 30 +++---
.../KerberosKeytabServiceMappingEntity.java | 12 +--
.../orm/entities/KerberosPrincipalEntity.java | 18 ++--
.../ambari/server/orm/entities/KeyValueEntity.java | 10 +-
.../ambari/server/orm/entities/MemberEntity.java | 24 ++---
.../ambari/server/orm/entities/MetainfoEntity.java | 12 +--
.../ambari/server/orm/entities/MpackEntity.java | 18 ++--
.../server/orm/entities/PermissionEntity.java | 30 +++---
.../server/orm/entities/PrincipalEntity.java | 26 +++---
.../server/orm/entities/PrincipalTypeEntity.java | 18 ++--
.../server/orm/entities/PrivilegeEntity.java | 20 ++--
.../orm/entities/RemoteAmbariClusterEntity.java | 22 ++---
.../entities/RemoteAmbariClusterServiceEntity.java | 18 ++--
.../server/orm/entities/RepoDefinitionEntity.java | 28 +++---
.../ambari/server/orm/entities/RepoOsEntity.java | 24 ++---
.../orm/entities/RepositoryVersionEntity.java | 44 ++++-----
.../ambari/server/orm/entities/RequestEntity.java | 32 +++----
.../orm/entities/RequestOperationLevelEntity.java | 24 ++---
.../orm/entities/RequestResourceFilterEntity.java | 26 +++---
.../RequestScheduleBatchRequestEntity.java | 26 +++---
.../RequestScheduleBatchRequestEntityPK.java | 4 +-
.../server/orm/entities/RequestScheduleEntity.java | 26 +++---
.../ambari/server/orm/entities/ResourceEntity.java | 24 ++---
.../server/orm/entities/ResourceTypeEntity.java | 14 +--
.../orm/entities/RoleAuthorizationEntity.java | 12 +--
.../orm/entities/RoleSuccessCriteriaEntity.java | 22 ++---
.../orm/entities/RoleSuccessCriteriaEntityPK.java | 4 +-
.../ServiceComponentDesiredStateEntity.java | 38 ++++----
.../entities/ServiceComponentVersionEntity.java | 28 +++---
.../server/orm/entities/ServiceConfigEntity.java | 34 +++----
.../orm/entities/ServiceDesiredStateEntity.java | 24 ++---
.../orm/entities/ServiceDesiredStateEntityPK.java | 6 +-
.../ambari/server/orm/entities/SettingEntity.java | 20 ++--
.../ambari/server/orm/entities/StackEntity.java | 22 ++---
.../ambari/server/orm/entities/StackEntity_.java | 6 +-
.../ambari/server/orm/entities/StageEntity.java | 30 +++---
.../ambari/server/orm/entities/StageEntity_.java | 8 +-
.../orm/entities/TopologyHostGroupEntity.java | 32 +++----
.../orm/entities/TopologyHostInfoEntity.java | 20 ++--
.../orm/entities/TopologyHostRequestEntity.java | 24 ++---
.../orm/entities/TopologyHostTaskEntity.java | 26 +++---
.../orm/entities/TopologyLogicalRequestEntity.java | 20 ++--
.../orm/entities/TopologyLogicalTaskEntity.java | 24 ++---
.../server/orm/entities/TopologyRequestEntity.java | 34 +++----
.../ambari/server/orm/entities/UpgradeEntity.java | 34 +++----
.../server/orm/entities/UpgradeGroupEntity.java | 24 ++---
.../server/orm/entities/UpgradeHistoryEntity.java | 24 ++---
.../server/orm/entities/UpgradeItemEntity.java | 28 +++---
.../orm/entities/UserAuthenticationEntity.java | 34 +++----
.../ambari/server/orm/entities/UserEntity.java | 38 ++++----
.../ambari/server/orm/entities/ViewEntity.java | 24 ++---
.../server/orm/entities/ViewEntityEntity.java | 22 ++---
.../orm/entities/ViewInstanceDataEntity.java | 18 ++--
.../orm/entities/ViewInstanceDataEntityPK.java | 4 +-
.../server/orm/entities/ViewInstanceEntity.java | 40 ++++----
.../orm/entities/ViewInstancePropertyEntity.java | 18 ++--
.../orm/entities/ViewInstancePropertyEntityPK.java | 4 +-
.../server/orm/entities/ViewParameterEntity.java | 16 ++--
.../server/orm/entities/ViewParameterEntityPK.java | 4 +-
.../server/orm/entities/ViewResourceEntity.java | 16 ++--
.../server/orm/entities/ViewResourceEntityPK.java | 4 +-
.../ambari/server/orm/entities/ViewURLEntity.java | 22 ++---
.../ambari/server/orm/entities/WidgetEntity.java | 32 +++----
.../server/orm/entities/WidgetLayoutEntity.java | 30 +++---
.../orm/entities/WidgetLayoutUserWidgetEntity.java | 16 ++--
.../entities/WidgetLayoutUserWidgetEntityPK.java | 4 +-
.../apache/ambari/server/proxy/ProxyService.java | 26 +++---
.../server/resources/api/rest/GetResource.java | 20 ++--
.../server/scheduler/ExecutionScheduleManager.java | 17 ++--
.../security/AbstractSecurityHeaderFilter.java | 14 +--
.../ambari/server/security/AmbariEntryPoint.java | 6 +-
.../security/AmbariServerSecurityHeaderFilter.java | 2 +-
.../security/AmbariViewsSecurityHeaderFilter.java | 2 +-
.../ambari/server/security/SecurityFilter.java | 14 +--
.../AmbariAuthenticationEventHandler.java | 8 +-
.../AmbariAuthenticationEventHandlerImpl.java | 8 +-
.../authentication/AmbariAuthenticationFilter.java | 10 +-
.../AmbariBasicAuthenticationFilter.java | 11 ++-
.../AmbariDelegatingAuthenticationFilter.java | 14 +--
.../authentication/RequestBodyCachingFilter.java | 87 ++++++++++++++++++
.../jwt/AmbariJwtAuthenticationFilter.java | 16 ++--
.../AmbariKerberosAuthenticationFilter.java | 30 ++----
.../AmbariKerberosAuthenticationProvider.java | 2 +-
.../kerberos/AmbariProxiedUserDetailsService.java | 2 +-
.../pam/PamAuthenticationFactory.java | 2 +-
.../tproxy/TrustedProxyAuthenticationDetails.java | 2 +-
.../TrustedProxyAuthenticationDetailsSource.java | 2 +-
.../authorization/AmbariAuthorizationFilter.java | 16 ++--
.../AmbariUserAuthorizationFilter.java | 16 ++--
.../authorization/AuthorizationHelper.java | 62 +++++++------
.../server/security/authorization/Users.java | 4 +-
.../internal/InternalTokenClientFilter.java | 4 +-
.../security/encryption/AESEncryptionService.java | 2 +-
.../unsecured/rest/CertificateDownload.java | 8 +-
.../security/unsecured/rest/CertificateSign.java | 16 ++--
.../security/unsecured/rest/ConnectionInfo.java | 8 +-
.../users/CsvFilePersisterService.java | 2 +-
.../users/PostUserCreationHookServerAction.java | 4 +-
.../users/ShellCommandUtilityCallable.java | 2 +-
.../users/ShellCommandUtilityWrapper.java | 4 +-
.../ambari/server/state/cluster/ClusterImpl.java | 5 +-
.../ambari/server/state/cluster/ClustersImpl.java | 2 +-
.../ambari/server/topology/AmbariContext.java | 3 +-
.../ambari/server/topology/PersistedStateImpl.java | 2 +-
.../ambari/server/topology/TopologyManager.java | 2 +-
.../addservice/AddServiceOrchestrator.java | 4 +-
.../topology/addservice/RequestValidator.java | 2 +-
.../addservice/ResourceProviderAdapter.java | 4 +-
.../topology/addservice/StackAdvisorAdapter.java | 2 +-
.../validators/TopologyValidatorService.java | 2 +-
.../server/upgrade/AbstractUpgradeCatalog.java | 3 +-
.../server/upgrade/UpdateAlertScriptPaths.java | 2 +-
.../ambari/server/upgrade/UpgradeCatalog260.java | 4 +-
.../ambari/server/upgrade/UpgradeCatalog270.java | 4 +-
.../ambari/server/upgrade/UpgradeCatalog271.java | 4 +-
.../ambari/server/upgrade/UpgradeCatalog274.java | 2 +-
.../apache/ambari/server/utils/RequestUtils.java | 2 +-
.../server/view/AmbariViewsMDCLoggingFilter.java | 14 +--
.../server/view/RemoteAmbariClusterRegistry.java | 4 +-
.../apache/ambari/server/view/ViewClassLoader.java | 37 ++++++--
.../apache/ambari/server/view/ViewExtractor.java | 2 +-
.../server/view/ViewInstanceOperationHandler.java | 4 +-
.../apache/ambari/server/view/ViewRegistry.java | 7 +-
.../ambari/server/view/ViewThrottleFilter.java | 17 ++--
.../server/view/persistence/DataStoreImpl.java | 10 +-
.../server/view/persistence/DataStoreModule.java | 4 +-
.../src/main/python/ambari_server/serverSetup.py | 11 ++-
.../src/main/python/ambari_server_main.py | 5 +-
.../main/resources/Ambari-DDL-Postgres-CREATE.sql | 2 +-
.../src/main/resources/META-INF/persistence.xml | 2 +-
.../3.0.0/package/scripts/infra_solr.py | 22 ++---
.../3.0.0/package/scripts/params.py | 2 +-
.../BIGTOP/3.2.0/properties/stack_features.json | 5 +
.../services/HDFS/package/scripts/params_linux.py | 3 +
.../services/HDFS/package/scripts/zkfc_slave.py | 4 +-
.../services/HIVE/package/scripts/hive_server.py | 4 +-
.../3.2.0/services/SOLR/package/scripts/params.py | 7 +-
.../3.2.0/services/SOLR/package/scripts/solr.py | 4 +-
.../services/YARN/package/scripts/params_linux.py | 4 +
.../YARN/package/scripts/resourcemanager.py | 4 +-
.../apache/ambari/server/H2DatabaseCleaner.java | 6 +-
.../actionmanager/TestActionDBAccessorImpl.java | 4 +-
.../server/actionmanager/TestActionScheduler.java | 2 +-
.../TestActionSchedulerThreading.java | 2 +-
.../server/api/AmbariCsrfProtectionFilterTest.java | 6 +-
.../ambari/server/api/AmbariErrorHandlerIT.java | 16 ++--
.../ambari/server/api/AmbariErrorHandlerTest.java | 6 +-
.../api/AmbariViewErrorHandlerProxyTest.java | 6 +-
.../server/api/ContentTypeOverrideFilterTest.java | 16 ++--
.../server/api/UserNameOverrideFilterTest.java | 8 +-
.../server/api/query/JpaSortBuilderTest.java | 10 +-
.../server/api/services/ActionServiceTest.java | 4 +-
.../server/api/services/AmbariMetaInfoTest.java | 2 +-
.../server/api/services/BaseRequestTest.java | 8 +-
.../server/api/services/BaseServiceTest.java | 6 +-
.../server/api/services/BlueprintServiceTest.java | 4 +-
.../ClusterKerberosDescriptorServiceTest.java | 4 +-
.../api/services/ClusterPrivilegeServiceTest.java | 4 +-
.../server/api/services/ClusterServiceTest.java | 4 +-
.../services/ClusterStackVersionServiceTest.java | 6 +-
.../server/api/services/ComponentServiceTest.java | 4 +-
.../api/services/ConfigGroupServiceTest.java | 4 +-
.../api/services/ConfigurationServiceTest.java | 4 +-
.../server/api/services/CredentialServiceTest.java | 4 +-
.../server/api/services/DeleteRequestTest.java | 4 +-
.../server/api/services/ExtensionsServiceTest.java | 4 +-
.../server/api/services/FeedServiceTest.java | 4 +-
.../ambari/server/api/services/GetRequestTest.java | 4 +-
.../server/api/services/GroupServiceTest.java | 4 +-
.../api/services/HostComponentServiceTest.java | 4 +-
.../services/HostKerberosIdentityServiceTest.java | 4 +-
.../server/api/services/HostServiceTest.java | 4 +-
.../api/services/HostStackVersionServiceTest.java | 4 +-
.../server/api/services/InstanceServiceTest.java | 4 +-
.../ambari/server/api/services/JobServiceTest.java | 4 +-
.../api/services/LdapSyncEventServiceTest.java | 4 +-
.../server/api/services/LoggingServiceTest.java | 6 +-
.../server/api/services/MpacksServiceTest.java | 4 +-
.../server/api/services/PermissionServiceTest.java | 4 +-
.../server/api/services/PersistServiceTest.java | 4 +-
.../server/api/services/PostRequestTest.java | 4 +-
.../api/services/PreUpgradeCheckServiceTest.java | 4 +-
.../server/api/services/PrivilegeServiceTest.java | 4 +-
.../ambari/server/api/services/PutRequestTest.java | 4 +-
.../server/api/services/QueryPostRequestTest.java | 4 +-
.../api/services/RecommendationServiceTest.java | 4 +-
.../server/api/services/RepositoryServiceTest.java | 4 +-
.../server/api/services/RequestFactoryTest.java | 6 +-
.../api/services/RoleAuthorizationServiceTest.java | 4 +-
.../api/services/RootServiceServiceTest.java | 4 +-
.../server/api/services/ServiceServiceTest.java | 4 +-
.../server/api/services/SettingServiceTest.java | 4 +-
.../server/api/services/StacksServiceTest.java | 4 +-
.../api/services/TargetClusterServiceTest.java | 4 +-
.../api/services/TaskAttemptServiceTest.java | 4 +-
.../api/services/UpgradeItemServiceTest.java | 4 +-
.../server/api/services/ValidationServiceTest.java | 4 +-
.../api/services/ViewSubResourceServiceTest.java | 14 +--
.../server/api/services/WorkflowServiceTest.java | 4 +-
.../services/serializers/JsonSerializerTest.java | 2 +-
.../commands/StackAdvisorCommandTest.java | 12 +--
.../views/ViewDataMigrationServiceTest.java | 2 +-
.../audit/request/DefaultEventCreatorTest.java | 56 +++++++-----
.../server/bootstrap/BootStrapResourceTest.java | 6 +-
.../checks/DatabaseConsistencyCheckHelperTest.java | 4 +-
.../KerberosAdminPersistedCredentialCheckTest.java | 2 +-
.../AmbariServerConfigurationProviderTest.java | 2 +-
.../server/controller/AmbariHandlerListTest.java | 6 +-
.../AmbariManagementControllerImplTest.java | 2 +-
.../controller/AmbariManagementControllerTest.java | 2 +-
.../ambari/server/controller/AmbariServerTest.java | 12 +--
.../controller/AmbariSessionManagerTest.java | 4 +-
.../server/controller/KerberosHelperTest.java | 2 +-
.../ActiveWidgetLayoutResourceProviderTest.java | 2 +-
.../internal/AlertResourceProviderTest.java | 2 +-
.../AmbariPrivilegeResourceProviderTest.java | 2 +-
.../internal/ArtifactResourceProviderTest.java | 2 +-
.../controller/internal/CalculatedStatusTest.java | 2 +-
.../ClusterPrivilegeResourceProviderTest.java | 2 +-
.../GroupPrivilegeResourceProviderTest.java | 2 +-
.../internal/HostResourceProviderTest.java | 2 +-
.../KerberosDescriptorResourceProviderTest.java | 2 +-
.../internal/MpackResourceProviderTest.java | 2 +-
.../PreUpgradeCheckResourceProviderTest.java | 2 +-
.../RoleAuthorizationResourceProviderTest.java | 2 +-
...ComponentConfigurationResourceProviderTest.java | 2 +-
.../StackUpgradeConfigurationMergeTest.java | 2 +-
...erAuthenticationSourceResourceProviderTest.java | 2 +-
.../UserAuthorizationResourceProviderTest.java | 2 +-
.../UserPrivilegeResourceProviderTest.java | 2 +-
.../internal/UserResourceProviderTest.java | 2 +-
.../apache/ambari/server/events/EventsTest.java | 2 +-
.../upgrade/AlertMaintenanceModeListenerTest.java | 2 +-
.../server/ldap/LdapModuleFunctionalTest.java | 2 +-
.../server/metadata/AgentAlertDefinitionsTest.java | 2 +-
.../orm/AmbariJpaLocalTxnInterceptorTest.java | 2 +-
.../apache/ambari/server/orm/OrmTestHelper.java | 2 +-
.../org/apache/ambari/server/orm/TestOrmImpl.java | 4 +-
.../server/orm/dao/AlertDispatchDAOTest.java | 2 +-
.../ambari/server/orm/dao/AlertsDAOCachedTest.java | 4 +-
.../ambari/server/orm/dao/AlertsDAOTest.java | 2 +-
.../server/orm/dao/AmbariConfigurationDAOTest.java | 2 +-
.../ambari/server/orm/dao/BlueprintDAOTest.java | 4 +-
.../apache/ambari/server/orm/dao/GroupDAOTest.java | 4 +-
.../orm/dao/HostComponentDesiredStateDAOTest.java | 2 +-
.../server/orm/dao/HostComponentStateDAOTest.java | 2 +-
.../server/orm/dao/HostRoleCommandDAOTest.java | 2 +-
.../server/orm/dao/KerberosDescriptorDAOTest.java | 2 +-
.../orm/dao/KerberosKeytabPrincipalDAOTest.java | 2 +-
.../ambari/server/orm/dao/PrincipalDAOTest.java | 2 +-
.../server/orm/dao/PrincipalTypeDAOTest.java | 2 +-
.../ambari/server/orm/dao/ResourceDAOTest.java | 2 +-
.../ambari/server/orm/dao/ResourceTypeDAOTest.java | 2 +-
.../apache/ambari/server/orm/dao/UserDAOTest.java | 4 +-
.../ambari/server/orm/dao/ViewInstanceDAOTest.java | 2 +-
.../ambari/server/proxy/ProxyServiceTest.java | 10 +-
.../scheduler/ExecutionScheduleManagerTest.java | 6 +-
.../security/AbstractSecurityHeaderFilterTest.java | 8 +-
.../server/security/AmbariEntryPointTest.java | 6 +-
.../AmbariServerSecurityHeaderFilterTest.java | 2 +-
.../AmbariViewsSecurityHeaderFilterTest.java | 2 +-
.../AbstractAuthenticationProviderTest.java | 2 +-
.../AmbariBasicAuthenticationFilterTest.java | 10 +-
.../AmbariDelegatingAuthenticationFilterTest.java | 10 +-
.../jwt/AmbariJwtAuthenticationFilterTest.java | 8 +-
.../AmbariKerberosAuthenticationFilterTest.java | 10 +-
.../pam/AmbariPamAuthenticationProviderTest.java | 2 +-
.../AmbariAuthorizationFilterTest.java | 10 +-
.../AmbariUserAuthenticationFilterTest.java | 8 +-
.../server/security/authorization/UsersTest.java | 3 +-
.../encryption/SensitiveDataEncryptionTest.java | 2 +-
.../AbstractPrepareKerberosServerActionTest.java | 2 +-
.../ConfigureAmbariIdentitiesServerActionTest.java | 2 +-
.../kerberos/FinalizeKerberosServerActionTest.java | 2 +-
.../kerberos/KerberosServerActionTest.java | 2 +-
.../UpdateKerberosConfigsServerActionTest.java | 2 +-
.../upgrades/AutoSkipFailedSummaryActionTest.java | 2 +-
.../upgrades/ComponentVersionCheckActionTest.java | 2 +-
.../serveraction/upgrades/ConfigureActionTest.java | 2 +-
.../upgrades/CreateAndConfigureActionTest.java | 2 +-
.../upgrades/KerberosKeytabsActionTest.java | 2 +-
.../upgrades/PreconfigureKerberosActionTest.java | 2 +-
.../serveraction/upgrades/UpgradeActionTest.java | 2 +-
.../ambari/server/state/ConfigHelperTest.java | 2 +-
.../state/alerts/AggregateAlertListenerTest.java | 2 +-
.../state/alerts/AlertReceivedListenerTest.java | 2 +-
.../server/state/alerts/InitialAlertEventTest.java | 2 +-
.../server/state/cluster/AlertDataManagerTest.java | 2 +-
.../ambari/server/state/cluster/ClusterTest.java | 2 +-
.../ambari/server/state/cluster/ClustersTest.java | 2 +-
.../KerberosDescriptorUpdateHelperTest.java | 4 +-
.../services/MetricsRetrievalServiceTest.java | 2 +-
.../server/testing/DBInconsistencyTests.java | 4 +-
.../server/testutils/PartialNiceMockBinder.java | 2 +-
.../ambari/server/update/HostUpdateHelperTest.java | 2 +-
.../server/upgrade/UpgradeCatalog251Test.java | 2 +-
.../server/upgrade/UpgradeCatalog252Test.java | 2 +-
.../server/upgrade/UpgradeCatalog260Test.java | 2 +-
.../server/upgrade/UpgradeCatalog270Test.java | 2 +-
.../ambari/server/utils/RequestUtilsTest.java | 2 +-
.../ambari/server/view/ViewThrottleFilterTest.java | 6 +-
.../server/view/configuration/ViewConfigTest.java | 3 +-
.../server/view/persistence/DataStoreImplTest.java | 8 +-
ambari-serviceadvisor/pom.xml | 2 -
ambari-utility/pom.xml | 7 +-
.../apache/ambari/swagger/AmbariSwaggerReader.java | 3 +-
.../ambari/swagger/AmbariSwaggerReaderTest.java | 7 +-
.../ambari/checkstyle/InputRestApiOperation.java | 12 +--
.../ambari/view/examples/AutoClusterService.java | 22 ++---
.../ambari/view/proxy/CalculatorResource.java | 18 ++--
.../ambari/view/cluster/ClusterConfigServlet.java | 12 +--
.../view/cluster/ClusterConfigurationService.java | 14 +--
.../ambari/view/cluster/PropertyService.java | 2 +-
.../apache/ambari/view/cluster/SettingService.java | 14 +--
.../ambari/view/favorite/FavoriteService.java | 22 ++---
.../org/apache/ambari/view/hello/HelloServlet.java | 12 +--
.../apache/ambari/view/hello/HelloController.java | 2 +-
.../apache/ambari/view/phonelist/DataMigrator.java | 2 +-
.../ambari/view/phonelist/PhoneListServlet.java | 12 +--
.../ambari/view/phonelist/PhoneListServlet.java | 12 +--
.../view/property/PropertyValidatorService.java | 22 ++---
.../ambari/view/property/PropertyService.java | 22 ++---
.../ambari/view/restricted/RestrictedResource.java | 8 +-
.../view/restricted/UnrestrictedResource.java | 8 +-
.../apache/ambari/view/simple/SimpleService.java | 22 ++---
ambari-views/pom.xml | 6 +-
.../apache/ambari/view/ViewResourceHandler.java | 6 +-
.../view/utils/ambari/AmbariApiException.java | 4 +-
pom.xml | 2 +-
630 files changed, 3557 insertions(+), 3348 deletions(-)
create mode 100644
ambari-server/src/main/java/org/apache/ambari/server/listeners/WebSocketInitializerListener.java
create mode 100644
ambari-server/src/main/java/org/apache/ambari/server/security/authentication/RequestBodyCachingFilter.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
