refactor(validators): simplify validation logic and improve error messages for required, file, and CIDR checks

Author: ayanrajpoot10

bugscanx/utils/cidr.py

@@ -3,10 +3,6 @@
 
 
 def get_hosts_from_cidr(cidr_input):
-    """
-    Legacy function for backward compatibility.
-    WARNING: This loads all IPs into memory. Use cidr_hosts_generator for large ranges.
-    """
     hosts = []
     cidr_ranges = [c.strip() for c in cidr_input.split(',')]
 
@@ -19,47 +15,6 @@ def get_hosts_from_cidr(cidr_input):
     return hosts
 
 
-# def cidr_hosts_generator(cidr_input):
-#     """
-#     Generator function that yields hosts from CIDR ranges without loading all in memory.
-#     Use this for memory-efficient CIDR scanning.
-#     """
-#     cidr_ranges = [c.strip() for c in cidr_input.split(',')]
-    
-#     for cidr in cidr_ranges:
-#         try:
-#             network = ipaddress.ip_network(cidr, strict=False)
-#             for ip in network.hosts():
-#                 yield str(ip)
-#         except ValueError:
-#             continue
-
-
-def get_total_cidr_hosts(cidr_input):
-    """
-    Calculate the total number of hosts in CIDR ranges without generating them.
-    """
-    total = 0
-    cidr_ranges = [c.strip() for c in cidr_input.split(',')]
-    
-    for cidr in cidr_ranges:
-        try:
-            network = ipaddress.ip_network(cidr, strict=False)
-            # For host addresses, subtract network and broadcast addresses
-            total += max(0, network.num_addresses - 2)
-        except ValueError:
-            continue
-    return total
-
-
-def validate_cidr(cidr):
-    try:
-        ipaddress.ip_network(cidr, strict=False)
-        return True
-    except ValueError:
-        return False
-
-
 def read_cidrs_from_file(filepath):
     valid_cidrs = []
     try:

bugscanx/utils/common.py

@@ -76,7 +76,7 @@ def get_input(
 
     if validate_input and validators:
         if input_type == "number":
-            validators = [lambda x: is_digit(x, allow_comma_separated)]
+            validators = [required, lambda x: is_digit(x, allow_comma_separated)]
         common_params["validate"] = create_validator(validators)
 
     input_type_params = {
@@ -95,8 +95,6 @@ def get_input(
     common_params.update(kwargs)
 
     handler = INPUT_HANDLERS.get(input_type)
-    if not handler:
-        raise ValueError(f"Unsupported input_type: {input_type}")
 
     return strip_handler(handler, strip_input)(common_params)
 

bugscanx/utils/validators.py

@@ -34,47 +34,28 @@ def validate(self, document):
 
 
 def required(text):
-    return bool(text.strip()) or "Input cannot be empty"
+    return True if text.strip() else "Input is required."
 
 
 def is_file(text):
-    return os.path.isfile(text) or f"File does not exist: {text}"
+    return os.path.isfile(text) or f"File not found: {text}"
 
 
 def is_cidr(text):
     if not text.strip():
         return "CIDR input cannot be empty"
-
-    if text.endswith(',') or ',,' in text:
-        return "Empty value after comma"
-
-    parts = [p.strip() for p in text.split(',')]
-    for part in parts:
-        if not part:
-            return "Empty value between commas"
-        try:
-            ipaddress.ip_network(part, strict=False)
-        except ValueError:
-            return f"Invalid CIDR notation: {part}"
-    return True
+    
+    try:
+        ipaddress.ip_network(text.strip(), strict=False)
+        return True
+    except ValueError:
+        return f"Invalid CIDR notation: {text.strip()}"
 
 
 def is_digit(text, allow_comma=True):
-    if not text.strip():
-        return "Input cannot be empty"
-
     if not allow_comma and ',' in text:
-        return "Multi values are not allowed"
-
-    parts = text.split(',') if allow_comma else [text]
-
-    if text.endswith(',') or ',,' in text:
-        return "Empty value after comma"
-
-    for part in parts:
-        part = part.strip()
-        if not part:
-            return "Empty value between commas"
-        if not part.isdigit():
-            return f"Not a valid number: {part}"
+        return "Only a single value allowed"
+    
+    if not text.strip().replace(',', '').replace(' ', '').isdigit():
+        return f"Invalid number: {text}"
     return True