Skip to content

Commit 70d5213

Browse files
committed
MB-54273 Allow tlsv1.3 to be set for tls min version
Removes validation from couchbase-cli as the ns_server validation is sufficient. Change-Id: I1acf036eb7b03dbe0d4e61ae5abc5592e85deff6 Reviewed-on: https://review.couchbase.org/c/couchbase-cli/+/181870 Tested-by: Build Bot <build@couchbase.com> Reviewed-by: James Lee <james.lee@couchbase.com>
1 parent f08df8a commit 70d5213

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

cbmgr.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3228,8 +3228,8 @@ def __init__(self):
32283228
'strict'],
32293229
default=None,
32303230
help="Set cluster encryption level, only used when cluster encryption enabled.")
3231-
group.add_argument('--tls-min-version', dest='tls_min_version', metavar='<tlsv1|tlsv1.1|tlsv1.2>',
3232-
choices=['tlsv1', 'tlsv1.1', 'tlsv1.2'], default=None, help='Set the minimum TLS version')
3231+
group.add_argument('--tls-min-version', dest='tls_min_version', default=None,
3232+
help='Set the minimum TLS version')
32333233
group.add_argument('--tls-honor-cipher-order', dest='tls_honor_cipher_order', metavar='<1|0>',
32343234
choices=['1', '0'], help='Specify or not the cipher order has to be followed.', default=None)
32353235
group.add_argument('--cipher-suites', metavar='<ciphers>', default=None,

test/test_cli.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,9 +1353,6 @@ def test_set_settings(self):
13531353
self.assertIn('POST:/settings/security', self.server.trace)
13541354
self.rest_parameter_match(expected_params)
13551355

1356-
def test_invalid_choice(self):
1357-
self.system_exit_run(self.command + ['--set', '--tls-min-version', 'tlsv2'], self.server_args)
1358-
13591356
def test_cipher_suites_empty(self):
13601357
self.no_error_run(self.command + ['--set', '--cipher-suites', ''],
13611358
self.server_args)

0 commit comments

Comments
 (0)