Merge 9814d18baf into 28a1e23986

README.md

@@ -219,8 +219,6 @@ For convenience, a web front-end on top of the command-line tool is available at
 ### v3.4.0-dev
  - Added warning to all key exchanges that do not include protections against quantum attacks due to the Harvest Now, Decrypt Later strategy (see https://en.wikipedia.org/wiki/Harvest_now,_decrypt_later).
  - Migrated from deprecated `getopt` module to `argparse`; partial credit [oam7575](https://github.com/oam7575).
- - When running against multiple hosts, now prints each target host regardless of output level.
- - Batch mode (`-b`) no longer automatically enables verbose mode, due to sometimes confusing results; users can still explicitly enable verbose mode using the `-v` flag.
 
 ### v3.3.0 (2024-10-15)
  - Added Python 3.13 support.

src/ssh_audit/outputbuffer.py

@@ -54,11 +54,11 @@ class OutputBuffer:
         self.__is_color_supported = ('colorama' in sys.modules) or (os.name == 'posix')
         self.line_ended = True
 
-    def _print(self, level: str, s: str = '', line_ended: bool = True, always_print: bool = False) -> None:
+    def _print(self, level: str, s: str = '', line_ended: bool = True) -> None:
         '''Saves output to buffer (if in buffered mode), or immediately prints to stdout otherwise.'''
 
-        # If we're logging only 'warn' or above, and this is an 'info', ignore message, unless always_print is True (useful for printing informational lines regardless of the level setting).
-        if (always_print is False) and (self.get_level(level) < self.__level):
+        # If we're logging only 'warn' or above, and this is an 'info', ignore message.
+        if self.get_level(level) < self.__level:
             return
 
         if self.use_colors and self.colors_supported and len(s) > 0 and level != 'info':
@@ -145,22 +145,22 @@ class OutputBuffer:
             self._print('head', s, line_ended)
         return self
 
-    def fail(self, s: str, line_ended: bool = True, write_now: bool = False, always_print: bool = False) -> 'OutputBuffer':
-        self._print('fail', s, line_ended, always_print=always_print)
+    def fail(self, s: str, line_ended: bool = True, write_now: bool = False) -> 'OutputBuffer':
+        self._print('fail', s, line_ended)
         if write_now:
             self.write()
         return self
 
-    def warn(self, s: str, line_ended: bool = True, always_print: bool = False) -> 'OutputBuffer':
-        self._print('warn', s, line_ended, always_print=always_print)
+    def warn(self, s: str, line_ended: bool = True) -> 'OutputBuffer':
+        self._print('warn', s, line_ended)
         return self
 
-    def info(self, s: str, line_ended: bool = True, always_print: bool = False) -> 'OutputBuffer':
-        self._print('info', s, line_ended, always_print=always_print)
+    def info(self, s: str, line_ended: bool = True) -> 'OutputBuffer':
+        self._print('info', s, line_ended)
         return self
 
-    def good(self, s: str, line_ended: bool = True, always_print: bool = False) -> 'OutputBuffer':
-        self._print('good', s, line_ended, always_print=always_print)
+    def good(self, s: str, line_ended: bool = True) -> 'OutputBuffer':
+        self._print('good', s, line_ended)
         return self
 
     def sep(self) -> 'OutputBuffer':

src/ssh_audit/ssh_audit.py

@@ -533,9 +533,9 @@ def output(out: OutputBuffer, aconf: AuditConf, banner: Optional[Banner], header
                 else:
                     host = '%s:%d' % (aconf.host, aconf.port)
 
-            out.good('(gen) target: {}'. format(host), always_print=True)
+            out.good('(gen) target: {}'. format(host))
         if client_audit:
-            out.good('(gen) client IP: {}'.format(client_host), always_print=True)
+            out.good('(gen) client IP: {}'.format(client_host))
         if len(header) > 0:
             out.info('(gen) header: ' + '\n'.join(header))
         if banner is not None:
@@ -863,6 +863,7 @@ def process_commandline(out: OutputBuffer, args: List[str]) -> 'AuditConf':  # p
 
         if argument.batch is True:
             aconf.batch = True
+            aconf.verbose = True
 
         # If one -j was given, turn on JSON output.  If -jj was given, enable indentation.
         aconf.json = argument.json > 0

test/test_auditconf.py

@@ -162,7 +162,7 @@ class TestAuditConf:
         conf = c('-64 localhost')
         self._test_conf(conf, host='localhost', ipv4=True, ipv6=True, ipvo=(6, 4))
         conf = c('-b localhost')
-        self._test_conf(conf, host='localhost', batch=True)
+        self._test_conf(conf, host='localhost', batch=True, verbose=True)
         conf = c('-n localhost')
         self._test_conf(conf, host='localhost', colors=False)
         conf = c('-v localhost')