This is an automated email from the ASF dual-hosted git repository.

DaanHoogland pushed a change to branch healthcheck-4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


    omit a062b5a5a80 4.20 Health Check, please don't merge this!
     add c6936889f5c server: prevent adding vm compute details when not 
applicable (#12637)
     add 1fc4cb90bff Routed VR: accept packets from related and established 
connections (#12986)
     add 9f96c9d5eb9 Flexibilize public IP selection (#11076)
     add 08b1d387557 adaptive: honor user-provided capacityBytes when provider 
stats are unavailable (#13059)
     add a7c2a059f5d Update mysql java connector version to 8.4.0 (matching 
version for MySQL 8.4) (#12640)
     add c165806d3b8 Fix VPC network offerings listing in isolated network 
creation form (#12645)
     add c267ad39bcd Fix/flasharray delete rename destroy patch conflict 
(#13049)
     add ff9ee24d125 Fix local upload from browser failing due to ssvm cert not 
trusted (#13204)
     add b642bbe38e1 Fix the validation of CPVMs states in multiple zones 
(#13021)
     add 357186d64d0 flasharray: fall back to array capacity when pod has no 
quota (#13050)
     add a3970bb1530 Fix convert command's timeout for snapshot commands 
(#13210)
     add 7bc458ff85e Fix for usage server getting stuck due to duplicate VM 
events (#13019)
     add d35c1cd3ffe Remove the duplicate configkey json.content.type (#13264)
     add 0bbea200626 server: fix NPE when migrate vm away with volumes (#13131)
     add b26b70c40d6 Fix public IP range addition form (#13356)
     add 4244c2cc102 UI: Allow selecting network for VNF nics if template is a 
non deploy-as-is template (#13423)
     add 78d9cb5abd6 dynamic vm.network.throttling.rate global configuration 
(#12567)
     add b36f06482fa fix misleading error message (#13450)
     add 2eb9820f3cb framework-jobs,server: fix password obfuscation for job 
result and password with display=false (#13388)
     add c8b7816d5ee marvin: install mysql-connector-python >= 8.4.0 (#13482)
     add a4b102fb3f9 Fix skip DRS for a VM (#12994)
     add ec2d3ea1e6d Fix `findHostsForMigration` never returning hosts from 
other clusters (#13452)
     add e8df87e89be flasharray: authenticate via REST 2.x api-token and 
discover API version (#13060)
     add 549daae01ff correction in vpc limit assignment (#13627)
     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 63fd982f49f 4.20 Health Check, please don't merge this!

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (a062b5a5a80)
            \
             N -- N -- N   refs/heads/healthcheck-4.20 (63fd982f49f)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .github/workflows/ci.yml                           |   2 +-
 .../org/apache/cloudstack/api/ApiArgValidator.java |  73 +++++-
 .../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/DomainResponse.java    |   2 +-
 .../cloudstack/api/response/HostTagResponse.java   |   6 +-
 .../direct/download/DirectDownloadManager.java     |  10 +
 .../user/userdata/DeleteUserDataCmdTest.java       |  31 ++-
 .../template/MetalinkTemplateDownloader.java       |   7 +
 .../directdownload/DirectDownloadCommand.java      |  11 +-
 .../direct/download/DirectDownloadHelper.java      |   5 +-
 .../download/MetalinkDirectTemplateDownloader.java |  55 +++-
 .../download/NfsDirectTemplateDownloader.java      |  79 +++++-
 .../download/NfsDirectTemplateDownloaderTest.java  |  73 ++++++
 .../service/NetworkOrchestrationService.java       |   3 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   6 +-
 .../engine/orchestration/NetworkOrchestrator.java  |   2 +-
 .../java/com/cloud/host/dao/HostTagsDaoImpl.java   |   1 -
 .../cloud/network/dao/PublicIpQuarantineDao.java   |  12 +
 .../network/dao/PublicIpQuarantineDaoImpl.java     |  22 ++
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |   4 +-
 ...e42020to42030.java => Upgrade42030to42040.java} |  22 +-
 .../resourcedetail/ResourceDetailsDao.java         |   2 +
 .../resourcedetail/ResourceDetailsDaoBase.java     |  14 +
 engine/storage/snapshot/pom.xml                    |   4 +-
 .../framework/config/impl/ConfigDepotImpl.java     |  11 +-
 framework/db/pom.xml                               |   4 +-
 .../framework/jobs/AsyncJobDataHelper.java         | 150 +++++++++++
 .../framework/jobs/impl/AsyncJobManagerImpl.java   |  44 ++--
 .../cloudstack/framework/jobs/impl/AsyncJobVO.java |  22 +-
 .../framework/jobs/AsyncJobDataHelperTest.java     | 249 ++++++++++++++++++
 .../framework/jobs/AsyncJobManagerTest.java        |  18 ++
 packaging/systemd/cloudstack-management.default    |   2 +-
 packaging/systemd/cloudstack-usage.default         |   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 +++++++
 .../LibvirtRestoreBackupCommandWrapper.java        |  66 +++--
 .../kvm/storage/KVMStorageProcessor.java           |   2 +-
 .../org/apache/cloudstack/utils/qemu/QemuImg.java  |   6 +-
 plugins/network-elements/globodns/pom.xml          |   4 +-
 plugins/network-elements/tungsten/pom.xml          |   4 +-
 .../lifecycle/AdaptiveDataStoreLifeCycleImpl.java  |  13 +-
 .../adapter/flasharray/FlashArrayAdapter.java      | 289 ++++++++++++++++-----
 .../api/response/LdapConfigurationResponse.java    |  16 +-
 .../apache/cloudstack/ldap/LdapManagerImpl.java    |  24 +-
 .../oauth2/api/command/ListOAuthProvidersCmd.java  |  52 +++-
 .../oauth2/google/GoogleOAuth2Provider.java        | 121 ++++++---
 .../oauth2/google/GoogleOAuth2ProviderTest.java    | 177 +++++++------
 .../api/command/SAML2LoginAPIAuthenticatorCmd.java |  78 ++++--
 pom.xml                                            |  12 +-
 server/src/main/java/com/cloud/api/ApiServer.java  |  19 +-
 server/src/main/java/com/cloud/api/ApiServlet.java |  20 +-
 .../com/cloud/api/dispatch/ParamProcessWorker.java |   6 +
 .../java/com/cloud/api/query/QueryManagerImpl.java |  63 ++++-
 .../com/cloud/api/query/vo/AsyncJobJoinVO.java     |   3 +-
 .../main/java/com/cloud/configuration/Config.java  |   9 -
 .../configuration/ConfigurationManagerImpl.java    |   2 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   9 +-
 .../com/cloud/dc/dao/DedicatedResourceDao.java     |   6 +
 .../com/cloud/dc/dao/DedicatedResourceDaoImpl.java |  12 +
 .../com/cloud/network/IpAddressManagerImpl.java    |  91 ++++---
 .../network/element/VirtualRouterElement.java      |  24 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |  57 +++-
 .../com/cloud/server/ManagementServerImpl.java     |  69 ++---
 .../main/java/com/cloud/server/StatsCollector.java |  14 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |  16 +-
 .../com/cloud/template/TemplateManagerImpl.java    |  26 +-
 .../java/com/cloud/user/AccountManagerImpl.java    |   8 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  97 ++++---
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |  10 +-
 .../cloudstack/acl/ProjectRoleManagerImpl.java     |  17 +-
 .../annotation/AnnotationManagerImpl.java          |   9 +-
 .../cloudstack/backup/BackupManagerImpl.java       |   2 +-
 .../cloudstack/cluster/ClusterDrsServiceImpl.java  |  34 ++-
 .../diagnostics/DiagnosticsServiceImpl.java        |  37 ++-
 .../direct/download/DirectDownloadManagerImpl.java |  27 +-
 .../cloud/api/dispatch/ParamProcessWorkerTest.java |  20 ++
 .../com/cloud/api/query/QueryManagerImplTest.java  | 232 +++++++++++++++++
 .../java/com/cloud/hypervisor/KVMGuruTest.java     |  50 ++--
 .../com/cloud/network/IpAddressManagerTest.java    |   1 +
 .../cloud/resource/ResourceManagerImplTest.java    |  90 +++++++
 .../com/cloud/server/ManagementServerImplTest.java |  61 +++--
 .../java/com/cloud/server/StatsCollectorTest.java  |  43 +++
 .../cloud/template/TemplateManagerImplTest.java    |  65 +++++
 .../com/cloud/user/AccountManagerImplTest.java     |  33 ++-
 .../java/com/cloud/vm/UserVmManagerImplTest.java   | 151 +++++++++--
 .../cloudstack/acl/ProjectRoleManagerImplTest.java | 245 +++++++++++++++++
 .../cluster/ClusterDrsServiceImplTest.java         |  46 ++--
 .../diagnostics/DiagnosticsServiceImplTest.java    | 133 ++++++++++
 .../consoleproxy/ConsoleProxyNoVNCServer.java      |  10 +-
 setup/db/deploy-db-dev.sh                          |   5 +-
 systemvm/debian/opt/cloud/bin/cs/CsDhcp.py         |  67 ++++-
 systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py    |   2 +
 test/integration/smoke/test_quarantined_ips.py     |   8 +-
 test/integration/smoke/test_webhook_delivery.py    |  67 ++++-
 test/integration/smoke/test_webhook_lifecycle.py   |  83 +++++-
 tools/docker/Dockerfile                            |   2 +-
 tools/marvin/setup.py                              |   2 +-
 ui/package.json                                    |   2 +-
 ui/public/locales/en.json                          |   6 +
 ui/public/locales/pt_BR.json                       |   1 +
 ui/src/config/section/compute.js                   |   3 +-
 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/style/vars.less                             |   2 +-
 ui/src/utils/{permissions.js => ssvmProbe.js}      |  13 +-
 ui/src/utils/util.js                               |   9 +
 ui/src/views/compute/wizard/VnfNicsSelection.vue   |   2 +-
 ui/src/views/image/RegisterOrUploadIso.vue         |  50 +++-
 ui/src/views/image/RegisterOrUploadTemplate.vue    |  45 +++-
 ui/src/views/infra/network/IpRangesTabPublic.vue   |   4 +
 ui/src/views/network/CreateIsolatedNetworkForm.vue |  28 +-
 ui/src/views/storage/UploadLocalVolume.vue         | 133 ++++++----
 .../java/com/cloud/usage/UsageSanityChecker.java   |   2 +-
 .../src/main/java/com/cloud/utils/StringUtils.java |  23 ++
 utils/src/main/java/com/cloud/utils/UriUtils.java  | 145 ++++++++++-
 136 files changed, 4302 insertions(+), 882 deletions(-)
 create mode 100644 
core/src/test/java/org/apache/cloudstack/direct/download/NfsDirectTemplateDownloaderTest.java
 copy 
engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade42020to42030.java => 
Upgrade42030to42040.java} (71%)
 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
 copy ui/src/utils/{permissions.js => ssvmProbe.js} (69%)

Reply via email to