Commit Graph

35280 Commits

Author SHA1 Message Date
David Jumani
5aec43949e
api: Remove psudo jobs from listAsyncJobs API (#6564)
Removes psudo job results from the response of the listAsyncJobs API
2022-07-27 14:54:07 +05:30
Rohit Yadav
441edf3ca7
utils: use safer parsing utility across codebase (#6562)
This addresses SonarQube/SonarCloud quality checks to use safer xml
parser to resist potential XXE attacks.

https://sonarcloud.io/organizations/apache/rules?open=java%3AS2755&rule_key=java%3AS2755

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2022-07-27 14:31:51 +05:30
Rohit Yadav
c4c4c71591 cherry-pick ce7c3694c8
This fixes cherry-pick issue, while merging 4.17.0.1 on 4.17 branch

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2022-07-20 16:18:32 +05:30
Rohit Yadav
0899653ce8 cherry-pick b30a4a99d1
Somehow this was failed to be picked up by 4.17.0.1 merge on 4.17 branch

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2022-07-20 16:16:33 +05:30
Harikrishna
2c05b63495
kvm: Fix for Revert volume snapshot (#6527)
This PR fixes the issue #6209 where the snapshot revert operation fails after certain volume operations like Migrate VM with volume / migrate volume / reinstall VM.

The root cause of the issue after these volume operations, the primary storage entry is getting deleted for that volume. We have fixed it here to get the primary datastore entry wrt volume and continue the operation.
2022-07-20 11:34:02 +05:30
Rohit Yadav
d53057314f Merge remote-tracking branch 'origin/4.16' into 4.17 2022-07-18 19:43:14 +05:30
Rohit Yadav
7a3e97d67e Tagging release 4.17.0.1 on branch b30a4a99d1.
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEXtHhEi3F6KSkURLCSEJIIQ7j2IQFAmLRYi0ACgkQSEJIIQ7j
 2ISTWxAAlozJuDMoRnr4D1TDbNCr2hzWSgVn5AK+IZGwnd22OnaZnS7tVQUheTCq
 t9aQgRLb7oUGAzNngHEjDaQBnxlHdLHMKby+QGe+RjX/d9urFoEyHe2xyvCJPkwM
 hFM1uesMqtH/HKwhIL3l8fATGPHlucdhQEZ+XA4bu91IVzxog0gikSnm7SjbaljF
 yYNkn9CgOWtZYFek7lcOM7iuKB79QSdpYxN8PYLpE7esyQSu4KjU4Ekufv1u6Tql
 ILsY5PA5tzzxS7ArfW5PICgSxkXOUIkflBbPHObGgduKw9Q36bmnRM/701lNb2re
 EWE4NMlM2PDn8kKZ2zULD2VBIq5tVdJuZjXbjDyD17z/KiU9pd6hGeHABSitnpDW
 vAS6rLJVY3YT9eqoVDVhpkpFQZmvdfDC8L4nYU2E7dCHj4lF9FlsgYO08SCfSgvP
 InAnfg1jZvbhA9EDL+LiuhxCStn6ZpjRuRCC89hYfRfRM1ZdrT2FazDj8KwPuC0P
 xfEr8eTnMm7xM+B9JCBQ2Lskl3jxQk3KAYQX13LtZCUj05Y1f3crx/iq6t0qIrAH
 PU9keojKMZffLz5MBlFU8qor32stw+uNMky8dZgtDIx6kRjnuYuPYOxpcPDzl+Cs
 KBRcwpIP+GR9mePU8PKBNDClLA45vDE1XqeK6KnOOf7MBSprU5o=
 =ETOD
 -----END PGP SIGNATURE-----

Merge tag '4.17.0.1' into 4.17

Tagging release 4.17.0.1 on branch b30a4a99d1.
2022-07-18 19:40:53 +05:30
Rohit Yadav
4ed1be821c Tagging release 4.16.1.1 on branch b7415bf127.
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEXtHhEi3F6KSkURLCSEJIIQ7j2IQFAmLQBOkACgkQSEJIIQ7j
 2IS+nRAAl8qEGHMCtbh64Uc517UwsATEZwEqm+s5cWrbi6GpkuJ00ITnchgK1QvY
 q9NQudL548oYWB8pvmeql8eeVJFGx4loh8e32GXdW5dNDcmIC/0YZ7VJFokPuHf6
 79GEDfcui5A15mvIL8DyTSHlZd/6x3LKusfM5Nu3f88B75yy1AkfxH8JcVTM8P9/
 ijtVTpy8zWkBWO+nnFUiwRjcQStOwNKd1jHxoapJIpFlNcUZw2DkRlaVIV7uU+ne
 Z7Y4JAJHzvki4ewkl/F5XwkRPiZlEMXVgEAb4dUmt5hg4GCWQvuDvHDio4fQ6Ws1
 CSNdiSV5rKMxa/fcE4l/oxvZ5oGxA7afbyJWo6Y4/s+UENKmZ3LiehkTptuOTSh0
 rgBTUKO7ZPtYuqD6kwaKYoxL431zYRJsdF1TUnts4nJTQQsWn6JlA3oTsX7nxlte
 qdxRtqmE7NTcpNH/+sU8MDKBYaHEqF3VOfzhw5Ta8ztQhebrGMHPJX0i3ypDBAll
 QEVH+cMpIoo5MQZWRFnIeKW/uTZuEZAMcJ8a/AS7gHSjLtiNGJExE5qvVXVnP8Im
 PruZSmk1ZovQ/XbtN0SD0DDS93CppYFH6fJRAeq6yqkEnYUm+dxFkBvEZqp8nr/X
 Z3vySZlH08+iz3fLlpbkGJRZSUfFXYKrGyZjLaFvKIf0FpedfOM=
 =/arX
 -----END PGP SIGNATURE-----

Merge tag '4.16.1.1' into 4.16

Tagging release 4.16.1.1 on branch b7415bf127.
2022-07-18 19:34:32 +05:30
Rohit Yadav
1c7efcbd0d Updating pom.xml version numbers for release 4.17.0.1
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2022-07-15 18:18:40 +05:30
Rohit Yadav
b30a4a99d1 engine/schema: bake-in upgrade path from 4.16.1.1 to 4.17.0.1
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2022-07-15 18:16:45 +05:30
Hoang Nguyen
c09ee40984
Fix can't select schedule interval type in configure backup schedule (#6547) 2022-07-15 17:01:58 +05:30
Rohit Yadav
ce7c3694c8 storpool: fix mvn pom.xml build issue
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2022-07-14 17:36:02 +05:30
Hoang Nguyen
5bc7024af5 ui: add a default value for customColumns (#6462)
Fixes #6459

(cherry picked from commit c6f12f37ee)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2022-07-14 17:31:17 +05:30
Rohit Yadav
f27de63644 saml: Safer DocumentBuilderFactory and ParserPool configuration
This implements safer DocumentBuilderFactory and ParserPool utilities
to be used throughout the codebase to prevent potential XXE exploits.

References:
https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html
https://www.blackhat.com/docs/us-15/materials/us-15-Wang-FileCry-The-New-Age-Of-XXE-java-wp.pdf

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 8e0e68ef368ebe2793ef80e2c3821eaecb47b593)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2022-07-14 17:31:12 +05:30
Rohit Yadav
ebfdef5777 Updating pom.xml version numbers for release 4.16.1.1
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2022-07-14 17:28:08 +05:30
Rohit Yadav
b7415bf127 saml: Safer DocumentBuilderFactory and ParserPool configuration
This implements safer DocumentBuilderFactory and ParserPool utilities
to be used throughout the codebase to prevent potential XXE exploits.

References:
https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html
https://www.blackhat.com/docs/us-15/materials/us-15-Wang-FileCry-The-New-Age-Of-XXE-java-wp.pdf

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 8e0e68ef368ebe2793ef80e2c3821eaecb47b593)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2022-07-14 16:58:08 +05:30
Abhishek Kumar
4b8af6f0fa
test: add, refactor ipv6 network, vpc tests (#6338)
- Refactor IPv6 related tests
- Adds smoke test for IPv4 network to IPv6 upgrade
- Adds smoke test for IPv6 VPC

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
2022-07-12 12:54:53 +05:30
Daniel Augusto Veronezi Salvador
b2cf82e4e9
Filter removed nics while listing LB vm instances (#6430)
Co-authored-by: GutoVeronezi <daniel@scclouds.com.br>
2022-07-11 15:42:17 +05:30
Harikrishna
ab9a0fd69f
Updated log message and throw error when unable to update the secret key file (#6542)
This PR fixes issue #6232 to update the error message and throw the error when updating key file is failed. This helps to find out the proper reason for failure, mainly with umask.
2022-07-09 21:21:11 +05:30
Abhishek Kumar
764ee30ecc
ui: fix zone icon in vm deploy zone selection (#6543)
* ui: fix zone icon in vm deploy zone selection

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

* unnecessary conditions

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
2022-07-08 20:00:04 +05:30
Hoang Nguyen
600d81e345
UI: Fixes some issues from zone wizard with VMWare hypervisor (#6480)
* hide html warning in message

* hidden ip address step

* refill value of edit tariff

* close modal when icon-close clicked

* fixes modal not show when error

* check valid traffic label with VMWare

* remove automatic change clustername
2022-07-08 13:53:12 +05:30
Rohit Yadav
d8da5e650d
kvm: add support nicAdapter detail for vm and template settings for KVM (#6536)
Fixes #6533

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2022-07-07 14:36:36 +05:30
Rohit Yadav
3d316546bf
kvm: skip test that can't run and pass on M1 mac (#6537)
This fixes the build issue on M1 mac/osx.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2022-07-07 14:36:15 +05:30
Abhishek Kumar
67e941f690
cks: fix k8s version upgrade (#6513)
Fixes #6514

On latest systemvm template used for CKS /usr/sbin is not present in the $PATH for normal user used during upgrade. This leads to failure for blkid command. Due to this during k8s version upgrade ISO is not being able to mount on the k8s cluster VMs and upgrade process is not carried out.
This PR fixes mounting of k8s version ISO and also returns failure for script when ISO mounting is failed.
Same failure is not seen during deployment of the cluster because setup-kube-system workflow is executed as ROOT user and it has a different value for $PATH.
From /etc/login.defs:

ENV_SUPATH	PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV_PATH	PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
2022-07-06 12:34:49 +05:30
Hoang Nguyen
9e5cda59ce
UI: Add authmethod field allowing to choose password or ssh key when adding host (#6525)
* add authmethod to addhost in zone wizard

* add a condition for hiding password field

* set default value when switch hypervisor

* add more value for authmethod
2022-07-06 12:16:09 +05:30
Luis Moreira
c6b611433b
saml: Fix SAML SSO plugin redirect URL (#6457)
This PR fixes the issue #6427 -> SAML request must be appended to an IdP URL as a query param with an ampersand, if the URL already contains a question mark, as opposed to always assume that IdP URLs don't have any query params.
Google's IdP URL for instance looks like this: https://accounts.google.com/o/saml2/idp?idpid=<ID>, therefore the expected redirect URL would be https://accounts.google.com/o/saml2/idp?idpid=<ID>&SAMLRequest=<SAMLRequest>

This code change is backwards compatible with the current behaviour.
2022-07-06 09:28:37 +05:30
Abhishek Kumar
f1bce69b5d
ui: allow instances to be filtered by group (#6495)
Fixes #6428

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
2022-07-06 09:26:31 +05:30
Harikrishna
2c49d714b5
scripts: Excluded fe80 or link local address in keystore setup (#6530)
This PR fixes the issue #6471 where in keystore setup does not exclude link-local addresses.

We have fixed the keystore setup process to exclude the fe80 or link local addresses
2022-07-06 09:20:13 +05:30
Abhishek Kumar
6ec06aecd7
refactor: new line, lint error fix (#6529)
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
2022-07-05 20:27:40 +05:30
John Bampton
7d23a0a759
Fix spelling (#6272) 2022-07-05 09:08:53 +02:00
Hoang Nguyen
8a229baac5
clear all filter values after the reset button clicked (#6503) 2022-07-01 23:38:52 -03:00
Joรฃo Jandre
e467ad02ce
Fix VMware memory retrieval (#6414)
* Fix VMware memory retrieval

* Address review

Co-authored-by: Joao <JoaoJandre@gitlab.com>
2022-07-01 23:36:40 -03:00
Rohit Yadav
85df82c2a9 Revert ".github: try using just sonarcloud job on pull_request target only"
This reverts commit aad73322af.
2022-07-01 11:25:27 +05:30
Harikrishna
637a102922
Fix for VMware VM migration with volume in local storage (#6483)
* Fix VMware VM migration with volume in case of local storage

* Break the loop once target host is found

* Code optimisations in getting the target host guid for local storage

* Fixed code smells and added unit test
2022-07-01 10:39:02 +05:30
Harikrishna
2326164c17
api: Added information about deviceid 0 to attach root volume to VM (#6518)
This is in the workflow of attaching and detaching a root volume of a VM. We can detach the root volume from a VM and Cloudstack marks it as datadisk. We can reattach the volume to make it root volume again. During attach Device ID 0 has to be passed so that the volume will be converted back to ROOT again

Added a small information in the DeviceID section in Attach volume form.
2022-06-30 17:36:42 +05:30
Rohit Yadav
aad73322af .github: try using just sonarcloud job on pull_request target only
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2022-06-30 15:27:20 +05:30
Rohit Yadav
20420c4907 Merge remote-tracking branch 'origin/4.16' into 4.17 2022-06-30 12:16:05 +05:30
Hoang Nguyen
3753772ece
UI: Remove unused dependencies and fix travis build (#6142)
* remove unused dependencies and fix travis build

* fixes

* revert node-sass

* update package-lock.json
2022-06-30 12:12:26 +05:30
Wei Zhou
a9a2aa953c
CKS: add created to k8s cluster and k8s version (#6446)
This PR adds created info to the response of kubernetes clusters and kubernetes supported version.
2022-06-30 12:03:12 +05:30
Wei Zhou
ae46c33b65
server: update lb rule with new protocol (#6476)
* server: update lb rule with new protocol

* Update PR #4746: use StringUtils.isNotBlank() instead
2022-06-30 12:02:09 +05:30
Harikrishna
089e9647f1
Fix global setting reference for max secondary storage (#6496)
* Fix global setting reference for max secondary storage usage based on account or project

* Changed a variable naming

* Replaced config enum usage with configkey class for global settings

* Fixed grammar mistake

* Fixed code smells
2022-06-30 11:42:58 +05:30
hooklee2000
aee7bb9e34
UI fix message.add.vpn.customer.gateway.failed when catched error (#6493)
* UI fix message.add.vpn.customer.gateway.failed when catched error

* fix UI VPC add ACL  without required input  close ui 

Without any input, click ok button then close the ui . We need display ui to confirm all required input.

* remove commented line
2022-06-28 10:53:25 +05:30
Hoang Nguyen
739be5d002
UI: Change notification title when resizing volume (#6502)
* fixes resize volume message

* Update ui/public/locales/en.json

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

* Update ui/src/views/storage/ResizeVolume.vue

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
2022-06-28 10:50:48 +05:30
Wei Zhou
dd3bd21fab
UI: fix create tags for LB rules (#6475) 2022-06-27 14:24:55 +02:00
Suresh Kumar Anaparti
c70bc9d69c
kvm: Updated PowerFlex/ScaleIO storage plugin to support separate (storage) network for Hosts(KVM)/Storage connection. (#6367)
This PR enhances the existing PowerFlex/ScaleIO storage plugin to support separate (storage) network for Hosts(KVM)/Storage connection, mainly the SDC (ScaleIo Data Client) connection.
2022-06-27 14:42:51 +05:30
Nicolas Vazquez
14c5250267
Fix rpfilter config values from integer to boolean on upgrade path (#6477)
* Fix rpfilter config values from integer to boolean on upgrade path

* Update engine/schema/src/main/resources/META-INF/db/schema-41700to41710.sql

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

* Update engine/schema/src/main/resources/META-INF/db/schema-41700to41710.sql

Co-authored-by: Rohit Yadav <rohityadav89@gmail.com>
Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
2022-06-23 09:18:24 -03:00
Abhishek Kumar
708382f965
ui: fix ui hang on offering creation with no zone (#6484)
Fixes UI hang issue when offering is created when there is no zone.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
2022-06-23 13:44:12 +05:30
Peinthor Rene
355fdaa821
ui: primarystorage linstor fixes (#6481)
If Linstor protocol is selected it makes no sense to show other
providers as Linstor only works with the Linstor provider.
And also the install wizard doesn't use the correct provider for linstor.

This changes were already merged for 4.16.1.0 see: #5672
But I don't know why they weren't merged to main back than, maybe I don't know how cloudstack's
merge/PR's work.
But this should be definitely merged to 4.17.* and main
2022-06-22 18:54:02 +05:30
Rohit Yadav
f818ecc17d
kvm: upgrade libvirt-java to v0.5.3 (#6472)
* kvm: upgrade libvirt-java to v0.5.3
* add libvirt.org maven repo

Reference: https://gitlab.com/libvirt/libvirt-java/-/issues/6

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2022-06-22 18:43:28 +05:30
Hoang Nguyen
15c4dcfa44
ui: add groupAction for upgrade router to use newer template (#6468)
Fixes #6466
2022-06-20 12:56:52 +05:30