refactor: Improve input handling and user prompts; add TLS version input for SSL scanner; apply formatting updates

- Enhanced input handling to support comma-separated values
- Improved user prompts in common utilities
- Added TLS version input support in the SSL scanner
- Made general formatting improvements

Author: ayanrajpoot10

bugscanx/modules/scanners_pro/host_scanner_pro.py

@@ -18,7 +18,7 @@ def read_hosts(filename=None, cidr=None):
 
 def get_common_inputs(input_source):
     output = get_input("Enter output filename", default=f"result_{os.path.basename(str(input_source))}", validate_input=False)
-    threads = get_input("Enter threads", "number", default="50")
+    threads = get_input("Enter threads", "number", default="50", allow_comma_separated=False)
     return output, threads
 
 def get_host_input():
@@ -28,12 +28,16 @@ def get_host_input():
         return None, cidr
     return filename, None
 
+def list_to_comma_separated(result):
+    return ', '.join(result) if isinstance(result, list) else result
+
 def get_input_direct(no302=False):
     filename, cidr = get_host_input()
     port_list = get_input("Enter port(s)", "number", default="80").split(',')
     output, threads = get_common_inputs(filename or cidr)
     method_list = get_input("Select HTTP method(s)", "choice", multiselect=True, 
-                           choices=["GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS", "TRACE", "PATCH"])
+                           choices=["GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS", "TRACE", "PATCH"],
+                           transformer=list_to_comma_separated)
 
     scanner = DirectScanner()
     scanner.method_list = method_list
@@ -59,7 +63,7 @@ def get_input_proxy():
     payload = get_input("Enter payload", default=default_payload)
     port_list = get_input("Enter port(s)", "number", default="80").split(',')
     output, threads = get_common_inputs(filename or cidr)
-    bug = get_input("Enter bug (optional)", default="", validate_input=False)
+    bug = get_input("Enter bug", default="", validate_input=False, instruction="(optional)")
 
     scanner = ProxyScanner()
     scanner.host_list = read_hosts(filename, cidr)
@@ -77,10 +81,11 @@ def get_input_proxy2():
     filename, cidr = get_host_input()
     port_list = get_input("Enter port(s)", "number", default="80").split(',')
     output, threads = get_common_inputs(filename or cidr)
-    method_list = get_input("Select HTTP method", "choice", multiselect=True, 
-                           choices=["GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS", "TRACE", "PATCH"])
+    method_list = get_input("Select HTTP method(s)", "choice", multiselect=True, 
+                           choices=["GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS", "TRACE", "PATCH"],
+                           transformer=list_to_comma_separated)
 
-    proxy = get_input("Enter proxy (proxy:port)")
+    proxy = get_input("Enter proxy", instruction="(proxy:port)")
 
     use_auth = get_confirm(" Use proxy authentication?")
     proxy_username = None
@@ -101,10 +106,14 @@ def get_input_proxy2():
 
 def get_input_ssl():
     filename, cidr = get_host_input()
+    tls_version = get_input("Select TLS version", "choice", 
+                           choices=list(SSLScanner.TLS_VERSIONS.keys()),
+                           default="TLS 1.2")
     output, threads = get_common_inputs(filename or cidr)
 
     scanner = SSLScanner()
     scanner.host_list = read_hosts(filename, cidr)
+    scanner.tls_version = SSLScanner.TLS_VERSIONS[tls_version]
 
     return scanner, output, threads
 
@@ -121,16 +130,16 @@ def get_input_ping():
     return scanner, output, threads
 
 def get_user_input():
-    mode = get_input("Select mode", "choice", 
-                    choices=["direct", "direct-no302", "proxy-check", "proxy-request", "ping", "ssl"])
+    mode = get_input("Select scanning mode", "choice", 
+                    choices=["Direct", "Direct-no302", "Proxy-check", "Proxy-request", "Ping", "SSL"])
 
     input_handlers = {
-        'direct': lambda: get_input_direct(no302=False),
-        'direct-no302': lambda: get_input_direct(no302=True),
-        'proxy-check': get_input_proxy,
-        'proxy-request': get_input_proxy2,
-        'ping': get_input_ping,
-        'ssl': get_input_ssl
+        'Direct': lambda: get_input_direct(no302=False),
+        'Direct-no302': lambda: get_input_direct(no302=True),
+        'Proxy-check': get_input_proxy,
+        'Proxy-request': get_input_proxy2,
+        'Ping': get_input_ping,
+        'SSL': get_input_ssl
     }
 
     scanner, output, threads = input_handlers[mode]()
@@ -143,7 +152,7 @@ def main():
 
     if output:
         with open(output, 'a+') as file:
-            if mode == 'proxy-check':
+            if mode == 'Proxy-check':
                 json.dump(scanner.success_list(), file, indent=2)
             else:
                 file.write('\n'.join([str(x) for x in scanner.success_list()]) + '\n')

bugscanx/modules/scanners_pro/scanners/ssl.py

@@ -3,55 +3,71 @@
 from .base import BaseScanner
 
 class SSLScanner(BaseScanner):
-	host_list = []
-
-	def get_task_list(self):
-		for host in self.filter_list(self.host_list):
-			yield {
-				'host': host,
-			}
-
-	def log_info(self, status, server_name_indication):
-		super().log(f'{status:<6}  {server_name_indication}')
-
-	def log_info_result(self, **kwargs):
-		status = kwargs.get('status', '')
-		if status:
-			status = 'True'
-			server_name_indication = kwargs.get('server_name_indication', '')
-			self.log_info(status, server_name_indication)
-
-	def init(self):
-		super().init()
-		self.log_info('Status', 'Server Name Indication')
-		self.log_info('------', '----------------------')
-
-	def task(self, payload):
-		server_name_indication = payload['host']
-
-		if not server_name_indication:
-			return
-
-		response = {
-			'server_name_indication': server_name_indication,
-		}
-
-		try:
-			socket_client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-			socket_client.settimeout(5)
-			socket_client.connect((server_name_indication, 443))
-			socket_client = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2).wrap_socket(
-				socket_client, server_hostname=server_name_indication, do_handshake_on_connect=True
-			)
-			response['status'] = True
-			self.task_success(server_name_indication)
-			self.log_info_result(**response)
-
-		except Exception:
-			pass
-
-		self.log_replace(server_name_indication)
-
-	def complete(self):
-		self.log_replace(self.colorize("Scan completed", "GREEN"))
-		super().complete()
+    host_list = []
+
+    def __init__(self):
+        super().__init__()
+        self.tls_version = ssl.PROTOCOL_TLS
+
+    TLS_VERSIONS = {
+        'TLS 1.0': ssl.PROTOCOL_TLSv1,
+        'TLS 1.1': ssl.PROTOCOL_TLSv1_1,
+        'TLS 1.2': ssl.PROTOCOL_TLSv1_2,
+        'TLS 1.3': ssl.PROTOCOL_TLS
+    }
+
+    def get_task_list(self):
+        for host in self.filter_list(self.host_list):
+            yield {
+                'host': host,
+            }
+
+    def log_info(self, **kwargs):
+        kwargs.setdefault('color', '')
+        kwargs.setdefault('sni', '')
+        kwargs.setdefault('tls_version', '')
+        
+        messages = [
+            self.colorize('{tls_version:<8}', 'CYAN'),
+            self.colorize('{sni}', 'LGRAY'),
+        ]
+        super().log('  '.join(messages).format(**kwargs))
+
+    def log_info_result(self, **kwargs):
+        self.log_info(**kwargs)
+
+    def init(self):
+        super().init()
+        self.log_info(tls_version='TLS', sni='SNI')
+        self.log_info(tls_version='---', sni='---')
+
+    def task(self, payload):
+        sni = payload['host']
+
+        if not sni:
+            return
+
+        response = {
+            'sni': sni,
+            'tls_version': 'Unknown'
+        }
+
+        try:
+            with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as socket_client:
+                socket_client.settimeout(5)
+                socket_client.connect((sni, 443))
+                context = ssl.SSLContext(self.tls_version)
+                with context.wrap_socket(
+                    socket_client, server_hostname=sni, do_handshake_on_connect=True
+                ) as ssl_socket:
+                    response['tls_version'] = ssl_socket.version()
+                    self.task_success(sni)
+                    self.log_info_result(**response)
+        except Exception:
+            pass
+
+        self.log_replace(sni)
+
+    def complete(self):
+        self.log_replace(self.colorize("Scan completed", "GREEN"))
+        super().complete()

bugscanx/utils/common.py

@@ -42,22 +42,25 @@ def get_input(
     validate_input=True,
     instruction="",
     mandatory=True,
+    allow_comma_separated=True,
     **kwargs
 ):
     common_params = {
-        "message": f" {message}:",
+        "message": f" {message.strip()}" + ("" if instruction else ":"),
         "default": "" if default is None else str(default),
         "qmark": kwargs.pop("qmark", ""),
         "amark": kwargs.pop("amark", ""),
         "style": style,
-        "instruction": instruction,
+        "instruction": instruction + (":" if instruction else ""),
         "mandatory": mandatory,
     }
 
     if validators is None and validate_input:
         validators = INPUT_VALIDATORS.get(input_type, [])
-    
+        
     if validate_input and validators:
+        if input_type == "number":
+            validators = [lambda x: is_digit(x, allow_comma_separated)]
         common_params["validate"] = create_validator(validators)
 
     input_type_params = {