Skip to content

bug/outbound_connections #1297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jboddey merged 2 commits into from
May 14, 2025
Merged

bug/outbound_connections #1297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f2d25f
show outbound connections when no tls connections are found
jhughesoti May 13, 2025
4068acc
Merge branch 'dev' into bug/outbound_connections
jhughesoti May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions modules/test/tls/python/src/tls_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand All @@ -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
Expand Down
11 changes: 6 additions & 5 deletions modules/test/tls/python/src/tls_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down