This is an automated email from the ASF dual-hosted git repository.
Pearl1594 pushed a change to branch fix-ssvm-migrate-stgNet
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from edbda62f16b Create bridge on dest host during SSVM migration when
using storage networks with dedicated vlan
add f8a3762f076 do not send jetty version on failure to start (#13744)
add 69fc541737e server: ignore projectid=-1 for finding owner (#12695)
add 1e5d534c3ca guard against stopping stats background threads (#13659)
add 2bc8d299733 Don't allow adding of existing host to another zone, pod
or cluster (#13182)
add 5432a04ae6e Ensure VM IP is removed from VR DHCP records in
dnsmasq.leases after expunge VM (#13194)
add 18c1a30028d Allow only authorized users to add and list entity's
annotations
add 30e6abb63fb Restrict domain admin access to project roles within their
own domain and add tests to cover perm check for proj role permissions
add 4ae69bc7fd3 Restrict listHostTags to hosts dedicated to the caller's
domain (including sub-domains and accounts in a domain)
add e6640803ed9 webhook: improve deliveries access
add bbd37271c62 Validate URL before obtaining remote size
add 19d31cf6faf ldap: improve config access
add 57a2b4d5051 server: fix access for disable user 2fa
add 113ccb28e3b Upgrade axios to 0.31.1 which has the config merge fix
add 3eb928bc72d Escape HTML in username, VM display name and diagnostics
output
add 07e09db0af5 Fix issue in direct download and NFS templates
add 7c872a988ac api,server: improve async job storage
add 5b325dd49e4 Prevent command injections in get/run diagnostics API
add f320f552c33 oauth2: improve list providers api for access
add b17edb538e0 oauth2: improve google provider flow
add 9781fb906a7 api,server,kvm: improve backup repository mount handling
add ea75dc3c437 Fix database connection leak
add 2c7f13b709f webhook: additional check for payload url
add 04598336311 saml: reject signed SAMLResponse when IdP has no signing
certificate registered
add 8985a1fc7c2 add access validation for the deleteUserData,
linkUserDataToTemplate and resetUserDataForVirtualMachine APIs
add 6136ac93854 api: add ACL on ApiConstants.USER_DATA_ID
add 5b49d6aa3f7 Errorprone static analysis tool integration and fixes of
reported issues (#12419)
add b09005faaa9 UI: make serviceofferingid optional when add network
offering (#13502)
add 3dc23056b73 server: fix lastpinged of hosts (#13030)
add b75d8a7c75b Merge branch '4.20' into fix-ssvm-migrate-stgNet
No new revisions were added by this update.
Summary of changes:
.github/linters/codespell.txt | 1 +
.../java/com/cloud/agent/mockvm/MockVmMgr.java | 2 +-
.../org/apache/cloudstack/api/ApiArgValidator.java | 73 +++++-
.../admin/backup/UpdateBackupOfferingCmd.java | 4 +-
.../admin/vm/ResetVMPasswordCmdByAdmin.java | 2 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 2 +
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 1 +
.../backup/repository/AddBackupRepositoryCmd.java | 4 +-
.../command/user/userdata/DeleteUserDataCmd.java | 17 +-
.../user/userdata/LinkUserDataToTemplateCmd.java | 3 +
.../api/command/user/vm/DeployVMCmd.java | 1 +
.../api/command/user/vm/ResetVMPasswordCmd.java | 2 +-
.../api/command/user/vm/ResetVMUserDataCmd.java | 1 +
.../api/command/user/vm/UpdateVMCmd.java | 1 +
.../cloudstack/api/response/HostTagResponse.java | 6 +-
.../direct/download/DirectDownloadManager.java | 10 +
.../com/cloud/network/IsolationMethodTest.java | 2 +-
.../user/userdata/DeleteUserDataCmdTest.java | 31 ++-
.../facade/AbstractConfigItemFacade.java | 2 +-
.../com/cloud/network/HAProxyConfigurator.java | 2 +-
.../java/com/cloud/resource/RequestWrapper.java | 2 +-
.../template/MetalinkTemplateDownloader.java | 7 +
.../directdownload/DirectDownloadCommand.java | 12 +-
.../direct/download/DirectDownloadHelper.java | 5 +-
.../download/MetalinkDirectTemplateDownloader.java | 55 ++++-
.../download/NfsDirectTemplateDownloader.java | 79 ++++++-
.../com/cloud/resource/ServerResourceBaseTest.java | 23 +-
.../download/NfsDirectTemplateDownloaderTest.java | 73 ++++++
.../java/com/cloud/agent/manager/AgentAttache.java | 9 +-
.../cloud/agent/manager/DirectAgentAttache.java | 5 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 8 +-
.../engine/orchestration/NetworkOrchestrator.java | 2 +-
.../agent/manager/ConnectedAgentAttacheTest.java | 6 +-
.../java/com/cloud/host/dao/HostTagsDaoImpl.java | 1 -
.../com/cloud/offerings/NetworkOfferingVO.java | 2 +-
.../upgrade/SystemVmTemplateRegistration.java | 59 +++--
.../cloud/upgrade/dao/DatabaseAccessObject.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade41500to41510.java | 79 +++----
.../cloud/network/as/AutoScaleVmProfileVOTest.java | 22 +-
.../upgrade/SystemVmTemplateRegistrationTest.java | 1 +
.../vmsnapshot/ScaleIOVMSnapshotStrategy.java | 2 +-
.../storage/endpoint/DefaultEndPointSelector.java | 8 +-
.../framework/config/impl/ConfigDepotImpl.java | 11 +-
.../java/com/cloud/utils/db/GenericDaoBase.java | 4 +-
.../framework/serializer/OnwireClassRegistry.java | 2 +-
.../framework/jobs/AsyncJobDataHelper.java | 150 +++++++++++++
.../framework/jobs/impl/AsyncJobManagerImpl.java | 48 ++--
.../cloudstack/framework/jobs/impl/AsyncJobVO.java | 22 +-
.../framework/jobs/AsyncJobDataHelperTest.java | 249 +++++++++++++++++++++
.../framework/jobs/AsyncJobManagerTest.java | 2 -
.../factory/ModuleBasedContextFactoryTest.java | 3 +-
.../cloudstack/ca/provider/RootCAProvider.java | 2 +-
.../mom/webhook/WebhookApiServiceImpl.java | 79 ++++---
.../mom/webhook/WebhookDeliveryThread.java | 117 ++++++++--
.../cloudstack/mom/webhook/WebhookService.java | 38 +++-
.../cloudstack/mom/webhook/WebhookServiceImpl.java | 61 ++++-
.../mom/webhook/WebhookUrlValidator.java | 123 ++++++++++
.../mom/webhook/dao/WebhookDeliveryDao.java | 3 +-
.../mom/webhook/dao/WebhookDeliveryDaoImpl.java | 14 +-
.../mom/webhook/dao/WebhookDeliveryJoinDao.java | 6 +-
.../webhook/dao/WebhookDeliveryJoinDaoImpl.java | 9 +-
.../mom/webhook/WebhookApiServiceImplTest.java | 198 +++++++++++++++-
.../mom/webhook/WebhookDeliveryThreadTest.java | 7 +
.../mom/webhook/WebhookUrlValidatorTest.java | 100 +++++++++
.../main/java/com/cloud/ha/HypervInvestigator.java | 2 +-
.../test/HypervDirectConnectResourceTest.java | 3 +
.../kvm/resource/LibvirtComputingResource.java | 6 +-
.../LibvirtRestoreBackupCommandWrapper.java | 66 +++---
.../kvm/storage/KVMStorageProcessor.java | 4 +-
.../kvm/storage/MultipathSCSIAdapterBase.java | 12 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 3 +
.../kvm/storage/ScaleIOStoragePoolTest.java | 2 +
.../hypervisor/ovm3/objects/ConnectionTest.java | 2 +-
.../com/cloud/hypervisor/ovm3/objects/NtpTest.java | 2 +
.../vmware/VmwareDatacenterApiUnitTest.java | 15 +-
.../java/com/cloud/hypervisor/XenServerGuru.java | 7 +-
.../xenserver/resource/CitrixResourceBaseTest.java | 3 +
.../guru/BrocadeVcsGuestNetworkGuruTest.java | 2 -
.../network/cisco/CiscoVnmcConnectionTest.java | 3 +-
.../network/resource/CiscoVnmcResourceTest.java | 3 +
.../guru/NiciraNvpGuestNetworkGuruTest.java | 6 -
.../com/cloud/network/nicira/NiciraNvpApiIT.java | 2 -
.../cloudstack/agent/api/NsxNetworkCommand.java | 2 +-
.../AddTungstenFabricPolicyRuleCmdTest.java | 2 +
.../CreateTungstenFabricFirewallRuleCmdTest.java | 2 +
.../CreateTungstenFabricProviderCmdTest.java | 2 +
.../command/DeleteTungstenFabricTagCmdTest.java | 2 +
.../command/RemoveTungstenFabricTagCmdTest.java | 2 +
.../driver/redfish/RedfishWrapper.java | 2 +-
.../datastore/util/NexentaStorAppliance.java | 13 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 2 +-
.../storage/motion/StorPoolDataMotionStrategy.java | 2 +-
.../api/response/LdapConfigurationResponse.java | 16 +-
.../cloudstack/ldap/ADLdapUserManagerImpl.java | 1 +
.../apache/cloudstack/ldap/LdapManagerImpl.java | 24 +-
.../cloudstack/ldap/OpenLdapUserManagerImpl.java | 7 +-
.../ldap/LdapDirectoryServerConnectionTest.java | 3 +
.../ldap/LdapUnboundidZapdotConnectionTest.java | 3 +
.../oauth2/api/command/ListOAuthProvidersCmd.java | 52 ++++-
.../oauth2/google/GoogleOAuth2Provider.java | 121 ++++++----
.../oauth2/google/GoogleOAuth2ProviderTest.java | 177 ++++++++-------
.../api/command/SAML2LoginAPIAuthenticatorCmd.java | 78 ++++---
server/src/main/java/com/cloud/api/ApiServer.java | 4 +-
.../com/cloud/api/dispatch/ParamProcessWorker.java | 6 +
.../java/com/cloud/api/doc/ApiXmlDocWriter.java | 2 +-
.../src/main/java/com/cloud/api/doc/Argument.java | 12 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 63 +++++-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 2 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 3 +-
.../com/cloud/api/query/vo/AsyncJobJoinVO.java | 3 +-
.../configuration/ConfigurationManagerImpl.java | 2 +-
.../com/cloud/dc/dao/DedicatedResourceDao.java | 6 +
.../com/cloud/dc/dao/DedicatedResourceDaoImpl.java | 12 +
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 4 +-
.../com/cloud/network/IpAddressManagerImpl.java | 2 +-
.../com/cloud/resource/ResourceManagerImpl.java | 55 +++++
.../com/cloud/server/ManagementServerImpl.java | 2 +-
.../main/java/com/cloud/server/StatsCollector.java | 14 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 18 +-
.../com/cloud/template/TemplateManagerImpl.java | 26 ++-
.../java/com/cloud/user/AccountManagerImpl.java | 8 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 14 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 10 +-
.../cloudstack/acl/ProjectRoleManagerImpl.java | 17 +-
.../annotation/AnnotationManagerImpl.java | 9 +-
.../diagnostics/DiagnosticsServiceImpl.java | 37 ++-
.../direct/download/DirectDownloadManagerImpl.java | 27 ++-
.../cloudstack/network/RoutedIpv4ManagerImpl.java | 8 +-
.../gslb/GlobalLoadBalancingRulesServiceImpl.java | 11 +-
.../cloud/api/dispatch/ParamProcessWorkerTest.java | 20 ++
.../com/cloud/api/query/QueryManagerImplTest.java | 233 +++++++++++++++++++
.../ConfigurationManagerImplTest.java | 1 +
.../deploy/DeploymentPlanningManagerImplTest.java | 57 ++---
.../cloud/network/as/AutoScaleManagerImplTest.java | 5 +-
.../cloud/resource/ResourceManagerImplTest.java | 90 ++++++++
.../java/com/cloud/server/StatsCollectorTest.java | 43 ++++
.../template/HypervisorTemplateAdapterTest.java | 2 +
.../cloud/template/TemplateManagerImplTest.java | 67 ++++++
.../com/cloud/user/AccountManagerImplTest.java | 33 ++-
.../java/com/cloud/user/DomainManagerImplTest.java | 7 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 2 +-
.../test/java/com/cloud/vm/UserVmManagerTest.java | 3 +
.../cloud/vm/snapshot/VMSnapshotManagerTest.java | 7 +-
.../cloudstack/acl/ProjectRoleManagerImplTest.java | 245 ++++++++++++++++++++
.../diagnostics/DiagnosticsServiceImplTest.java | 133 +++++++++++
.../deployment/RouterDeploymentDefinitionTest.java | 2 +-
.../rdpclient/ntlmssp/ServerNtlmsspChallenge.java | 5 +-
.../src/main/java/streamer/ByteBuffer.java | 2 +-
.../src/test/java/streamer/ByteBufferTest.java | 1 +
.../consoleproxy/ConsoleProxyNoVNCServer.java | 10 +-
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 67 +++++-
test/integration/smoke/test_webhook_delivery.py | 67 +++++-
test/integration/smoke/test_webhook_lifecycle.py | 83 ++++++-
ui/package.json | 2 +-
ui/public/locales/en.json | 1 +
ui/src/config/section/compute.js | 3 +-
ui/src/config/section/infra/hosts.js | 2 +-
ui/src/config/section/infra/routers.js | 3 +-
ui/src/config/section/infra/systemVms.js | 3 +-
ui/src/config/section/network.js | 3 +-
ui/src/config/section/user.js | 3 +-
ui/src/utils/util.js | 9 +
ui/src/views/offering/AddNetworkOffering.vue | 1 -
.../src/main/java/com/cloud/utils/StringUtils.java | 23 ++
utils/src/main/java/com/cloud/utils/UriUtils.java | 145 +++++++++++-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 8 +-
166 files changed, 3619 insertions(+), 682 deletions(-)
create mode 100644
core/src/test/java/org/apache/cloudstack/direct/download/NfsDirectTemplateDownloaderTest.java
create mode 100644
framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/AsyncJobDataHelper.java
create mode 100644
framework/jobs/src/test/java/org/apache/cloudstack/framework/jobs/AsyncJobDataHelperTest.java
create mode 100644
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookUrlValidator.java
create mode 100644
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/WebhookUrlValidatorTest.java
create mode 100644
server/src/test/java/org/apache/cloudstack/acl/ProjectRoleManagerImplTest.java
