weizhouapache commented on code in PR #10174:
URL: https://github.com/apache/cloudstack/pull/10174#discussion_r1909926828
##########
services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java:
##########
@@ -402,11 +402,17 @@ private List<String> getAllowedInternalSiteCidrs() {
}
String[] cidrs = _allowedInternalSites.split(",");
for (String cidr : cidrs) {
- if (NetUtils.isValidIp4Cidr(cidr) || NetUtils.isValidIp4(cidr) ||
!cidr.startsWith("0.0.0.0")) {
- if (NetUtils.getCleanIp4Cidr(cidr).equals(cidr)) {
+ if (NetUtils.isValidIp4Cidr(cidr)) {
+ if (! NetUtils.getCleanIp4Cidr(cidr).equals(cidr)) {
s_logger.warn(String.format("Invalid CIDR %s in %s", cidr,
SecStorageAllowedInternalDownloadSites.key()));
}
- allowedCidrs.add(cidr);
+ allowedCidrs.add(NetUtils.getCleanIp4Cidr(cidr));
+ } else if (NetUtils.isValidIp4(cidr)) {
+ 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));
Review Comment:
makes sense.
maybe the check should be
```
if ((NetUtils.isValidIp4Cidr(cidr)
|| (NetUtils.isValidIp4(cidr) && !cidr.startsWith("0.0.0.0")))
```
?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
