added the --show-ips option to show all ips in a cidr range

Author: ShyftXero

in_scope.txt

@@ -1,10 +1,11 @@
 1.1.1.1 # this is a comments after an addy
 8.8.8.8
 1.2.3.4 
-192.168.1.0/24
-172.16.0.0/16
+192.168.1.0/28
+# 172.16.0.0/16
 12.34.13.37
 # this is a comment
 #vuln.target.com 
 1.2.3.4
 shyft.us
+

indascope.py

@@ -10,6 +10,7 @@
 
 
 import typer
+og_print = print
 from rich import print
 
 __VERSION__ = '' # this is updated with make release which rebuilds 
@@ -37,7 +38,7 @@ def get_ip(host:str, verbose=True, loading_scope=False) -> ipaddress.IPv4Address
 
 
 
-def build_targets(scope_file) -> set:
+def build_scope(scope_file, showing:bool=False) -> set:
     targets = set()
     try:
         f = open(scope_file)
@@ -69,29 +70,32 @@ def build_targets(scope_file) -> set:
                     print('is an ip ', line)
                 targets.add(ipaddress.IPv4Address(line))   
             elif re.search(r'\d\/\d*$', line): # for cidr networks e.g. 10.0.0.0/8
-                if VERBOSE:
-                    print('is a cidr', line)
-                ip_net = ipaddress.ip_network(line)
+                
+                ip_net = ipaddress.ip_network(line, strict=False)
+                
                 net = [ip for ip in ip_net] # add all the ips to the set... 
+                if VERBOSE:
+                    print(f'is a cidr {line} with {len(net)} IPs starting at {net[0]} and ending at {net[-1]}')
                 targets.update(net)
             elif re.search(r'\w', line): # is a hostname... we need the ip 
+                
+                ip = get_ip(line, loading_scope=True)   
                 if VERBOSE:
-                    print('is a hostname', line)
-                ip = get_ip(line, loading_scope=True)       
+                    print(f'is a hostname "{line}" with ip {ip}')    
                 targets.add(ip)         # add the ip to the set
                 targets.add(line)       # and the hostname...    
     try:
         targets.remove(None) # remove erroneous entries to the set      
     except KeyError as e:
         pass
 
-    if VERBOSE:
-        num_targets = len(targets)
-        if num_targets < 512:
-            print(targets)  # rich.print is slow on large collections. 
-        print(f'Total in scope IPS: {num_targets}')
-        print('-'*30)
-
+    # if VERBOSE and showing == False:
+    #     num_targets = len(targets)
+    #     if num_targets < 512:
+    #         print(targets)  # rich.print is slow on large collections. 
+    #     print(f'Total in scope IPS: {num_targets}')
+    #     print('-'*30)
+    
     return targets
 
 def check(in_scope_targets, potential_targets, verbose=False):
@@ -120,18 +124,32 @@ def check(in_scope_targets, potential_targets, verbose=False):
 
 
 @app.command()
-def in_scope(targets:List[str]=typer.Argument(None), target_file:Path=None, scope_file:Path=f'./in_scope.txt', verbose:bool=typer.Option(False, '-v'), version:bool=typer.Option(False, '--version')):
+def in_scope(targets:List[str]=typer.Argument(None), target_file:Path=None, scope_file:Path=f'./in_scope.txt', verbose:bool=typer.Option(False, '-v'), show:bool=typer.Option(False, '--show-ips', '-s'), version:bool=typer.Option(False, '--version')):
     """Checks to see if one or more host IPs are in the scope file; """
     if version:
         print(__VERSION__)
         sys.exit()
-
     if verbose == True:
         global VERBOSE
         VERBOSE = True
 
-    in_scope_ips = build_targets(scope_file)
-        
+    in_scope_targets = build_scope(scope_file, showing=show)
+
+    if show:
+        in_scope_host : ipaddress.IPv4Address
+        # for in_scope_host in in_scope_targets: # 10 seconds for example scope; 65k ips
+        #     if type(in_scope_host) == ipaddress.IPv4Address:
+
+        #     print(str(in_scope_host))
+
+        ips=[str(x) for x in in_scope_targets]
+        print(sorted(ips)) # 5 seconds ; 65k ips
+        if VERBOSE:
+            print(f'Total in scope hosts (IPs and hostnames): {len(in_scope_targets)}')
+        sys.exit()
+
+
+    
     if len(targets) == 0  and target_file == None:
         # print('using stdin')
         targets = sys.stdin.read().splitlines(keepends=False)
@@ -140,7 +158,7 @@ def in_scope(targets:List[str]=typer.Argument(None), target_file:Path=None, scop
             targets = f.read().splitlines(keepends=False)
 
 
-    with WorkerPool(shared_objects=in_scope_ips) as pool:
+    with WorkerPool(shared_objects=in_scope_targets) as pool:
         # https://slimmer-ai.github.io/mpire/v2.1.0/usage/worker_pool.html#shared-objects
         # pool.set_shared_objects(in_scope_ips) # another way to do this inside of 
         pool.map(check, targets)

readme.md

@@ -43,6 +43,39 @@ OR
 ```bash
 indascope -f list_of_potenttial_targets.txt
 ```
+
+OR
+
+```bash
+indascope --show-ips 
+[
+    '1.1.1.1',
+    '1.2.3.4',
+    '12.34.13.37',
+    '192.168.1.0',
+    '192.168.1.1',
+    '192.168.1.10',
+    '192.168.1.11',
+    '192.168.1.12',
+    '192.168.1.13',
+    '192.168.1.14',
+    '192.168.1.15',
+    '192.168.1.2',
+    '192.168.1.3',
+    '192.168.1.4',
+    '192.168.1.5',
+    '192.168.1.6',
+    '192.168.1.7',
+    '192.168.1.8',
+    '192.168.1.9',
+    '3.224.74.192',
+    '8.8.8.8',
+    'shyft.us'
+]
+```
+
+
+
 ## Scope files (in_scope.txt)
 scope files are just lines of IP addresses, CIDR ranges, and/or domain/hostnames