Skip to content

Fix TLS 1.3 text appearing in security.tls.v1_2_server results #1622

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

Open
IMINABO1 wants to merge 1 commit into
base: dev
Choose a base branch
from
+13 −31
Open

Fix TLS 1.3 text appearing in security.tls.v1_2_server results #1622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 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 @@ -484,11 +484,14 @@ def process_tls_server_results(self,
details.extend(tls_1_2_results[1])
else:
details.append(tls_1_2_results[1])
details.append(f'TLS 1.3 {positive_1_3}validated on port {port}:')
if isinstance(tls_1_3_results[1], list):
details.extend(tls_1_3_results[1])
else:
details.append(tls_1_3_results[1])
# Include TLS 1.3 details only when a valid TLS 1.3 certificate
# is what makes an invalid TLS 1.2 result compliant
if not tls_1_2_results[0] and tls_1_3_results[0]:
details.append(f'TLS 1.3 {positive_1_3}validated on port {port}:')
if isinstance(tls_1_3_results[1], list):
details.extend(tls_1_3_results[1])
else:
details.append(tls_1_3_results[1])
results = tls_1_2_results[0] or tls_1_3_results[0], details
else:
details.append(f'TLS 1.2 not validated on port {port}:')
Expand Down
31 changes: 5 additions & 26 deletions testing/unit/tls/tls_module_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,15 +225,13 @@ def validate_side_effect(**kwargs):
mock_validate_tls_server.side_effect = validate_side_effect
result, description, details = self.tls_module._security_tls_v1_2_server() # pylint: disable=W0212

# Expects compliant result
# Expects non-compliant result
self.assertEqual(result, False)
self.assertEqual(description, 'TLS 1.2 certificate invalid on ports: 443')

expected_details = [
'TLS 1.2 not validated on port 443:',
'Certificate has expired',
'TLS 1.3 not validated on port 443:',
'Device certificate has not been signed'
'Certificate has expired'
]
self.assertEqual(details, expected_details)

Expand Down Expand Up @@ -265,10 +263,6 @@ def validate_side_effect(**kwargs):
'TLS 1.2 validated on port 443:',
'Time range valid',
'Public key valid',
'Signature valid',
'TLS 1.3 validated on port 443:',
'Time range valid',
'Public key valid',
'Signature valid'
]
self.assertEqual(details, expected_details)
Expand Down Expand Up @@ -303,18 +297,10 @@ def validate_side_effect(**kwargs):
'Time range valid',
'Public key valid',
'Signature valid',
'TLS 1.3 validated on port 443:',
'Time range valid',
'Public key valid',
'Signature valid',
'TLS 1.2 validated on port 8443:',
'Time range valid',
'Public key valid',
'Signature valid',
'TLS 1.3 validated on port 8443:',
'Time range valid',
'Public key valid',
'Signature valid',
]
self.assertEqual(details, expected_details)

Expand Down Expand Up @@ -345,10 +331,6 @@ def validate_side_effect(**kwargs):
'Time range valid',
'Public key valid',
'Signature valid',
'TLS 1.3 validated on port 443:',
'Time range valid',
'Public key valid',
'Signature valid',
'HTTP service detected on port 80.'
]
self.assertEqual(details, expected_details)
Expand Down Expand Up @@ -447,8 +429,7 @@ def security_tls_server_results_test(self):
# TLS 1.2 Pass and TLS 1.3 Pass
tls_1_2_results = True, success_message
tls_1_3_results = True, success_message
expected = True, ['TLS 1.2 validated on port 443:', success_message,
'TLS 1.3 validated on port 443:', success_message]
expected = True, ['TLS 1.2 validated on port 443:', success_message]
result = TLS_UTIL.process_tls_server_results(tls_1_2_results,
tls_1_3_results,port=443)

Expand All @@ -457,8 +438,7 @@ def security_tls_server_results_test(self):
# TLS 1.2 Pass and TLS 1.3 Fail
tls_1_2_results = True, success_message
tls_1_3_results = False, fail_message
expected = True, ['TLS 1.2 validated on port 443:', success_message,
'TLS 1.3 not validated on port 443:', fail_message]
expected = True, ['TLS 1.2 validated on port 443:', success_message]
result = TLS_UTIL.process_tls_server_results(tls_1_2_results,
tls_1_3_results,port=443)
self.assertEqual(result, expected)
Expand All @@ -474,8 +454,7 @@ def security_tls_server_results_test(self):

# TLS 1.2 Fail and TLS 1.2 Fail
tls_1_3_results = False, fail_message
expected = False, ['TLS 1.2 not validated on port 443:', fail_message,
'TLS 1.3 not validated on port 443:', fail_message]
expected = False, ['TLS 1.2 not validated on port 443:', fail_message]
result = TLS_UTIL.process_tls_server_results(tls_1_2_results,
tls_1_3_results,port=443)
self.assertEqual(result, expected)
Expand Down