Rafael da Fonseca
a670f984d8
Fix findbugs warning HE_EQUALS_USE_HASHCODE in Ip4Address.java When overriding equals(), hashCode() must also be overriden do comply with the directive that equal objects must have equal hashcodes Without this implementation, usage of these kinds of objects in hashmaps for example, will be broken
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-06-15 12:10:07 +03:00
Rafael da Fonseca
a4659d009e
Fix findbugs warning in Script.java Unnecessary boxing/unboxing of int value
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This closes #436
2015-06-15 12:10:00 +03:00
Rafael da Fonseca
14f761a976
Fix findbugs warning in NetUtils.java Unnecessary boxing/unboxing of primitive value
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This closes #435
2015-06-15 12:09:58 +03:00
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
Wido den Hollander
43d20e67f8
graphite: Do not cache DNS names for Graphite host
2015-05-12 13:47:59 +02:00
Rohit Yadav
069aa4e5f3
CLOUDSTACK-8433: remove awsapi db usage and add upgrade cleanup path
...
- Removes awsapi db properties usage across codebase
- Removes references from spring xmls, test cases and TransactionLegacy
- Adds sql command to drop database cloudbridge in schema-451to460-cleanup.sql
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-06 15:22:04 +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
Koushik Das
1664c91214
Fixed RAT build issue
2015-04-29 16:24:00 +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
Rohit Yadav
6df2fe7a8a
CLOUDSTACK-8273: refactor baremetal user name to utils, restrict baremetal user
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit cb08707add )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/user/AccountManagerImpl.java
2015-02-26 17:47:01 +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
Erik Weber
c31e8e7409
CLOUDSTACK-8215: Change Date calculation to Joda DateTime
...
(cherry picked from commit 03e07c41b5 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-05 17:22:31 +05:30
Erik Weber
fdf4bd2ea2
SAML changing date calculation
...
Signed-off-by: Erik Weber <terbolous@gmail.com>
(cherry picked from commit b84c8889a3 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-05 17:22:20 +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
008911d4b1
CLOUDSTACK-8195: Don't break IdP, return metadata XML
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 1172867df0 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-03 17:05:29 +05:30
Rohit Yadav
0d74d7bdea
use a preferable protocol that works on most infra
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f5f6c2d1a7 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java
(cherry picked from commit 1bab1d0855 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-29 16:03:29 +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
Rohit Yadav
b7b3a4fb3c
CLOUDSTACK-8037: Require signed AuthnRequest, adds more security
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 6bec69844d )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-14 02:43:48 +05:30
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 4358714381 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-12 16:49:49 +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 b2b496288d )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-12 13:37:51 +05:30
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
Rohit Yadav
fac7bfc5d5
CLOUDSTACK-8011: Upgrade maven dependencies
...
Changes;
- Upgrades maven-war plugin to 4.5 (faster war packaging)
- Upgrade spring framework to latest minor release
- Upgrade ehcache, jasypt, httpclient, httpcore and other core dependencies
- Upgrade to latest ipv6 library, fix unit test NetUtilsTest
- httpcore and httpclient are sharing same version variable
- commons-httpclient is different that httpclient, the fix gives it a separate var
- Apidocs failed to generate and get stuck with new reflections version, for now
we will continue using 0.9.8
Newer dependencies can be listed using:
mvn versions:display-dependency-updates -Dnoredist -Dsimulator -P developer,systemvm
Testing;
- Tested using Maven 3.2.1
- Local noredist build with unit tests succeeds
- CloudStack mgmt server started, basic business layer tests work
- Observed 10-15% build time improvement using new maven-war plugin
Branch: bugfix/4.5-8011 (commits are squashed in favour of a linear history)
Pull request:
https://github.com/apache/cloudstack/pull/50
This closes #50
TravisCI build summary:
https://travis-ci.org/shapeblue/cloudstack/builds/42902172
- Build passes with unit tests
- Apidocs generates successfully
- Most integration tests pass, some fail due to timeout errors, second re-run
passes some of them
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-04 02:12:51 +05:30
Rohit Yadav
1e0880cbab
CLOUDSTACK-7903: Fix build regression from previous fix
...
The previous fix tried to access StatsCollector from UsageManagerImpl
which is not possible due to dependency cycle.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-01 16:35:23 +05:30
Rajani Karuturi
b6c86bdb75
changed commons-io version to the latest stable 2.4
...
also updated version numbers in all the poms its used.
2014-11-28 17:01:16 +05:30
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 6df0b9f677 )
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 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
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
Rohit Yadav
8e6cb04480
SAMLUtils: leave bootstrapping to upper layers
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:24 +02:00
Rohit Yadav
1b0f81ec6f
utils: Remove hard coded strings from SAMLUtils
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:23 +02:00
Rohit Yadav
d6ea4ad7e0
utils: refactor and aggregate methods in SAMLUtils
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:22 +02:00
Rohit Yadav
7ada4ad50b
NetUtils: Check for NPE in getDefaultHostIp method when processing nic/mac
...
On hosts or containers where they don't have valid mac address on nic resulting
in null, NetUtils.getNetworkParam can throw NPE.
This was a case found on TravisCI where OpenVZ containers are used. This method
(getDefaultHostIp) is used at several other places within the ACS codebase to
get the host IP and if null is caught we fallback to localhost or 127.0.0.1, so
we therefore set info to null before trying to process network param and if we
fail we return null and expect other layers to use localhost.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-21 11:41:07 +02:00
Santhosh Edukulla
023811286e
Fixed few coverity issues
...
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-19 22:01:15 +05:30
Rohit Yadav
3b5aa42c6d
CLOUDSTACK-4770: In MacAddress skip macAddress when parsed value is 0x00
...
In MacAddress class, we start by settig macAddress String as null and go through
the output of ifconfig -a and pick the one string that is a valid mac address
but is not 0x00 and 0xff. With each loop we set the macAddress to null so that
it does not pick the last one if everything fails.
Tested on Ubuntu where I had an interface called cloud0 whose mac id was 0x00
and it was skipped to get the next one:
$ java -classpath <path-to-cloud-utils.jar> com.cloud.utils.net.MacAddress
addr in integer is 5071953436
addr in bytes is 0 1 2e 4f de 1c
addr in char is 00:01:2e:4f:de:1c
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-13 15:04:04 +02:00
Min Chen
a22abeb0e7
CLOUDSTACK-7328:[Automation] Register ISO failing with invalid iso
...
format error.
2014-08-12 15:26:50 -07:00
Min Chen
e3564658be
CLOUDSTACK-6940, CLOUDSTACK-7312, CLOUDSTACK-5512: Template/ISO/Volume
...
upload rejects some valid URL formats. Also consolidate URL format check
into one util routine.
2014-08-12 11:43:08 -07:00
Rohit Yadav
bae8f2a8cb
utils: fix pom.xml to have references for javax.servlet api interfaces
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-12 12:01:32 +02:00
Rohit Yadav
315feb0683
utils: refactor HTTP transport stuff to HttpUtils
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-12 12:01:31 +02:00
Santhosh Edukulla
fd96ad02d7
Fixed few coverity reported issues around concurrency, null checks
2014-08-11 16:55:23 +05:30
Jayapal
d28da9d986
CLOUDSTACK-7212: Failed creating LB rule on public port 8081 for VR as LB provider
2014-08-01 15:54:17 +05:30
Alena Prokharchyk
89017a7d7b
CS-19072: got rid of unneeded type casting when apply pagination to different resources
2014-07-30 10:33:45 -07:00
Alena Prokharchyk
ca8d3672e8
listNetworks: moved pagination post processing to StringUtils class
2014-07-28 14:43:55 -07:00
Hugo Trippaers
47bb175bd4
Partially reverting c61c636ce8. Changing the name if cloud.keystore has bigger impact than just changing the name.
2014-07-28 14:52:41 +02:00
Kishan Kavala
c61c636ce8
CLOUDSTACK-5946: Commit 2774b62d64 changed keystore file along with coverity fixes. Use varible name for keystore filename to keep it in sync
2014-07-25 14:07:46 +05:30
amoghvk
c804660c74
CLOUDSTACK-7168: Revert "Fixed Coverity Issues reported" that broke CI
...
This reverts commit 4523490d44 .
2014-07-23 11:37:36 -07:00
Santhosh Edukulla
4523490d44
Fixed Coverity Issues reported
...
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-07-22 18:03:36 +05:30
Rajani Karuturi
58bad41910
Fixed CLOUDSTACK-6983: unable to register lxc template
...
added a check for tar.gz format in checktemplate
2014-07-21 16:57:53 +05:30
Edison Su
51c14106d8
CLOUDSTACK-7123: set the timeout to 60s, when run the file command
2014-07-18 12:07:36 -07:00
Mike Tutkowski
b080eaf327
Updates to the way resizing a volume works
2014-07-17 21:09:19 -06:00
Koushik Das
aacf8ef77b
Findbugs fixes in cloud-utils project and a few other places
2014-07-15 14:23:17 +05:30
Frank.Zhang
3ddc9e7674
CLOUDSTACK-6278
...
Baremetal Advanced Networking support
2014-07-07 11:40:21 -07:00
Sheng Yang
a08528cfd9
Polish IPv6 input error information
2014-07-01 15:17:46 -07:00
Daan Hoogland
3268f5bd1f
CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc
2014-06-25 17:09:19 +02:00
Daan Hoogland
d90b8d88ed
Revert "CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc"
...
This reverts commit 218c4713ae .
2014-06-25 17:06:10 +02:00
Daan Hoogland
218c4713ae
CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc
2014-06-25 16:58:52 +02:00
Hugo Trippaers
cd0ef09344
Fix typo and add the right exception to the error map.
2014-06-25 15:51:28 +02:00
Daan Hoogland
cd3b027f44
findbugs: unit test coverage on the utils package
2014-06-25 15:43:08 +02:00
Daan Hoogland
018b471ad3
CLOUDSTACK-6747 test to allow all cidrs on other end of vpc, public or
...
private
2014-06-25 14:59:14 +02:00
Sheng Yang
a93a30595d
CLOUDSTACK-6854: Fix inconsistent IPv6 address formats
...
fc00:0003:1373::0002 should be treated the same as fc00:3:1373::2.
2014-06-23 10:54:12 -07:00
Santhosh Edukulla
1c80185170
Fixed Resource Leaks, null dereferences, invalid value comparisons, invalid result set loop
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-06-21 12:38:46 +02:00
Upendra Moturi
918c320438
CLOUDSTACK-6847.Link.java and console proxy files have hardcoded value
2014-06-20 12:07:50 +02:00
Anthony Xu
ce3550f333
CLOUDSTACK-6662
...
CLOUDSTACK-6844
exit status delivery might get delayed
Please enter the commit message for your changes. Lines starting
2014-06-18 15:07:50 -07:00
Kelven Yang
f529823566
Add ReflectionUse annotation for marking up *un-used* methods
2014-06-17 17:31:29 -07:00
Hugo Trippaers
8b5ec64842
Small fix for people that have JDK 1.8 installed on MacOSX and don't bother to fix their links
2014-06-05 15:35:05 +02:00
Nitin Mehta
5393387bbd
CLOUDSTACK-6599:
...
1. Adding the missing Template/Volume URLs expiration functionality
2. Improvement - While deleting the volume during expiration use rm -rf as vmware now contains directoy
3. Improvement - Use standard Answer so that the error gets logged in case deletion of expiration link didnt work fine.
4. Improvement - In case of domain change, expire the old urls
2014-05-30 10:48:42 -07:00
Marcus Sorensen
15ac47e47b
CLOUDSTACK-6088: Check first bytes of template when downloading to verify format/type
2014-05-28 15:40:57 -06:00
Marcus Sorensen
96055058b0
CLOUDSTACK-6785: changed async job param injectedjobid to customjobid and check for unique/uuid
2014-05-27 15:23:12 -06:00
Anshul Gangwar
57f3e21317
CLOUDSTACK-6287, CLOUDSTACK-6315 : fixed password visible in plain text in some hyperv request params/json response
2014-04-21 14:10:17 +05:30
Ding Yuan
c031eb7d38
CLOUDSTACK-6242: exception handling improvements
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-04-15 08:07:15 +02:00
Damodar Reddy
1d0b14673d
CLOUDSTACK-6354 : removing the hard coding of key path in EncryptionSecretKeyChecker
2014-04-10 11:44:18 +05:30
Laszlo Hornyak
5f800f2d22
Script cleanup
...
- new negative tests
- some copy-paste replacement in the code
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-03-30 23:27:40 +02:00
Daan Hoogland
a7d7fee0cb
findbugs: filter definition
2014-03-28 17:16:05 +01:00
Daan Hoogland
4cfcfd43de
findbugs: array toString()
2014-03-28 15:14:57 +01:00
Daan Hoogland
8b62b2cb92
findbugs: exclude known spiffy hacks a.k.a. false positives
2014-03-28 14:28:10 +01:00
Anthony Xu
2d5a58d66c
fixed ssh execution log
2014-03-24 15:19:54 -07:00
Hugo Trippaers
4402685e11
Update master to 4.5.0-SNAPSHOT
2014-03-14 14:55:26 +01:00
Nitin Mehta
33a0dec965
CLOUDSTACK-6221:
...
Publish first class objects involved in an operation (for now vm uuid) on the event bus . Example - during attach/detachIso along with iso id, vm id should be available as well.
2014-03-10 16:22:34 -07:00
Min Chen
793becf524
CLOUDSTACK-5920: Add some interface methods and constants required by
...
IAM.
2014-03-05 09:40:55 -08:00
miguelaferreira
ef547108dd
NetUtils testing
...
- Refactor tests:
- Upgrade tests to use jUnit4
- Add hamcrest dependency (contribution of by Laszio Hornyak)
- Break big tests in small unit tests
- Replace assertTrue/False with complex conditions by assertThat with
specific matchers
- Remove dead code:
- Private static method never called locally
- Add test for method that validates cidrs
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-25 19:23:13 +01:00
Antonio Fornie
808c6df6d7
Fix and add some Rest unit and IT tests. Fix by adding a missing type of RoutingConfig.
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-19 09:30:57 +01:00
Hugo Trippaers
594b51c629
Fixup the license headers in the utils project. All files now use the same license header and this is enforced by the maven-license-check plugin.
2014-02-18 12:08:36 +01:00
Hugo Trippaers
a369647bca
Fix license headers
2014-02-18 10:16:31 +01:00
Antonio Fornie
510972abde
Nvp and rest refactoring and more tests
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-18 09:51:54 +01:00
Hugo Trippaers
97bad4f9b3
Fix checkstyle and license issues
2014-02-14 18:37:47 +01:00
wrodrigues
3199de69fe
Fixes on Contrail and Mon InMemory plugins; adding comments about the changes.
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:47 +01:00
Laszlo Hornyak
351ccf3755
Cleanup in UriUtils.getUpdateUri
...
- String instantiation replaced with StringBuilder and empty string constant
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-11 20:44:57 +01:00
Laszlo Hornyak
59364ee9a4
Added test for UriUtils.getUpdateUri
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-11 20:43:49 +01:00
Hugo Trippaers
6c770958f1
Fix unittest issue when you are in a locale that uses comma for decimal separation.
2014-02-11 14:45:45 +01:00
Alena Prokharchyk
e0de79b170
Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command
2014-02-10 12:05:59 -08:00
Devdeep Singh
306ffa0218
CLOUDSTACK-6053: While adding a primary or secondary of type smb the password wasn't
...
encoded. This cause createStoragePool or addImageStore command to fail if special
characters were present. Updated the code to pass user, password and domain as part
of details while adding primary or secondary. Also made changes on server side to
handle it.
2014-02-10 10:29:09 +05:30
Laszlo Hornyak
8ed9162de7
Cleanup in UriUtils.encodeURIComponent
...
- StringBuffer replaced with StringBuilder
- nullcheck of tokens array removed since String.split does not return null
- unit test added
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-09 21:57:07 +01:00
Laszlo Hornyak
8d801bffab
Replaced String concatenation in loop
...
Replaced String concatenation in loop with StringBuilder
Unit test added
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-09 21:27:28 +01:00
Devdeep Singh
a24263fe81
CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db.
2014-02-05 15:44:09 +05:30
Alena Prokharchyk
6af6ce7e9e
1) Added External UUID control support for network.
...
2) Moved UUIDManager interface to cloud-util package
2014-02-04 15:47:12 -08:00
Daan Hoogland
b3829e54d6
CLOUDSTACK-6020 ipv4 address can be a larger number then
...
Interger.MAX_VALUE
2014-02-04 18:40:18 +01:00
Sheng Yang
285f23f11b
CLOUDSTACK-5779: Generalize calling to execute or create file for KVM
2014-01-24 18:28:25 -08:00
Sheng Yang
2d100f1269
CLOUDSTACK-5779: Generalize calling to execute or create file for Xen
2014-01-24 18:27:55 -08:00
Hugo Trippaers
d19157fbb1
Fix a bug found by findbug, compare Long objects with equals instead of ==
2014-01-23 09:06:32 +01:00
Marcus Sorensen
effa4c75b4
CLOUDSTACK-5843
...
For some reason the mgmt server is required to have access to the template
being registered in order to check its size against resource limits
during registration. This is bad, but worse, it's a sync call, so this
call can hang for up to the default HTTP connection timeout.
Reducing http timeout as a quick workaround, but this check needs to
1) be removed or 2) done later or 3)registerTemplate needs to be async
and 4) moved off the mgmt server (ssvm is the only thing that needs access to
template url).
2014-01-10 18:12:46 -07:00
Marcus Sorensen
8ee61f3a57
CLOUDSTACK-5502 createVlanIpRange, allow untagged to be accepted per previous use,
...
equate empty string to untagged in api parameter input
2014-01-10 17:09:41 -07:00
Kelven Yang
1e2e1ea051
CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues
2014-01-09 14:29:13 -08:00
Alena Prokharchyk
cb0c14671a
CLOUDSTACK-5826: do netmask/gateway validation before calculating the POD cidr
2014-01-07 10:20:30 -08:00
Daan Hoogland
62c9343658
compare null to non-null or not-empty-string
2014-01-06 11:28:50 +01:00
Sheng Yang
92ba5f618d
Fix tab issues in the Link.java
2014-01-02 14:03:38 -08:00
Sheng Yang
4312f9268e
CLOUDSTACK-5723: Add timeout for SSL handshake
...
To prevent malfunction agent block the future SSL connections
2014-01-02 13:54:38 -08:00
Daan Hoogland
b477e4e830
some xtra cases
2013-12-31 12:52:51 +01:00
Daan Hoogland
2cf356e047
isSameIsolationId
2013-12-31 12:25:17 +01:00
Daan Hoogland
04570eefed
check vlans and other isolation types
2013-12-31 12:21:08 +01:00
Jayapal
07de75191c
Revert "CLOUDSTACK-4622:If a VM from guest network is added to network tier of VPC then IP reservation allows the CIDR to be a superset of Network CIDR for that VPC tier"
...
Reverting this commit as it is breaking vpc deployment, CLOUDSTACK-5652
This reverts commit ab4f095c68 .
2013-12-27 11:15:33 +05:30
Saksham Srivastava
ab4f095c68
CLOUDSTACK-4622:If a VM from guest network is added to network tier of VPC then IP reservation allows the CIDR to be a superset of Network CIDR for that VPC tier
...
Signed-off-by: Jayapal <jayapal@apache.org>
2013-12-26 16:58:04 +05:30
Alex Huang
be5e5cc641
All Checkstyle problems corrected
2013-12-12 12:26:07 -08:00
tuna
fca6d56681
remove private changes
2013-12-10 10:36:30 +07:00
tuna
dc151115be
AutoScaling without NetScaler
2013-12-10 10:35:55 +07:00
tuna
61e80f030a
remove unused code
2013-12-09 23:33:15 +07:00
tuna
d935d3865a
tuna
2013-12-09 23:33:14 +07:00
Syed Ahmed
ee7380ace2
CLOUDSTACK-5296: Add certificate chain support for netscaler
...
This patch adds support for trust chains in the netscaler.
I initially planned on using the 10.1 API's "bundle" feature but during
my testing I found that was not working. So I am doing the chain linking
myself. Also NS can have only one entity of a certificate ie lets say
two different users try to add the same certificate on the netscaler
only one of them will go through. The other one says resouce already
exists even though they have different files.
This can be a problem in trust chains where the chain can be shared
between multiple accounts/certificates. So, I am using the figerprint as
an identifier of a certificate and making sure that we delete it only
when no one references it.
2013-12-05 15:35:28 +05:30
Anthony Xu
04b48ae04e
XS VMmetadata platform contains virtual platform related info, CS should save platform info in DB to migrate the VM to other Cluster
2013-12-05 01:41:14 -08:00
Min Chen
f420b74890
CLOUDSTACK-5355: addImageStore should not log password in clear text in
...
the log.
2013-12-03 16:55:26 -08:00
Jayapal
cd6e6a4d3c
CLOUDSTACK-1762 Fixed assigning network or broadcast ip to nic
2013-12-02 11:05:41 +05:30
wilderrodrigues
2774b62d64
Fixing bugs from Coverity related to Dereferenced Null after check and as return value.
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
2013-11-27 11:18:00 +01:00
Alex Huang
433a631916
Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code.
2013-11-21 07:56:47 -08:00
Hugo Trippaers
cf715ff491
Bump 4.3.0 to 4.4.0 in master
2013-11-21 16:01:15 +01:00
Alex Huang
d620df2bdd
Reformatted all of the code.
2013-11-21 06:15:26 -08:00
Alex Huang
224f479974
Removed trailing spaces
2013-11-21 04:08:01 -08:00
Alex Huang
e4b22d0fca
Replace all tabs, particularly the ones in the comments
2013-11-21 03:39:58 -08:00
Alex Huang
8d62744681
Reformat all source code. Added checkstyle to check the source code
2013-11-20 07:26:53 -08:00
Syed
0076307863
Squashed merge of Ssl Termination feature
...
Bug: https://issues.apache.org/jira/browse/CLOUDSTACK-4821
FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/SSL+Termination+Support
This patch implements the SSL offload feature for loadbalancers
and includes the implementaion for this to work with Netscaler.
The following are the new API's that this patch adds
uploadSslCert
deleteSslCert
listSslCert
assignCertToLoadBalancer
removeCertFromLoadBalancer
Unit tests are also included in the patch.
2013-11-08 16:49:16 +05:30
Min Chen
dc3d279272
CLOUDSTACK-4833:[Automation][BVT] Template and ISO test cases failing
...
from BVT suite, during LIST api call.
2013-11-07 15:19:19 -08:00
Laszlo Hornyak
cff5ea0949
FileUtil: use commons-io FileUtils
...
- removed the method body ot FileUtil.copyFile and replaced with FleUtils.copyFile
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-11-07 22:36:02 +01:00
Kishan Kavala
3f5b8f7063
CLOUDSTACK-4793 : Added UpgradeRouterTemplate API. Added filters to listRouters API. listRouters response includes verion and required upgrade flag. Min VR version is checked before sending commands to router
2013-11-07 19:49:05 +05:30
Darren Shepherd
68ce3f56ac
Missed a null check
2013-11-06 09:44:08 -07:00
Darren Shepherd
1460196496
Centralize loading of db.properties to one place
...
There is now a method DbProperites.getDbProperties() that will load the
db.properties in one place and do the proper decryption of values if needed
2013-10-30 17:03:13 -07:00
Laszlo Hornyak
fa35490fef
InputStream use fix in ProcessUtil
...
- use PropertiesUtil to load Properties from file
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-26 17:47:34 +02:00
Laszlo Hornyak
dbaa818d1e
InputStream use fix
...
Closes the FileInputStream opened at configuration in
- ClusterManagerImpl
- ClusterServiceServletAdapter
- TransactionLegacy
- AsyncJobManagerImpl
- DBEncryptionUtil
- EncryptionSecretKeyChecker
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-26 17:47:34 +02:00