policy update and test

Daan Hoogland · Daan Hoogland · commit 0ba157c848b9 · 2026-03-10T11:22:38.000+01:00
diff --git a/utils/src/main/java/com/cloud/utils/net/NetUtils.java b/utils/src/main/java/com/cloud/utils/net/NetUtils.java
@@ -1265,7 +1265,7 @@ public static boolean isValidS2SVpnPolicy(final String policyType, final String
             if (group == null && policyType.toLowerCase().matches("ike")) {
                 return false; // StrongSwan requires a DH group for the IKE policy
             }
-            if (group != null && !group.matches("modp1024|modp1536|modp2048|modp3072|modp4096|modp6144|modp8192|modp1024s160|modp2048s224|modp2048s256|CURVE_25519")) {
+            if (group != null && !group.matches("modp1024|modp1536|modp2048|modp3072|modp4096|modp6144|modp8192|modp1024s160|modp2048s224|modp2048s256|curve25519")) {
                 return false;
             }
         }
diff --git a/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java b/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
@@ -131,7 +131,10 @@ public void testIsValidS2SVpnPolicy() {
         assertTrue(NetUtils.isValidS2SVpnPolicy("ike", "3des-md5;modp1024"));
         assertTrue(NetUtils.isValidS2SVpnPolicy("ike", "3des-sha1;modp3072,aes128-sha1;modp1536"));
         assertTrue(NetUtils.isValidS2SVpnPolicy("ike", "3des-sha256;modp3072,aes128-sha512;modp1536"));
-        assertTrue(NetUtils.isValidS2SVpnPolicy("ike", "aes256;modp1024s160,modp2048s224,modp2048s256,curve25519"));
+        assertTrue(NetUtils.isValidS2SVpnPolicy("ike", "aes256-sha256;modp1024s160"));
+        assertTrue(NetUtils.isValidS2SVpnPolicy("ike", "aes256-sha256;modp2048s224"));
+        assertTrue(NetUtils.isValidS2SVpnPolicy("ike", "aes256-sha256;modp2048s256"));
+        assertTrue(NetUtils.isValidS2SVpnPolicy("ike", "aes256-sha256;curve25519"));
         assertFalse(NetUtils.isValidS2SVpnPolicy("ike", "aes128-sha1"));
         assertFalse(NetUtils.isValidS2SVpnPolicy("ike", "3des-sha1"));
         assertFalse(NetUtils.isValidS2SVpnPolicy("ike", "3des-sha1,aes256-sha1"));

Original file line number	Diff line number	Diff line change
`@@ -1265,7 +1265,7 @@ public static boolean isValidS2SVpnPolicy(final String policyType, final String`
`1265`	`1265`	`if (group == null && policyType.toLowerCase().matches("ike")) {`
`1266`	`1266`	`return false; // StrongSwan requires a DH group for the IKE policy`
`1267`	`1267`	`}`
`1268`		`- if (group != null && !group.matches("modp1024\|modp1536\|modp2048\|modp3072\|modp4096\|modp6144\|modp8192\|modp1024s160\|modp2048s224\|modp2048s256\|CURVE_25519")) {`
	`1268`	`+ if (group != null && !group.matches("modp1024\|modp1536\|modp2048\|modp3072\|modp4096\|modp6144\|modp8192\|modp1024s160\|modp2048s224\|modp2048s256\|curve25519")) {`
`1269`	`1269`	`return false;`
`1270`	`1270`	`}`
`1271`	`1271`	`}`