apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CS-15513: Fix group 5 of s2s vpn

Browse Source 
Conflicts:

	utils/test/com/cloud/utils/net/NetUtilsTest.java
This commit is contained in:
Sheng Yang 2012-07-10 10:30:48 -07:00
parent 911ed25fbc
commit 94c62f2127
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
View File

@ -105,10 +105,10 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnService, Manager {
String ikePolicy = cmd.getIkePolicy();
String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy(ikePolicy)) {
throw new InvalidParameterValueException("The customer gateway IKE policy" + ikePolicy + " is invalid!");
throw new InvalidParameterValueException("The customer gateway IKE policy " + ikePolicy + " is invalid!");
}
if (!NetUtils.isValidS2SVpnPolicy(espPolicy)) {
throw new InvalidParameterValueException("The customer gateway ESP policy" + espPolicy + " is invalid!");
throw new InvalidParameterValueException("The customer gateway ESP policy " + espPolicy + " is invalid!");
}
Long lifetime = cmd.getLifetime();
if (lifetime == null) {

2
utils/src/com/cloud/utils/net/NetUtils.java
View File

@ -1086,7 +1086,7 @@ public class NetUtils {
if (!hash.matches("md5|sha1")) {
return false;
}
if (pfsGroup != null && !pfsGroup.matches("modp768|modp1024|modp2048")) {
if (pfsGroup != null && !pfsGroup.matches("modp1024|modp1536")) {
return false;
}
}

10
utils/test/com/cloud/utils/net/NetUtilsTest.java
View File

@ -55,14 +55,14 @@ public class NetUtilsTest extends TestCase {
public void testVpnPolicy() {
assertTrue(NetUtils.isValidS2SVpnPolicy("aes-sha1"));
assertTrue(NetUtils.isValidS2SVpnPolicy("des-md5;modp768"));
assertTrue(NetUtils.isValidS2SVpnPolicy("des-md5;modp768,aes-sha1;modp2048"));
assertTrue(NetUtils.isValidS2SVpnPolicy("3des-sha1,aes-sha1;modp2048"));
assertTrue(NetUtils.isValidS2SVpnPolicy("des-md5;modp1024"));
assertTrue(NetUtils.isValidS2SVpnPolicy("des-md5;modp1024,aes-sha1;modp1536"));
assertTrue(NetUtils.isValidS2SVpnPolicy("3des-sha1,aes-sha1;modp1536"));
assertTrue(NetUtils.isValidS2SVpnPolicy("3des-sha1,aes-sha1"));
assertFalse(NetUtils.isValidS2SVpnPolicy("abc-123,ase-sha1"));
assertFalse(NetUtils.isValidS2SVpnPolicy("de-sh,aes-sha1"));
assertFalse(NetUtils.isValidS2SVpnPolicy(""));
assertFalse(NetUtils.isValidS2SVpnPolicy(";modp2048"));
assertFalse(NetUtils.isValidS2SVpnPolicy(",aes;modp2048,,,"));
assertFalse(NetUtils.isValidS2SVpnPolicy(";modp1536"));
assertFalse(NetUtils.isValidS2SVpnPolicy(",aes;modp1536,,,"));
}
}