From 6f2d25f2ab5f07b15ec6b2a491d199df75bf2c40 Mon Sep 17 00:00:00 2001 From: jhughesbiot Date: Tue, 13 May 2025 16:08:37 -0600 Subject: [PATCH] show outbound connections when no tls connections are found --- modules/test/tls/python/src/tls_module.py | 23 +++++++++++++---------- modules/test/tls/python/src/tls_util.py | 11 ++++++----- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/modules/test/tls/python/src/tls_module.py b/modules/test/tls/python/src/tls_module.py index 3ccd96b59..bb5ff6695 100644 --- a/modules/test/tls/python/src/tls_module.py +++ b/modules/test/tls/python/src/tls_module.py @@ -165,9 +165,6 @@ def generate_module_report(self): signed_by ] - outbound_conns = self._tls_util.get_all_outbound_connections( - device_mac=self._device_mac, capture_files=pcap_files) - report_jinja = '' if pages: for num,page in pages.items(): @@ -185,18 +182,24 @@ def generate_module_report(self): ountbound_headers=outbound_headers, ) report_jinja += page_html - if outbound_conns: - out_page = template.render( - base_template=self._base_template_file, - ountbound_headers=outbound_headers, - outbound_conns=outbound_conns - ) - report_jinja += out_page + else: report_jinja = template.render( base_template=self._base_template_file, module_header = module_header, ) + + outbound_conns = self._tls_util.get_all_outbound_connections( + device_mac=self._device_mac, capture_files=pcap_files) + + if outbound_conns: + out_page = template.render( + base_template=self._base_template_file, + ountbound_headers=outbound_headers, + outbound_conns=outbound_conns + ) + report_jinja += out_page + LOGGER.debug('Module report:\n' + report_jinja) # Use os.path.join to create the complete file path diff --git a/modules/test/tls/python/src/tls_util.py b/modules/test/tls/python/src/tls_util.py index a60332e2d..f8e8ca036 100644 --- a/modules/test/tls/python/src/tls_util.py +++ b/modules/test/tls/python/src/tls_util.py @@ -400,15 +400,16 @@ def process_tls_server_results(self, tls_1_2_results, tls_1_3_results, port): description = (f"""TLS 1.2 {'' if tls_1_2_results[0] else 'not '}""" f"""validated on port {port}: """ f"""{tls_1_2_results[1]}""") - description += '\n'+(f"""TLS 1.3 {'' if tls_1_3_results[0] else 'not '}""" - f"""validated on port {port}: """ - f"""{tls_1_3_results[1]}""") + description += '\n' + ( + f"""TLS 1.3 {'' if tls_1_3_results[0] else 'not '}""" + f"""validated on port {port}: """ + f"""{tls_1_3_results[1]}""") results = tls_1_2_results[0] or tls_1_3_results[0], description else: description = (f"""TLS 1.2 not validated on port {port}: """ f"""{tls_1_2_results[1]}""") - description += '\n'+(f"""TLS 1.3 not validated on port {port}: """ - f"""{tls_1_3_results[1]}""") + description += '\n' + (f"""TLS 1.3 not validated on port {port}: """ + f"""{tls_1_3_results[1]}""") results = None, description LOGGER.info('TLS server test results: ' + str(results)) return results