apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

network: allow icmp code 16 in firewall rules (#3468)

Browse Source 
This allows for icmp code range 0-16.

Type 9 Router advertisement reference:
https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml#icmp-parameters-codes-9/#table-icmp-parameters-ext-classes

Fixes #3349

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2019-07-05 23:10:02 +05:30 committed by GitHub
parent f1614aa7c2
commit e4ddee6fb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java
View File

@ -545,7 +545,7 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
}
if (icmpCode != null) {
if (icmpCode.longValue() != -1 && !NetUtils.validateIcmpCode(icmpCode.longValue())) {
throw new InvalidParameterValueException(String.format("Invalid icmp code [%d]. It should belong to [0-15] range and can be defined when icmpType belongs to [0-40] range", icmpCode));
throw new InvalidParameterValueException(String.format("Invalid icmp code [%d]. It should belong to [0-16] range and can be defined when icmpType belongs to [0-40] range", icmpCode));
}
}
}

2
server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java
View File

@ -685,7 +685,7 @@ public class NetworkACLServiceImplTest {
@Test(expected = InvalidParameterValueException.class)
public void validateIcmpTypeAndCodeTestIcmpTypeValidAndIcmpCodeInvalid() {
Mockito.when(networkAclItemVoMock.getIcmpType()).thenReturn(255);
Mockito.when(networkAclItemVoMock.getIcmpCode()).thenReturn(16);
Mockito.when(networkAclItemVoMock.getIcmpCode()).thenReturn(17);
networkAclServiceImpl.validateIcmpTypeAndCode(networkAclItemVoMock);
}

6
utils/src/main/java/com/cloud/utils/net/NetUtils.java
View File

@ -1215,9 +1215,9 @@ public class NetUtils {
public static boolean validateIcmpCode(final long icmpCode) {
//Source - http://www.erg.abdn.ac.uk/~gorry/course/inet-pages/icmp-code.html
if (!(icmpCode >= 0 && icmpCode <= 15)) {
s_logger.warn("Icmp code should be within 0-15 range");
// Reference: https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml#icmp-parameters-codes-9/#table-icmp-parameters-ext-classes
if (!(icmpCode >= 0 && icmpCode <= 16)) {
s_logger.warn("Icmp code should be within 0-16 range");
return false;
}