Apply suggestions from code review

Author: DaanHoogland

services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java

@@ -402,7 +402,7 @@ private List<String> getAllowedInternalSiteCidrs() {
         }
         String[] cidrs = _allowedInternalSites.split(",");
         for (String cidr : cidrs) {
-            if (NetUtils.isValidIp4Cidr(cidr)) {
+            if (NetUtils.isValidIp4Cidr(cidr) && !cidr.startsWith("0.0.0.0")) {
                 if (! NetUtils.getCleanIp4Cidr(cidr).equals(cidr)) {
                     s_logger.warn(String.format("Invalid CIDR %s in %s", cidr, SecStorageAllowedInternalDownloadSites.key()));
                 }
@@ -411,8 +411,6 @@ private List<String> getAllowedInternalSiteCidrs() {
                 String newCidr = cidr + "/32";
                 s_logger.warn(String.format("Ip address is not a valid CIDR; %s using %s/32", cidr, newCidr));
                 allowedCidrs.add(newCidr);
-            } else if (!cidr.startsWith("0.0.0.0")) {
-                allowedCidrs.add(NetUtils.getCleanIp4Cidr(cidr));
             }
         }
         return allowedCidrs;

utils/src/main/java/com/cloud/utils/net/NetUtils.java

@@ -574,7 +574,7 @@ public static boolean isValidIp4Cidr(final String cidr) {
 
         final String[] cidrPair = cidr.split("\\/");
         if (cidrPair.length != 2) {
-            return isValidIp4(cidr); // we consider an ip4v address as a valid /32 cidr
+            return false;
         }
         final String cidrAddress = cidrPair[0];
         final String cidrSize = cidrPair[1];