fixed console logic

blacklanternsecurity · Feb 9, 2024 · 381f12a · 381f12a
1 parent c151411
commit 381f12a
Showing 1 changed file with 50 additions and 50 deletions.
diff --git a/bbot/cli.py b/bbot/cli.py
@@ -302,60 +302,60 @@ async def _main():
 
                 if not options.dry_run:
                     log.trace(f"Command: {' '.join(sys.argv)}")
-                    if not options.agent_mode and not options.yes and sys.stdin.isatty():
-                        log.hugesuccess(f"Scan ready. Press enter to execute {scanner.name}")
-                        input()
-
-                    def handle_keyboard_input(keyboard_input):
-                        kill_regex = re.compile(r"kill (?P<module>[a-z0-9_]+)")
-                        if keyboard_input:
-                            log.verbose(f'Got keyboard input: "{keyboard_input}"')
-                            kill_match = kill_regex.match(keyboard_input)
-                            if kill_match:
-                                module = kill_match.group("module")
-                                if module in scanner.modules:
-                                    log.hugewarning(f'Killing module: "{module}"')
-                                    scanner.manager.kill_module(module, message="killed by user")
-                                else:
-                                    log.warning(f'Invalid module: "{module}"')
-                        else:
-                            toggle_log_level(logger=log)
-                            scanner.manager.modules_status(_log=True)
-
-                    log.critical(f"is_pipe_transport_compatible: {stream.is_pipe_transport_compatible(sys.stdin)}")
-                    reader = stream.NonFileStreamReader(sys.stdin)
-
-                    # Reader
-                    reader = stream.StandardStreamReader()
-                    protocol = stream.StandardStreamReaderProtocol(reader)
-                    await asyncio.get_event_loop().connect_read_pipe(lambda: protocol, sys.stdin)
-
-                    async def akeyboard_listen():
-                        try:
-                            allowed_errors = 10
-                            while 1:
-                                keyboard_input = None
-                                try:
-                                    keyboard_input = smart_decode((await reader.readline()).strip())
-                                    allowed_errors = 10
-                                except Exception as e:
-                                    log_to_stderr(f"Error in keyboard listen loop: {e}", level="TRACE")
-                                    log_to_stderr(traceback.format_exc(), level="TRACE")
-                                    allowed_errors -= 1
-                                if keyboard_input is not None:
-                                    handle_keyboard_input(keyboard_input)
-                                    if allowed_errors <= 0:
-                                        break
-                        except Exception as e:
-                            log_to_stderr(f"Error in keyboard listen task: {e}", level="ERROR")
-                            log_to_stderr(traceback.format_exc(), level="TRACE")
 
-                    try:
+                    if sys.stdin.isatty():
+                        if not options.agent_mode and not options.yes:
+                            log.hugesuccess(f"Scan ready. Press enter to execute {scanner.name}")
+                            input()
+
+                        def handle_keyboard_input(keyboard_input):
+                            kill_regex = re.compile(r"kill (?P<module>[a-z0-9_]+)")
+                            if keyboard_input:
+                                log.verbose(f'Got keyboard input: "{keyboard_input}"')
+                                kill_match = kill_regex.match(keyboard_input)
+                                if kill_match:
+                                    module = kill_match.group("module")
+                                    if module in scanner.modules:
+                                        log.hugewarning(f'Killing module: "{module}"')
+                                        scanner.manager.kill_module(module, message="killed by user")
+                                    else:
+                                        log.warning(f'Invalid module: "{module}"')
+                            else:
+                                toggle_log_level(logger=log)
+                                scanner.manager.modules_status(_log=True)
+
+                        # Reader
+                        reader = stream.StandardStreamReader()
+                        protocol = stream.StandardStreamReaderProtocol(reader)
+                        await asyncio.get_event_loop().connect_read_pipe(lambda: protocol, sys.stdin)
+
+                        async def akeyboard_listen():
+                            try:
+                                allowed_errors = 10
+                                while 1:
+                                    keyboard_input = None
+                                    try:
+                                        keyboard_input = smart_decode((await reader.readline()).strip())
+                                        allowed_errors = 10
+                                    except Exception as e:
+                                        log_to_stderr(f"Error in keyboard listen loop: {e}", level="TRACE")
+                                        log_to_stderr(traceback.format_exc(), level="TRACE")
+                                        allowed_errors -= 1
+                                    if keyboard_input is not None:
+                                        handle_keyboard_input(keyboard_input)
+                                        if allowed_errors <= 0:
+                                            break
+                            except Exception as e:
+                                log_to_stderr(f"Error in keyboard listen task: {e}", level="ERROR")
+                                log_to_stderr(traceback.format_exc(), level="TRACE")
+
                         keyboard_listen_task = asyncio.create_task(akeyboard_listen())
+
+                    try:
                         await scanner.async_start_without_generator()
                     finally:
-                        keyboard_listen_task.cancel()
-                        with suppress(asyncio.CancelledError):
+                        with suppress(Exception):
+                            keyboard_listen_task.cancel()
                             await keyboard_listen_task
 
             except bbot.core.errors.ScanError as e: