etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,645 Commits 330 Branches 325 Tags 855 MiB
Commit Graph

831 Commits

Author SHA1 Message Date
jeff db69c8e82b Allow PropertiesUtil to read from jar files. 
PropertiesUtil has code for reading from jar files, but the
findConfigFile method will prevent it from ever returning a file in a
jar on the classpath since it always wants to have a "file:" URL and
use the File class.

This commit moves the jar file loading attempt from a catch block to
an else clause, executed if a config file:// URL could not be found.

Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>

This closes #358
 2015-06-08 09:19:21 +02:00
Rafael da Fonseca bec44bffb3 Upgrade Reflections to 0.9.9 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>

This closes #333
 2015-06-03 11:01:32 +05:30
Rohit Yadav ca3ac68517 utils: add findCookie value by key helping method in HttpUtils 
finds cookie value from an array of cookie by key name

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 78ea36d099371b9a59cbf1e3efd48b853ecc37ca)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-05-29 15:42:21 +02:00
wilderrodrigues 75463356fb CLOUDSTACK-8506 
Removing the previous logic and adding a method to check if the CIDR is 31 bit prefixed
Adding tests for the new method

Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>

This closes #303
 2015-05-26 12:10:00 +02:00
wilderrodrigues a83f74d83e CLOUDSTACK-8506 
- Changing the implementation of the NetUtils.ipRangesOverlap() a little bit in order to be compliant with RFC 3021
  - 2 unit tests added
  - ranges from 0 to 255 covered by the tests, which also test the negative cases.
 2015-05-22 20:08:09 +02:00
wilderrodrigues 14863bbaff CLOUDSTACK-8506 
- Added subnetUtils.setInclusiveHostCount(true) to NetUtils.isIpWithtInCidrRange() method. It makes the 31-bit prefixes work just fine
  - Added 3 unit tests to test valid and invalid ranges.
 2015-05-22 18:17:16 +02:00
Rajani Karuturi bd71fcb650 Fixed two coverity reported issues 
Dereference after null check
Dm: Dubious method used

This closes #219
 2015-05-01 16:08:26 +05:30
Daan Hoogland 9e3b825f91 findbugs: make default encoding explicit 2015-05-01 08:20:27 +02:00
Rajani Karuturi d39b993512 Fixed a few findbugs issues after the merge 0b83559 
HttpUploadServerHandler.java:142, DM_BOXED_PRIMITIVE_FOR_PARSING
NfsSecondaryStorageResource.java:2630, DM_BOXED_PRIMITIVE_FOR_PARSING
NfsSecondaryStorageResource.java:2775, DM_DEFAULT_ENCODING
EncryptionUtil.java:59, DM_DEFAULT_ENCODING
 2015-04-30 13:56:44 +05:30
Rajani Karuturi 0b8355920e Merge branch 'volume-upload' into master 
This closes #206
 2015-04-29 11:12:53 +05:30
Rohit Yadav 48ef7e5f28 utils: improve timeout to 60s, define generics properly 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d2471df0be)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-04-13 15:47:45 +05:30
Rajani Karuturi 018023c1ef volume upload: added validation for file formats 
merged TemplateUtils and ImageStoreUtil to a singe ImageStoreUtil
also added a unittest for ImageStoreUtil
 2015-03-20 16:25:13 +05:30
Rohit Yadav c8901a7990 utils: use a better extended implementation of SSLSocketFactory 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b4a5a32a74)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-13 17:32:07 +05:30
Rajani Karuturi debcbcc145 Fixed PMD NullDeref issues in S3Utils. 2015-03-05 11:58:24 +05:30
Rajani Karuturi c5c1b1d462 Fixed checkstyle issues due to commit 0b6c540a20 2015-03-04 16:21:53 +05:30
santhosh 0b6c540a20 listDirectory method updated to use ObjectListing.isTruncated(). 
Because buckets can contain a virtually unlimited number of keys, the
complete results of a list query can be extremely large. To manage large
result sets, Amazon S3 uses pagination to split them into multiple
responses.

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>

This closes #25
 2015-03-04 12:52:48 +05:30
Laszlo Hornyak 1f72548f57 CLOUDSTACK-4807: tests for NetUtils 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2015-03-03 21:21:52 +01:00
Rohit Yadav 20bcb4b673 CLOUDSTACK-7063, CLOUDSTACK-7064: Add security headers on HTTP response 
- Adds X-XSS-Protection header
- Adds X-Content-Type-Options header
- Fixes to use json content type defined from global settings
- Uses secure cookie if enabled in global settings

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b6b3494782)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-28 18:14:49 +05:30
Rajani Karuturi 3814677977 volume upload: getUploadParamsForVolume url has IP address instead of hostname, SSL fails 2015-02-17 11:31:44 +05:30
Rohit Yadav d62d511f47 improve protocol enabling based on socket object type 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 15:48:21 +05:30
Rohit Yadav 664186f483 CLOUDSTACK-8160: use preferable protocols 
(cherry picked from commit debfcdef78)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-21 18:04:45 +05:30
Rohit Yadav e7c80021d6 CLOUDSTACK-5946: Fix keystore filename to avoid warning logs 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit ed69d588ec)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-21 18:04:00 +05:30
Rohit Yadav 60f18cc713 CID 1264632: Rely on a known and widely available encoding UTF8 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0763b5576d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-20 07:49:09 +05:30
Pierre-Yves Ritschard b2393c31ed move ConstantTimeComparator to utils 2015-01-14 12:14:00 +01:00
Kishan Kavala dc17e4ef39 Increased SSL handshake timeout to 30 seconds 2015-01-07 14:27:51 +05:30
Rajani Karuturi 9bb6cf8452 volume upload: persisting the volume metadata 
on calling GetUploadParamsForVolume, persisting the metadata to db
    validating the account limits and incrementing the appropriate limits
    encoded the metadata on management server using preshared key
 2014-12-18 17:50:51 +05:30
Sheng Yang 3c9e14e85a CLOUDSTACK-5241: Remove Rot13 usage 2014-12-03 19:38:47 -08:00
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
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
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
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 918c320438
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 7972f53c8d)
 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