26046 Commits

Author SHA1 Message Date
Rohit Yadav
4eafdccc3d Merge remote-tracking branch 'resmo/fix/deleteisoapi'
This closes #63

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-14 16:33:21 +05:30
Pierre-Yves Ritschard
9b4e39e837 Use constant-time comparison functions when checking signatures
This limits the likeliness of timing attacks against the API.
See http://codahale.com/a-lesson-in-timing-attacks/ for the
full rationale.

Conflicts:
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/user/AccountManagerImpl.java
2015-01-14 11:32:29 +01:00
Rohit Yadav
185f7e0152 CLOUDSTACK-8155: Remove unwanted whitespaces from json response
This removes extra whitespaces from the JSON serialized response.
After the fix, tested to work with:
- Present UI
- CloudMonkey
- Old buggy json parsers

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 921ad057def3015cda9d9f5861c9be29a88b148e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-14 02:43:54 +05:30
Rohit Yadav
b7b3a4fb3c CLOUDSTACK-8037: Require signed AuthnRequest, adds more security
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 6bec69844d196e9b66fffa54f6998d8e45fc27e8)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-14 02:43:48 +05:30
René Moser
07d96aab84 CLOUDSTACK-8154: fix UI for API change
Signed-off-by: René Moser <mail@renemoser.net>
2015-01-13 16:34:04 +01:00
René Moser
c7ebd13d02 CLOUDSTACK-8154: Fix typo in response name string: there is an extra 's'
Signed-off-by: René Moser <mail@renemoser.net>
2015-01-13 16:23:31 +01:00
Ashutosh K
9f55411295 CLOUDSTACK-8143: Corrected a test in BVT test_routers.py 2015-01-13 16:37:56 +05:30
Gaurav Aradhye
f11e570796 CLOUDSTACK-8145: Adding new test to test blocker bugs and modifying other test case to work around the bug
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-01-13 15:15:10 +05:30
Ashutosh K
9056e4c3fb CLOUDSTACK-8147: Fixed typo in test case test_redundant_router.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-01-13 15:13:59 +05:30
Ashutosh K
d0b6234e51 CLOUDSTACK-8149: Code-refactor - test_VirtualRouter_alerts.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-01-13 15:13:06 +05:30
Gaurav Aradhye
d79837b67a CLOUDSTACK-8152: Adding delay before creating snapshot/template from root disk after writing data to disk - test_vm_passwordenabled.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-01-13 15:09:58 +05:30
Daan Hoogland
06d4458d0a CID-1256275 regression: resource leak in systemvm update code 2015-01-12 20:40:01 +01:00
Daan Hoogland
9239f93a7d CID-1257434 try with resource 2015-01-12 20:37:21 +01:00
Rohit Yadav
1a7f76ac77 CLOUDSTACK-8037: Fix attribute detection, tested to work with onelogin.com
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 23de431f96e1dad8a21055ac98926c428e83c775)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-12 19:41:10 +05:30
Wei Zhou
b528047fb6 CLOUDSTACK-8146: Resource count of primary storage does not consider the detached volumes 2015-01-12 12:25:28 +01:00
Rohit Yadav
aaf6a34c54 CLOUDSTACK-8035: Generate and store X509Cert and reuse this for SAML
The fix generates X509Certificate if missing from DB and uses that for eternity.
SAML SP metadata remains same since it's using the same X509 certificate and
it remains same after restarts. The certificate is serialized, base64 encoded
and stored in the keystore table under a specific name. For reading, it's
retrieved, base64 decoded and deserialized.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 43587143811b222ca131b0e1237f9e99cd94694d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-12 16:49:49 +05:30
Rohit Yadav
173710d5b4 CLOUDSTACK-8037: URL encode cookie values with UTF8 as per version 1
As per Version 1 cookies, certain characters are now allowed such as space,
colons etc but they should be url encoded using UTF8 encoding. The frontend
has a cookie value unboxing method that removes any double quotes that are added.

As per the doc http://download.oracle.com/javase/6/docs/api/java/net/URLEncoder.html
values are application/x-www-form-urlencoded and as per
http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4 whitespaces are encoded
as +, therefore '+' are replaced by %20 (whitespace).

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 734bd70173c36508f0fc13a30c3aa8006814c019)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-12 14:03:09 +05:30
Rohit Yadav
0b94f254e8 CLOUDSTACK-8034: Hash user IDs for SAML authentication
The User table's UUID column is restricted to 40 chars only, since we don't
know how long the nameID/userID of a SAML authenticated user will be - the fix
hashes that user ID and takes a substring of length 40 chars. For hashing,
SHA256 is used which returns a 64 char length string.

- Fix tests, add test cases
- Improve checkSAMLUser method
- Use SHA256 one way hashing to create unique UUID for SAML users

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b2b496288d164fead2c089fb48319e1988b03ce8)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-12 13:37:51 +05:30
Daan Hoogland
1a8fe82580 no extranous log4j files 2015-01-08 17:36:17 +01:00
Likitha Shetty
4b67a48144 CLOUDSTACK-3439. [VMWARE] While preparing for migration, include dynamically created nics in case of VMware too. 2015-01-08 09:50:19 +05:30
Brian Federle
82fa9184bf UI validation: Fix asterisk showing up on non-required fields 2015-01-07 08:49:27 -08:00
Kishan Kavala
85bd96c6b2 While deploying Vm with DataDisk in LXC, if the rbd image mapping on the host fails, deploy Vm should fail 2015-01-07 15:09:57 +05:30
Kishan Kavala
f767adfe71 Bug-Id: CLOUDSTACK-3439: Include dynamically created nics in Prepare for migration command in KVM 2015-01-07 14:52:42 +05:30
Kishan Kavala
a520309190 Bug-Id: CLOUDSTACK-7395: reverted 0560254c04425705530a23a93002daede4b6dc3c partially. Allow multiple networks with LB service 2015-01-07 14:33:31 +05:30
Kishan Kavala
dc17e4ef39 Increased SSL handshake timeout to 30 seconds 2015-01-07 14:27:51 +05:30
Kishan Kavala
01a325b2bf Network Id for direct-network should not be included in usage record response. Direct network stats have network_id = 0. Ignore network with id = 0 in usage record 2015-01-07 14:17:30 +05:30
Kishan Kavala
30ab4d3d66 For Vm snapshot delete event, check for null size and set it as zero 2015-01-07 14:15:59 +05:30
Kishan Kavala
438f90a262 Close transaction while fetching recent events 2015-01-07 14:14:44 +05:30
Kishan Kavala
9eb8d538dd For volumes created from template, do not log offering ID in VOLUME.CREATE in usage_event. Moved offering type to DiskOffering interface 2015-01-07 12:31:41 +05:30
Kishan Kavala
42cecbb000 Network offering usage event should be logged for UserVms only 2015-01-07 12:29:11 +05:30
Kishan Kavala
84c25f7025 Skip older records which generate negative duration usage 2015-01-07 11:49:50 +05:30
Kishan Kavala
4ac96d637c Trigger user stats aggregation job at midnight in usage aggregation timezone 2015-01-07 11:17:24 +05:30
Likitha Shetty
bc235ed5eb CLOUDSTACK-5485. Cannot process more than 5 concurrent snapshots.
Number of threads on SSVM agent for connection with MS (Agent->NioClient) should be configurable using global config 'workers'.
2015-01-07 09:41:24 +05:30
Daan Hoogland
3cba1c41fb CID-1114614 dead code removed 2015-01-06 16:47:32 +01:00
Daan Hoogland
682c3af710 CID-1114613 dead code removed 2015-01-06 16:38:41 +01:00
Daan Hoogland
e8a54f471c CID-1114606 use of MAX_VALUE and longValue() on Integer 2015-01-06 16:24:29 +01:00
Hugo Trippaers
eb9fba4fea Seems we are hitting bug MCHECKSTYLE-250 2015-01-06 14:03:34 +01:00
Hugo Trippaers
ec32ea30f7 Housekeeping, properly declare required maven version and update build plugin versions to recent versions 2015-01-06 11:58:58 +01:00
Wei Zhou
84c44b6314 CLOUDSTACK-8140: CS fails to start after secstorage/consoleproxy.service.offering is set to uuid 2015-01-06 10:23:44 +01:00
Daan Hoogland
2c9cc1ecde CID-1261666 added null check 2015-01-05 16:05:57 +01:00
Daan Hoogland
5251fb2dc3 CID-1261670 added null check 2015-01-05 16:01:13 +01:00
Daan Hoogland
251e88c401 CID-1261671 added null check 2015-01-05 15:55:33 +01:00
Daan Hoogland
54e5f28ace CID-1261669 added comment to clarify false positive 2015-01-05 15:43:51 +01:00
Gaurav Aradhye
22d6565434 CLOUDSATCK-8138: Fixed VmSnapshot revert issue in test_escalations_instances.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-01-05 18:42:07 +05:30
K@clogeny.com
eae9f0f0b0 CLOUDSTACK-8137: Fixed cleanup issue in sec group tests in test_escalations_instances.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-01-05 18:32:30 +05:30
Ashutosh K
1ee4188835 CLOUDSTACK-8135: Fixed cleanup issue in test_escalations_instances.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-01-05 18:31:52 +05:30
Ashutosh K
f938a5e1c3 CLOUDSTACK-8132: Fixed issue related to secondary storage count of template
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-01-05 18:30:16 +05:30
Ashutosh K
17da2e9ce9 CLOUDSTACK-8130: Fixed test_escalations_templates.py - Removed test case dependency on each other
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-01-05 18:05:17 +05:30
Gaurav Aradhye
214d63ee1e CLOUDSTACK-8124: Skipping snapshot tests on hyperv hypervisor
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-01-05 18:04:37 +05:30
Gaurav Aradhye
7f10e6fe0b CLOUDSTACK-8124: Skipping snapshot test cases on hyperv
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-01-05 17:02:10 +05:30