refactor(host_scanner): enhance CIDR input handling and add file reading support

refactor(validators): improve CIDR validation logic for better error handling

Author: ayanrajpoot10

bugscanx/modules/scanners/host_scanner.py

@@ -1,6 +1,7 @@
 import os
 
 from bugscanx.utils.common import get_input, get_confirm, is_cidr
+from bugscanx.utils.cidr import read_cidrs_from_file
 
 
 def get_cidr_ranges_from_input(cidr_input):
@@ -30,7 +31,11 @@ def get_common_inputs(input_source):
 def get_host_input():
     filename = get_input("Enter filename", "file", mandatory=False)
     if not filename:
-        cidr = get_input("Enter CIDR range(s)", validators=[is_cidr])
+        cidr = get_input("Enter CIDR range(s)", validators=[is_cidr], mandatory=False)
+        if not cidr:
+            cidr_file = get_input(
+                "Enter CIDR file", "file")
+            cidr = read_cidrs_from_file(cidr_file) if cidr_file else None
         return None, cidr
     return filename, None
 
@@ -54,7 +59,10 @@ def get_input_direct(no302=False):
     )
 
     if cidr:
-        cidr_ranges = get_cidr_ranges_from_input(cidr)
+        try:
+            cidr_ranges = get_cidr_ranges_from_input(cidr)
+        except AttributeError:
+            cidr_ranges = cidr
         from .scanners.direct import CIDRDirectScanner        
         scanner = CIDRDirectScanner(
             method_list=method_list,
@@ -93,7 +101,10 @@ def get_input_proxy():
     output, threads = get_common_inputs(filename or cidr)
 
     if cidr:
-        cidr_ranges = get_cidr_ranges_from_input(cidr)
+        try:
+            cidr_ranges = get_cidr_ranges_from_input(cidr)
+        except AttributeError:
+            cidr_ranges = cidr
         from .scanners.proxy_check import CIDRProxyScanner
         scanner = CIDRProxyScanner(
             cidr_ranges=cidr_ranges,
@@ -144,7 +155,10 @@ def get_input_proxy2():
         proxy_password = get_input("Enter proxy password")
 
     if cidr:
-        cidr_ranges = get_cidr_ranges_from_input(cidr)
+        try:
+            cidr_ranges = get_cidr_ranges_from_input(cidr)
+        except AttributeError:
+            cidr_ranges = cidr
         from .scanners.proxy_request import CIDRProxy2Scanner
         scanner = CIDRProxy2Scanner(
             method_list=method_list,
@@ -172,7 +186,10 @@ def get_input_ssl():
     output, threads = get_common_inputs(filename or cidr)
 
     if cidr:
-        cidr_ranges = get_cidr_ranges_from_input(cidr)
+        try:
+            cidr_ranges = get_cidr_ranges_from_input(cidr)
+        except AttributeError:
+            cidr_ranges = cidr
         from .scanners.ssl import CIDRSSLScanner
         scanner = CIDRSSLScanner(
             cidr_ranges=cidr_ranges,
@@ -197,7 +214,10 @@ def get_input_ping():
     output, threads = get_common_inputs(filename or cidr)
 
     if cidr:
-        cidr_ranges = get_cidr_ranges_from_input(cidr)
+        try:
+            cidr_ranges = get_cidr_ranges_from_input(cidr)
+        except AttributeError:
+            cidr_ranges = cidr
         from .scanners.ping import CIDRPingScanner
         scanner = CIDRPingScanner(
             port_list=port_list,

bugscanx/utils/cidr.py

@@ -2,19 +2,6 @@
 from rich import print
 
 
-def get_hosts_from_cidr(cidr_input):
-    hosts = []
-    cidr_ranges = [c.strip() for c in cidr_input.split(',')]
-    
-    for cidr in cidr_ranges:
-        try:
-            network = ipaddress.ip_network(cidr, strict=False)
-            hosts.extend([str(ip) for ip in network.hosts()])
-        except ValueError:
-            continue
-    return hosts
-
-
 def read_cidrs_from_file(filepath):
     valid_cidrs = []
     try:
@@ -29,9 +16,6 @@ def read_cidrs_from_file(filepath):
                 except ValueError:
                     pass
 
-        if valid_cidrs:
-            print(f"[green] Successfully loaded {len(valid_cidrs)} valid CIDR ranges[/green]")
-            
         return valid_cidrs
     except Exception as e:
         print(f"[bold red]Error reading file: {e}[/bold red]")

bugscanx/utils/validators.py

@@ -45,11 +45,17 @@ def is_cidr(text):
     if not text.strip():
         return "CIDR input cannot be empty"
 
-    try:
-        ipaddress.ip_network(text.strip(), strict=False)
-        return True
-    except ValueError:
-        return f"Invalid CIDR notation: {text.strip()}"
+    cidrs = [cidr.strip() for cidr in text.split(',')]
+    
+    for cidr in cidrs:
+        if not cidr:
+            continue
+        try:
+            ipaddress.ip_network(cidr, strict=False)
+        except ValueError:
+            return f"Invalid CIDR notation: {cidr}"
+    
+    return True
 
 
 def is_digit(text, allow_comma=True):