From c7c389d61c55c26d7be3c684269613c6fef9cdd5 Mon Sep 17 00:00:00 2001 From: Kshitij Kansal Date: Tue, 8 Dec 2015 13:01:39 +0530 Subject: [PATCH] CLOUDSTACK-9086: ACS allows to create isolated networks with invalide gateway IP address - Fixed and Test cases added --- .../com/cloud/network/NetworkServiceImpl.java | 7 +++++++ .../java/com/cloud/utils/net/NetUtils.java | 8 ++++++++ .../java/com/cloud/utils/net/NetUtilsTest.java | 18 ++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 349499994b7..b6dac872f30 100644 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -1197,6 +1197,13 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } if (gateway != null && netmask != null) { + if(NetUtils.isNetworkorBroadcastIP(gateway,netmask)) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("The gateway IP provided is " + gateway + " and netmask is " + netmask + ". The IP is either broadcast or network IP."); + } + throw new InvalidParameterValueException("Invalid gateway IP provided. Either the IP is broadcast or network IP."); + } + if (!NetUtils.isValidIp(gateway)) { throw new InvalidParameterValueException("Invalid gateway"); } diff --git a/utils/src/main/java/com/cloud/utils/net/NetUtils.java b/utils/src/main/java/com/cloud/utils/net/NetUtils.java index 90a43fa7e2a..a73813c28d8 100644 --- a/utils/src/main/java/com/cloud/utils/net/NetUtils.java +++ b/utils/src/main/java/com/cloud/utils/net/NetUtils.java @@ -1570,5 +1570,13 @@ public class NetUtils { } return false; } + public static boolean isNetworkorBroadcastIP(String ip, String netmask){ + String cidr = getCidrFromGatewayAndNetmask(ip,netmask); + final SubnetUtils subnetUtils = new SubnetUtils(cidr); + subnetUtils.setInclusiveHostCount(false); + final boolean isInRange = subnetUtils.getInfo().isInRange(ip); + return !isInRange; + } + } diff --git a/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java b/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java index bf686c2a241..490d0df4eb0 100644 --- a/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java +++ b/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java @@ -508,4 +508,22 @@ public class NetUtilsTest { public void testIsNetworksOverlapWithEmptyValues() { assertEquals(false, NetUtils.isNetworksOverlap("", null)); } + @Test + public void testisNetworkorBroadCastIP(){ + //Checking the True conditions + assertTrue(NetUtils.isNetworkorBroadcastIP("192.168.0.0","255.255.255.0")); + assertTrue(NetUtils.isNetworkorBroadcastIP("192.168.0.255","255.255.255.0")); + assertTrue(NetUtils.isNetworkorBroadcastIP("192.168.0.127","255.255.255.128")); + assertTrue(NetUtils.isNetworkorBroadcastIP("192.168.0.63","255.255.255.192")); + + //Checking the False conditions + assertFalse(NetUtils.isNetworkorBroadcastIP("192.168.0.1","255.255.255.0")); + assertFalse(NetUtils.isNetworkorBroadcastIP("192.168.0.127","255.255.255.0")); + assertFalse(NetUtils.isNetworkorBroadcastIP("192.168.0.126","255.255.255.128")); + assertFalse(NetUtils.isNetworkorBroadcastIP("192.168.0.62","255.255.255.192")); + + assertTrue(NetUtils.isNetworkorBroadcastIP("192.168.0.63","255.255.255.192")); + assertFalse(NetUtils.isNetworkorBroadcastIP("192.168.0.63","255.255.255.128")); + } + }