amoghvk
960b7bbf74
CLOUDSTACK-7977
...
Fix password generator, add guards for minimum length
2014-11-26 15:08:48 -08:00
Rohit Yadav
7ff31f1b22
Merge remote-tracking branch 'origin/inetaddress'
...
- Tested locally against unit tests
- TravisCI build passed: https://travis-ci.org/apache/cloudstack/builds/41990351
- Manual QA passed for basic auth and saml auth using default IDP settings
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/api/ApiServlet.java
2014-11-25 14:32:09 +05:30
Wido den Hollander
72ba98b1b8
Validate IPv4 address using Apache Commons Validator
2014-11-24 14:43:48 +01:00
Laszlo Hornyak
3577423da9
removed executable flags from java classes
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-11-23 19:49:01 +01:00
Laszlo Hornyak
55c449aa07
Properties loading simplification
...
- Using the PropertiesUtil methods, the resource handling could be elliminated
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-11-23 19:48:56 +01:00
Laszlo Hornyak
b2023d04ba
Simplification on Properties handling
...
- Added method to create properties and load contents from file
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-11-23 19:48:56 +01:00
Laszlo Hornyak
ca9dd457f9
Stream handling simplification in PropertiesUtil
...
- use resource block instead of finally block
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-11-23 19:48:55 +01:00
Min Chen
9ac93d3e43
CLOUDSTACK-7678:volumes are getting uploaded successfully with wrong url.
2014-11-21 14:36:36 -08:00
Daan Hoogland
f2ccee7a03
name convention adherence
2014-11-18 16:52:46 +01:00
Daan Hoogland
6bc0defa1d
CID-1254832 tyr-with-resource
2014-11-18 15:48:31 +01:00
Hugo Trippaers
e1d4a329c4
Package name should reflect the location on the filesystem or viseversa
2014-11-18 14:12:44 +01:00
Hugo Trippaers
16de4a7176
Fix for potential NPE
2014-11-18 14:12:14 +01:00
Daan Hoogland
638da54fce
CID-1254833 refactor condition to include null-case
2014-11-18 12:12:00 +01:00
Santhosh Edukulla
ef6ec7b276
Fixed few coverity issues like invalid boxing unboxing issues, resource leaks, null dereferences
2014-11-13 17:26:24 +05:30
Wido den Hollander
840c2fda85
CLOUDSTACK-7583: Send VmStats to Graphite host when configured
...
This allows external processing of VmStats information without using
the usage server of CloudStack
Statistics are being send to Graphite using UDP and not TCP.
UDP is used to prevent the management server waiting for TCP timeouts
when the Graphite server is unavailable
2014-11-11 13:04:43 +01:00
Kishan Kavala
990da08451
Add check to ensure VR template version matches digit.digit.digit format. Returns version as 0 otherwise
2014-11-10 15:33:50 +05:30
Rohit Yadav
7716989344
SAMLUtils: SAML user id should fit within the UUID VARCHAR(40) column
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 6df0b9f677984a85cc50fa964c4ead461f0a3063)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-10-31 01:24:56 +05:30
Hugo Trippaers
4ebaf0a583
Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT
2014-10-29 14:54:23 +01:00
Sheng Yang
57c4841403
CLOUDSTACK-7814: Fix default passphrase for keystores
...
In upgrade case, the db.properties file is not changed, but the following commit
would require passphrase for keystore in it, thus result in error(NPE in fact
due to there is no such properity).
commit 918c320438980f070150f872e3a3ba907572af83
Author: Upendra Moturi <upendra.moturi@sungard.com>
Date: Fri Jun 20 11:41:58 2014 +0530
CLOUDSTACK-6847.Link.java and console proxy files have hardcoded value
This commit fix it by put default value for passphrases, also set correct
passphrase if fail-safe keystore is used.
2014-10-28 16:25:52 -07:00
Daan Hoogland
1de0cb7094
restore barematel work after merge
2014-10-17 10:24:01 +02:00
Daan Hoogland
148efbb73f
Merge remote-tracking branch 'origin/4.5' into merge-master
...
Conflicts:
engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
setup/db/db/schema-441to450.sql
test/integration/component/test_deploy_vgpu_vm.py
tools/marvin/marvin/config/test_data.py
2014-10-16 12:29:37 +02:00
Damodar
50185b7c3a
CLOUDSTACK-7648: There are new VM State Machine changes introduced which were missed to capture the usage events
2014-10-13 14:42:00 +05:30
Anshul Gangwar
e43d5b1c7d
CLOUDSTACK-7575: improved performance of cleanString method in StringUtils
...
(cherry picked from commit 7972f53c8d35b78bd27cbd2c8bb1beb763b69c00)
2014-10-13 00:02:11 -04:00
David Nalley
ac48aa8e0c
cleaning up some from a revert
2014-10-12 23:30:04 -04:00
Santhosh Edukulla
31a42d2b7a
Fixed few coverity patches
...
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-10-09 11:45:26 +05:30
Anshul Gangwar
7972f53c8d
CLOUDSTACK-7575: improved performance of cleanString method in StringUtils
2014-09-26 14:02:41 +05:30
Hugo Trippaers
6f54d48772
CID-1116298 path can be null, make sure that is properly handled
2014-09-19 11:54:21 +02:00
Frank Zhang
8b89494a35
CLOUDSTACK-6278
...
Baremetal Advanced Networking support
2014-09-18 16:54:37 -07:00
Hugo Trippaers
d1d8009c68
Fix a stupid bug i introduced
2014-09-18 16:02:26 +02:00
Rohit Yadav
bd1752811c
CID-1116250: Lock on s_appContextDelegates before calling get in ComponentContext
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-18 11:52:18 +02:00
Rohit Yadav
ec134cf010
CID-1116231: Use implicit lock, synchronize _key in Link
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-18 11:21:57 +02:00
Hugo Trippaers
577a2f40b3
Merge branch 'bugfix/CID-116538'
2014-09-17 11:40:55 +02:00
Rohit Yadav
88c6072b4d
CID-1237196: Fix potential NPE in SAMLUtils
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-16 17:10:11 +02:00
Hugo Trippaers
de26a7228e
Fix resource leaks on exception paths
...
Make it clear that the server socket isn't a leaked resource
2014-09-16 16:43:32 +02:00
Rohit Yadav
d46e45991d
SAMLUtils: put name id policy on authnrequest
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-12 17:11:06 +02:00
Rohit Yadav
84b0e9e96f
utils: add missing string to the url in generate saml signature method
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-12 16:26:13 +02:00
Rohit Yadav
5a0ed8764b
SAMLUtils: Fix NPE incase signature is generated with a null privateKey
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-12 15:46:44 +02:00
Rohit Yadav
a66127dfb1
utils: add methods to save and load public and private keys
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-12 15:40:49 +02:00
Anshul Gangwar
d90a2d3962
CLOUDSTACK-7370: Fixed password visible in plain text if password passed is in the end in url
2014-09-12 15:33:24 +05:30
Frank.Zhang
10544e287b
CLOUDSTACK-6278
...
Baremetal Advanced Networking support
2014-09-05 16:28:34 -07:00
Hugo Trippaers
dc3f0cbc63
Improve the handling of the findbug exclude files
2014-09-03 10:41:22 +02:00
Rohit Yadav
550762a0dc
SAMLUtils: fix signature, refactor generateRandomX509Certificate
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-30 21:37:55 +02:00
Rohit Yadav
12ad5ba197
SAMLUtilsTest: just test that random secure string has some length
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-30 15:37:52 +02:00
Rohit Yadav
2bff5956a9
cisco-vnmc: Don't create Protocol using deprecated SecureProtocolSocketFactory
...
Latest httpclient library suggests when creating Protocol object for use
with the apache common httpclient class, they should avoid using the
deprecated Protocol signature which takes in SecureProtocolSocketFactory
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-29 14:39:29 +02:00
Rohit Yadav
5e7928bcb9
utils: fix static certificate value string in SAMLUtils
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:27 +02:00
Rohit Yadav
1ed532fb20
SAMLUtils: add unit test for SAMLUtils and method to randomly generate X509 certs
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:26 +02:00
Rohit Yadav
3bf387c882
SAMLUtils: Create new NameID using passed nameId taking just id and session idx
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:26 +02:00
Rohit Yadav
8dc50927f9
saml: use SAML_RESPONSE from SAMLUtils
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:26 +02:00
Rohit Yadav
230e970569
SAMLUtils: add logout request utility for saml slo
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:25 +02:00
Rohit Yadav
8fa9d2c276
utils: fix SAMLUtils's authnrequest maker
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:25 +02:00