You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/12/06 20:06:21 UTC
[4/6] git commit: updated refs/heads/master to 70c79ad
CLOUDSTACK-9632: Upgrade bouncy castle to version 1.55
- Upgrades Maven dependency version to v1.55
- Fixes bountycastle usages and issues
- Adds timeout to jetty/annotation scanning
- Fixes servlet issue, uses servlet 3.1.0
- Downgrade javassist used by reflections to fix annotation process errors
- Make console-proxy-rdp bc dependency same as rest of the codebase
- Picks up PR #1510 by Daan
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/abfcd5b9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/abfcd5b9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/abfcd5b9
Branch: refs/heads/master
Commit: abfcd5b95f90fde7b8ae07f4673fb84e1d9f1520
Parents: 8d506a6
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Nov 30 15:01:28 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Dec 6 17:24:24 2016 +0530
----------------------------------------------------------------------
api/pom.xml | 2 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 1 -
.../server/ServerTransportProvider.java | 29 +-
.../framework/transport/TransportAddress.java | 2 +-
.../security/keystore/KeystoreManagerImpl.java | 3 +-
framework/spring/module/pom.xml | 2 +-
.../network/resource/NetscalerResource.java | 1650 +++++++++---------
pom.xml | 12 +-
server/pom.xml | 2 +-
server/src/com/cloud/api/ApiServer.java | 159 +-
.../cloudstack/network/lb/CertServiceImpl.java | 445 ++---
.../cloudstack/network/lb/CertServiceTest.java | 422 ++---
services/console-proxy-rdp/rdpconsole/pom.xml | 4 +-
.../java/streamer/bco/BcoSocketWrapperImpl.java | 53 +-
tools/travis/before_script.sh | 2 +-
utils/pom.xml | 2 +-
.../java/com/cloud/utils/PasswordGenerator.java | 10 +
.../cloud/utils/security/CertificateHelper.java | 156 +-
18 files changed, 1423 insertions(+), 1533 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abfcd5b9/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index ef9535b..d9f3ec1 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${cs.servlet.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abfcd5b9/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index f9ec6e4..7fa2e0c 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -2399,7 +2399,6 @@ public class Upgrade410to420 implements DbUpgrade {
//implies iso_id1 is not present, so do nothing.
}
} catch (SQLException e) {
- s_logger.error("migrateDatafromIsoIdInVolumesTable:Exception:"+e.getMessage(),e);
//implies iso_id1 is not present, so do nothing.
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abfcd5b9/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java
----------------------------------------------------------------------
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java b/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java
index ba8750b..06215a7 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java
@@ -18,14 +18,7 @@
*/
package org.apache.cloudstack.framework.server;
-import java.util.HashMap;
-import java.util.Map;
-import java.security.SecureRandom;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.apache.log4j.Logger;
-
+import com.cloud.utils.concurrency.NamedThreadFactory;
import org.apache.cloudstack.framework.serializer.MessageSerializer;
import org.apache.cloudstack.framework.transport.TransportAddress;
import org.apache.cloudstack.framework.transport.TransportDataPdu;
@@ -34,8 +27,15 @@ import org.apache.cloudstack.framework.transport.TransportEndpointSite;
import org.apache.cloudstack.framework.transport.TransportPdu;
import org.apache.cloudstack.framework.transport.TransportProvider;
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+import org.apache.log4j.Logger;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import com.cloud.utils.concurrency.NamedThreadFactory;
+import java.security.SecureRandom;
+import java.security.Security;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
public class ServerTransportProvider implements TransportProvider {
private static final Logger s_logger = Logger.getLogger(ServerTransportProvider.class);
@@ -52,9 +52,16 @@ public class ServerTransportProvider implements TransportProvider {
private MessageSerializer _messageSerializer;
+ static {
+ BouncyCastleProvider provider = new BouncyCastleProvider();
+ if (Security.getProvider(provider.getName()) == null) {
+ Security.addProvider(provider);
+ }
+ }
+
public ServerTransportProvider() {
- randomGenerator=new SecureRandom();
- _nextEndpointId=randomGenerator.nextInt();
+ randomGenerator = new SecureRandom();
+ _nextEndpointId = randomGenerator.nextInt();
}
public String getNodeId() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abfcd5b9/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java
----------------------------------------------------------------------
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java
index 99e25b1..969f78f 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java
@@ -29,7 +29,7 @@ public class TransportAddress {
private int _connectionId = LOCAL_SERVICE_CONNECTION;
private String _endpointId;
private int _magic;
- private final SecureRandom randomGenerator=new SecureRandom();
+ private final SecureRandom randomGenerator = new SecureRandom();
public TransportAddress(String nodeId, int connectionId, String endpointId) {
assert (nodeId != null);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abfcd5b9/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java
----------------------------------------------------------------------
diff --git a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java b/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java
index ed8195e..bed74bf 100644
--- a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java
+++ b/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java
@@ -30,6 +30,7 @@ import java.util.regex.Pattern;
import javax.inject.Inject;
+import com.google.common.base.Strings;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -48,7 +49,7 @@ public class KeystoreManagerImpl extends ManagerBase implements KeystoreManager
@Override
public boolean validateCertificate(String certificate, String key, String domainSuffix) {
- if (certificate == null || certificate.isEmpty() || key == null || key.isEmpty() || domainSuffix == null || domainSuffix.isEmpty()) {
+ if (Strings.isNullOrEmpty(certificate) || Strings.isNullOrEmpty(key) || Strings.isNullOrEmpty(domainSuffix)) {
s_logger.error("Invalid parameter found in (certificate, key, domainSuffix) tuple for domain: " + domainSuffix);
return false;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abfcd5b9/framework/spring/module/pom.xml
----------------------------------------------------------------------
diff --git a/framework/spring/module/pom.xml b/framework/spring/module/pom.xml
index 66e8365..8bbbd36 100644
--- a/framework/spring/module/pom.xml
+++ b/framework/spring/module/pom.xml
@@ -44,7 +44,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>