From 21f9add9ce4a67214d67e154d26e9843a62049d2 Mon Sep 17 00:00:00 2001
From: hiteshbedre <32206192+hiteshbedre@users.noreply.github.com>
Date: Fri, 21 Apr 2023 16:07:48 +0530
Subject: [PATCH] Corrected IPv4 Validation

---
 libs/hbb_common/src/lib.rs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/libs/hbb_common/src/lib.rs b/libs/hbb_common/src/lib.rs
index 7d841613d..e80b9e609 100644
--- a/libs/hbb_common/src/lib.rs
+++ b/libs/hbb_common/src/lib.rs
@@ -286,7 +286,7 @@ pub fn get_time() -> i64 {
 
 #[inline]
 pub fn is_ipv4_str(id: &str) -> bool {
-    regex::Regex::new(r"^\d+\.\d+\.\d+\.\d+(:\d+)?$")
+    regex::Regex::new(r"^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$")
         .unwrap()
         .is_match(id)
 }
@@ -394,6 +394,21 @@ mod test {
         assert!(!is_ipv6_str("[1:2::0]:"));
         assert!(!is_ipv6_str("1:2::0]:1"));
     }
+    
+    #[test]
+    fn test_ipv4() {
+        assert!(is_ipv4_str("1.2.3.4"));
+        assert!(is_ipv4_str("192.168.0.1"));
+        assert!(is_ipv4_str("0.0.0.0"));
+        assert!(is_ipv4_str("255.255.255.255"));
+        assert!(!is_ipv4_str("256.0.0.0"));
+        assert!(!is_ipv4_str("256.256.256.256"));
+        assert!(!is_ipv4_str("1:2:"));
+        assert!(!is_ipv4_str("192.168.0.256"));
+        assert!(!is_ipv4_str("192.168.0.1/24"));
+        assert!(!is_ipv4_str("192.168.0."));
+        assert!(!is_ipv4_str("192.168..1"));   
+    }
 
     #[test]
     fn test_hostname_port() {