From a5787031b09114295c8112f1c18db03851c83c9e Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 29 May 2024 15:19:49 -0700 Subject: [PATCH] Fix publish_signing_algorithm conditional --- tests/pytests/conftest.py | 4 ++-- tests/pytests/functional/channel/test_server.py | 4 ++-- tests/pytests/integration/minion/test_job_return.py | 4 ++-- tests/pytests/integration/minion/test_reauth.py | 2 +- tests/pytests/integration/minion/test_return_retries.py | 4 ++-- tests/pytests/integration/pillar/cache/conftest.py | 2 +- tests/pytests/integration/runners/test_vault.py | 4 ++-- tests/pytests/integration/states/test_x509_v2.py | 2 +- tests/pytests/pkg/conftest.py | 2 +- tests/pytests/scenarios/blackout/conftest.py | 2 +- tests/pytests/scenarios/compat/conftest.py | 2 +- tests/pytests/scenarios/daemons/conftest.py | 2 +- tests/pytests/scenarios/dns/conftest.py | 2 +- tests/pytests/scenarios/dns/multimaster/conftest.py | 4 ++-- tests/pytests/scenarios/failover/multimaster/conftest.py | 4 ++-- tests/pytests/scenarios/multimaster/conftest.py | 4 ++-- tests/pytests/scenarios/reauth/conftest.py | 2 +- tests/pytests/scenarios/swarm/conftest.py | 2 +- 18 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tests/pytests/conftest.py b/tests/pytests/conftest.py index ad7c6a9f035..542e742aa9f 100644 --- a/tests/pytests/conftest.py +++ b/tests/pytests/conftest.py @@ -192,7 +192,7 @@ def salt_master_factory( "pytest-master": {"log": {"level": "DEBUG"}}, "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } ext_pillar = [] @@ -462,7 +462,7 @@ def temp_salt_master( config_overrides = { "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } factory = salt_factories.salt_master_daemon( diff --git a/tests/pytests/functional/channel/test_server.py b/tests/pytests/functional/channel/test_server.py index 277a5a58bdc..e05e7e38937 100644 --- a/tests/pytests/functional/channel/test_server.py +++ b/tests/pytests/functional/channel/test_server.py @@ -75,7 +75,7 @@ def master_config(root_dir, transport): pki_dir=str(root_dir / "pki"), fips_mode=FIPS_TESTRUN, publish_signing_algorithm=( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), ) # master_conf["transport"] = transport @@ -88,7 +88,7 @@ def master_config(root_dir, transport): # master_conf["pki_dir"] = str(root_dir / "pki") # "fips_mode": FIPS_TESTRUN, # "publish_signing_algorithm": ( - # "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + # "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" # ), os.makedirs(master_conf["pki_dir"]) salt.crypt.gen_keys(master_conf["pki_dir"], "master", 4096) diff --git a/tests/pytests/integration/minion/test_job_return.py b/tests/pytests/integration/minion/test_job_return.py index 5200af8c20c..c91748597dc 100644 --- a/tests/pytests/integration/minion/test_job_return.py +++ b/tests/pytests/integration/minion/test_job_return.py @@ -18,7 +18,7 @@ def salt_master_1(request, salt_factories): "interface": "127.0.0.1", "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } @@ -45,7 +45,7 @@ def salt_master_2(salt_factories, salt_master_1): "interface": "127.0.0.2", "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } diff --git a/tests/pytests/integration/minion/test_reauth.py b/tests/pytests/integration/minion/test_reauth.py index 177f5ed21f7..2e9962a087c 100644 --- a/tests/pytests/integration/minion/test_reauth.py +++ b/tests/pytests/integration/minion/test_reauth.py @@ -29,7 +29,7 @@ def test_reauth(salt_master_factory, event_listener): "log_level": "info", "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), }, ) diff --git a/tests/pytests/integration/minion/test_return_retries.py b/tests/pytests/integration/minion/test_return_retries.py index 321387f5692..03f6146fb6c 100644 --- a/tests/pytests/integration/minion/test_return_retries.py +++ b/tests/pytests/integration/minion/test_return_retries.py @@ -16,7 +16,7 @@ def salt_minion_retry(salt_master, salt_minion_id): "return_retry_tries": 30, "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } factory = salt_master.salt_minion_daemon( @@ -78,7 +78,7 @@ def test_pillar_timeout(salt_master_factory, tmp_path): "minion_data_cache": False, "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } minion_overrides = { diff --git a/tests/pytests/integration/pillar/cache/conftest.py b/tests/pytests/integration/pillar/cache/conftest.py index 0998ed4801d..ca4ba16b2ba 100644 --- a/tests/pytests/integration/pillar/cache/conftest.py +++ b/tests/pytests/integration/pillar/cache/conftest.py @@ -27,7 +27,7 @@ def pillar_salt_master(salt_factories, pillar_state_tree): config_overrides = { "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } factory = salt_factories.salt_master_daemon( diff --git a/tests/pytests/integration/runners/test_vault.py b/tests/pytests/integration/runners/test_vault.py index f7253011397..f628d7cea90 100644 --- a/tests/pytests/integration/runners/test_vault.py +++ b/tests/pytests/integration/runners/test_vault.py @@ -52,7 +52,7 @@ def pillar_salt_master(salt_factories, pillar_state_tree): config_overrides = { "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } factory = salt_factories.salt_master_daemon( @@ -85,7 +85,7 @@ def pillar_caching_salt_master(salt_factories, pillar_state_tree): config_overrides = { "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } factory = salt_factories.salt_master_daemon( diff --git a/tests/pytests/integration/states/test_x509_v2.py b/tests/pytests/integration/states/test_x509_v2.py index bbf27302a26..ad28feeaaa8 100644 --- a/tests/pytests/integration/states/test_x509_v2.py +++ b/tests/pytests/integration/states/test_x509_v2.py @@ -127,7 +127,7 @@ def x509_salt_master(salt_factories, ca_minion_id, x509_master_config): config_overrides = { "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } factory = salt_factories.salt_master_daemon( diff --git a/tests/pytests/pkg/conftest.py b/tests/pytests/pkg/conftest.py index 8d2555e73d8..59d02c3a60d 100644 --- a/tests/pytests/pkg/conftest.py +++ b/tests/pytests/pkg/conftest.py @@ -299,7 +299,7 @@ def salt_master(salt_factories, install_salt, pkg_tests_account): }, "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), "open_mode": True, } diff --git a/tests/pytests/scenarios/blackout/conftest.py b/tests/pytests/scenarios/blackout/conftest.py index 0e872ae34d4..52e21b79504 100644 --- a/tests/pytests/scenarios/blackout/conftest.py +++ b/tests/pytests/scenarios/blackout/conftest.py @@ -132,7 +132,7 @@ def salt_master(salt_factories, pillar_state_tree): "interface": "127.0.0.1", "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } factory = salt_factories.salt_master_daemon( diff --git a/tests/pytests/scenarios/compat/conftest.py b/tests/pytests/scenarios/compat/conftest.py index 899f35f2cdf..46e11d40bdf 100644 --- a/tests/pytests/scenarios/compat/conftest.py +++ b/tests/pytests/scenarios/compat/conftest.py @@ -138,7 +138,7 @@ def salt_master( "open_mode": False, "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } diff --git a/tests/pytests/scenarios/daemons/conftest.py b/tests/pytests/scenarios/daemons/conftest.py index 94695d73e4a..634314a2a9d 100644 --- a/tests/pytests/scenarios/daemons/conftest.py +++ b/tests/pytests/scenarios/daemons/conftest.py @@ -14,7 +14,7 @@ def salt_master_factory(request, salt_factories): "interface": "127.0.0.1", "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } diff --git a/tests/pytests/scenarios/dns/conftest.py b/tests/pytests/scenarios/dns/conftest.py index ae3f0f410f5..cfa4efda125 100644 --- a/tests/pytests/scenarios/dns/conftest.py +++ b/tests/pytests/scenarios/dns/conftest.py @@ -57,7 +57,7 @@ def master(request, salt_factories): "interface": "0.0.0.0", "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } factory = salt_factories.salt_master_daemon( diff --git a/tests/pytests/scenarios/dns/multimaster/conftest.py b/tests/pytests/scenarios/dns/multimaster/conftest.py index 6951e51bf93..cda109d5a16 100644 --- a/tests/pytests/scenarios/dns/multimaster/conftest.py +++ b/tests/pytests/scenarios/dns/multimaster/conftest.py @@ -24,7 +24,7 @@ def salt_mm_master_1(request, salt_factories): "master_sign_pubkey": True, "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } factory = salt_factories.salt_master_daemon( @@ -63,7 +63,7 @@ def salt_mm_master_2(salt_factories, salt_mm_master_1): "master_sign_pubkey": True, "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } diff --git a/tests/pytests/scenarios/failover/multimaster/conftest.py b/tests/pytests/scenarios/failover/multimaster/conftest.py index 166e164c13b..3c8f89a8ba7 100644 --- a/tests/pytests/scenarios/failover/multimaster/conftest.py +++ b/tests/pytests/scenarios/failover/multimaster/conftest.py @@ -24,7 +24,7 @@ def salt_mm_failover_master_1(request, salt_factories): "master_sign_pubkey": True, "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } factory = salt_factories.salt_master_daemon( @@ -56,7 +56,7 @@ def salt_mm_failover_master_2(salt_factories, salt_mm_failover_master_1): "master_sign_pubkey": True, "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } diff --git a/tests/pytests/scenarios/multimaster/conftest.py b/tests/pytests/scenarios/multimaster/conftest.py index 77654f05460..84e7a9a3ceb 100644 --- a/tests/pytests/scenarios/multimaster/conftest.py +++ b/tests/pytests/scenarios/multimaster/conftest.py @@ -23,7 +23,7 @@ def salt_mm_master_1(request, salt_factories): "interface": "127.0.0.1", "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } factory = salt_factories.salt_master_daemon( @@ -54,7 +54,7 @@ def salt_mm_master_2(salt_factories, salt_mm_master_1): "interface": "127.0.0.2", "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } diff --git a/tests/pytests/scenarios/reauth/conftest.py b/tests/pytests/scenarios/reauth/conftest.py index 35a7003a585..c91760bc8ca 100644 --- a/tests/pytests/scenarios/reauth/conftest.py +++ b/tests/pytests/scenarios/reauth/conftest.py @@ -12,7 +12,7 @@ def salt_master_factory(salt_factories): overrides={ "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), }, ) diff --git a/tests/pytests/scenarios/swarm/conftest.py b/tests/pytests/scenarios/swarm/conftest.py index b5a4d473138..cd2f50c4124 100644 --- a/tests/pytests/scenarios/swarm/conftest.py +++ b/tests/pytests/scenarios/swarm/conftest.py @@ -12,7 +12,7 @@ def salt_master_factory(salt_factories): config_overrides = { "fips_mode": FIPS_TESTRUN, "publish_signing_algorithm": ( - "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224" + "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1" ), } factory = salt_factories.salt_master_daemon(