(cloudstack) branch 4.19 updated: consider a valid ipv4 address as a validish ipv4 /32 cidr (#10174)

[weizhou]

This is an automated email from the ASF dual-hosted git repository.

weizhou pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.19 by this push:
     new cf5bd803110 consider a valid ipv4 address as a validish ipv4 /32 cidr 
(#10174)
cf5bd803110 is described below

commit cf5bd803110abb6c3b5f5438dafc87124929d34a
Author: dahn <d...@onecht.net>
AuthorDate: Wed Jan 15 14:00:43 2025 +0100

    consider a valid ipv4 address as a validish ipv4 /32 cidr (#10174)
    
    * consider a valid ipv4 address as a validish ipv4 /32 cidr
    
    * refactor cidr evaluation for internal nets
    
    * Apply suggestions from code review
    
    * Update 
services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
    
    * Update 
services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
---
 .../cloudstack/secondarystorage/SecondaryStorageManagerImpl.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
 
b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index cd6f23923e1..94a8f367d08 100644
--- 
a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ 
b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -402,10 +402,13 @@ public class SecondaryStorageManagerImpl extends 
ManagerBase implements Secondar
         }
         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) && !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()));
                 }
+                allowedCidrs.add(NetUtils.getCleanIp4Cidr(cidr));
+            } else if (NetUtils.isValidIp4(cidr) && 
!cidr.startsWith("0.0.0.0")) {
+                s_logger.warn(String.format("Ip address is not a valid CIDR; 
%s consider using %s/32", cidr, cidr));
                 allowedCidrs.add(cidr);
             }
         }