From 99b63497c695eb8bc60dc40eb19ff7ce947a8a12 Mon Sep 17 00:00:00 2001 From: Igor Date: Wed, 7 May 2025 11:45:18 +0200 Subject: [PATCH 1/2] enable encryption based on env var --- scripts/teamcity/20.test.sh | 0 tests/conftest.py | 6 ++++-- tests/test_connection.py | 20 ++++++++++---------- tests/test_node.py | 20 ++++++++++---------- tests/test_stats.py | 2 +- 5 files changed, 25 insertions(+), 23 deletions(-) mode change 100644 => 100755 scripts/teamcity/20.test.sh diff --git a/scripts/teamcity/20.test.sh b/scripts/teamcity/20.test.sh old mode 100644 new mode 100755 diff --git a/tests/conftest.py b/tests/conftest.py index 431138af..99240b3b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,4 +1,5 @@ # pylint: disable=C0103,C0111,C0302,W0212 +import os import json import random import string @@ -42,6 +43,7 @@ def _qdbd_settings(): "cluster_public_key": cluster_key, "user_private_key_file": "../user_private.key", "cluster_public_key_file": "../cluster_public.key", + "enable_encryption": os.environ.get("QDB_ENCRYPT_TRAFFIC", "0") == "1", }, } @@ -74,7 +76,7 @@ def qdbd_secure_connection(qdbd_settings): user_name=qdbd_settings.get("security").get("user_name"), user_private_key=qdbd_settings.get("security").get("user_private_key"), cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) conn.purge_all(datetime.timedelta(minutes=1)) yield conn @@ -93,7 +95,7 @@ def qdbd_direct_connection(request): user_name=settings.get("security").get("user_name"), user_private_key=settings.get("security").get("user_private_key"), cluster_public_key=settings.get("security").get("cluster_public_key"), - enable_encryption=True, + enable_encryption=settings.get("security").get("enable_encryption"), ) diff --git a/tests/test_connection.py b/tests/test_connection.py index 7acb3c67..8525c838 100644 --- a/tests/test_connection.py +++ b/tests/test_connection.py @@ -21,7 +21,7 @@ def test_connect_throws_connection_error_when_no_cluster_public_key(qdbd_setting uri=qdbd_settings.get("uri").get("secure"), user_name=qdbd_settings.get("security").get("user_name"), user_private_key=qdbd_settings.get("security").get("user_private_key"), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -31,7 +31,7 @@ def test_connect_throws_connection_error_when_no_user_name(qdbd_settings): uri=qdbd_settings.get("uri").get("secure"), user_private_key=qdbd_settings.get("security").get("user_private_key"), cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -41,7 +41,7 @@ def test_connect_throws_connection_error_when_no_user_private_key(qdbd_settings) uri=qdbd_settings.get("uri").get("secure"), user_name=qdbd_settings.get("security").get("user_name"), cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -51,7 +51,7 @@ def test_connect_ok_to_secure_cluster(qdbd_settings): user_name=qdbd_settings.get("security").get("user_name"), user_private_key=qdbd_settings.get("security").get("user_private_key"), cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -62,7 +62,7 @@ def test_connect_throws_connection_error_when_no_cluster_public_key_file(qdbd_se user_security_file=qdbd_settings.get("security").get( "user_private_key_file" ), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -73,7 +73,7 @@ def test_connect_throws_connection_error_when_no_user_security_file(qdbd_setting cluster_public_key_file=qdbd_settings.get("security").get( "cluster_public_key_file" ), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -87,7 +87,7 @@ def test_connect_throws_connection_error_when_mix_security_1(qdbd_settings): cluster_public_key_file=qdbd_settings.get("security").get( "cluster_public_key_file" ), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -103,7 +103,7 @@ def test_connect_throws_connection_error_when_mix_security_2(qdbd_settings): cluster_public_key_file=qdbd_settings.get("security").get( "cluster_public_key_file" ), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -120,7 +120,7 @@ def test_connect_throws_connection_error_when_mix_security_full(qdbd_settings): cluster_public_key_file=qdbd_settings.get("security").get( "cluster_public_key_file" ), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -131,7 +131,7 @@ def test_connect_ok_to_secure_cluster_with_file(qdbd_settings): cluster_public_key_file=qdbd_settings.get("security").get( "cluster_public_key_file" ), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) diff --git a/tests/test_node.py b/tests/test_node.py index 3d23dc28..13fe6d1a 100644 --- a/tests/test_node.py +++ b/tests/test_node.py @@ -16,7 +16,7 @@ def test_node_connect_throws_connection_error_when_no_cluster_public_key(qdbd_se uri=qdbd_settings.get("uri").get("secure").replace("qdb://", ""), user_name=qdbd_settings.get("security").get("user_name"), user_private_key=qdbd_settings.get("security").get("user_private_key"), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -26,7 +26,7 @@ def test_node_connect_throws_connection_error_when_no_user_name(qdbd_settings): uri=qdbd_settings.get("uri").get("secure").replace("qdb://", ""), user_private_key=qdbd_settings.get("security").get("user_private_key"), cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -36,7 +36,7 @@ def test_node_connect_throws_connection_error_when_no_user_private_key(qdbd_sett uri=qdbd_settings.get("uri").get("secure").replace("qdb://", ""), user_name=qdbd_settings.get("security").get("user_name"), cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -46,7 +46,7 @@ def test_node_connect_ok_to_secure_cluster(qdbd_settings): user_name=qdbd_settings.get("security").get("user_name"), user_private_key=qdbd_settings.get("security").get("user_private_key"), cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -59,7 +59,7 @@ def test_node_connect_throws_connection_error_when_no_cluster_public_key_file( user_security_file=qdbd_settings.get("security").get( "user_private_key_file" ), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -70,7 +70,7 @@ def test_node_connect_throws_connection_error_when_no_user_security_file(qdbd_se cluster_public_key_file=qdbd_settings.get("security").get( "cluster_public_key_file" ), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -84,7 +84,7 @@ def test_node_connect_throws_connection_error_when_mix_security_1(qdbd_settings) cluster_public_key_file=qdbd_settings.get("security").get( "cluster_public_key_file" ), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -100,7 +100,7 @@ def test_node_connect_throws_connection_error_when_mix_security_2(qdbd_settings) cluster_public_key_file=qdbd_settings.get("security").get( "cluster_public_key_file" ), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -117,7 +117,7 @@ def test_node_connect_throws_connection_error_when_mix_security_full(qdbd_settin cluster_public_key_file=qdbd_settings.get("security").get( "cluster_public_key_file" ), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) @@ -128,7 +128,7 @@ def test_node_connect_ok_to_secure_cluster_with_file(qdbd_settings): cluster_public_key_file=qdbd_settings.get("security").get( "cluster_public_key_file" ), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) diff --git a/tests/test_stats.py b/tests/test_stats.py index 3364094d..ab940584 100644 --- a/tests/test_stats.py +++ b/tests/test_stats.py @@ -99,7 +99,7 @@ def test_stats_of_node(qdbd_settings, qdbd_secure_connection, secure_table): user_name=qdbd_settings.get("security").get("user_name"), user_private_key=qdbd_settings.get("security").get("user_private_key"), cluster_public_key=qdbd_settings.get("security").get("cluster_public_key"), - enable_encryption=True, + enable_encryption=qdbd_settings.get("security").get("enable_encryption"), ) qdbst.of_node(conn) From a949512e80d65990a05b5df965751d689de9e3fa Mon Sep 17 00:00:00 2001 From: Igor Date: Wed, 7 May 2025 12:22:28 +0200 Subject: [PATCH 2/2] match behavior with start_services.sh --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 99240b3b..4443dc38 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -43,7 +43,7 @@ def _qdbd_settings(): "cluster_public_key": cluster_key, "user_private_key_file": "../user_private.key", "cluster_public_key_file": "../cluster_public.key", - "enable_encryption": os.environ.get("QDB_ENCRYPT_TRAFFIC", "0") == "1", + "enable_encryption": os.environ.get("QDB_ENCRYPT_TRAFFIC", "0") != "0", }, }