Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Require direct references to configuration variables. #10985

Merged
merged 8 commits into from
Oct 6, 2021
Merged

Require direct references to configuration variables. #10985

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
41107b8
Specify config classes for remaining cases.
clokep Sep 30, 2021
1031435
Simplify template tests.
clokep Sep 30, 2021
8ea2495
Simplify cache config tests.
clokep Sep 30, 2021
d03a8db
Simplify TLS config tests.
clokep Sep 30, 2021
b5528af
Update the config classes to refer to each other via the root object.
clokep Sep 10, 2021
6ebdf22
Remove __getattr__ magic.
clokep Sep 10, 2021
5ce223e
Newsfragment
clokep Oct 4, 2021
3fa49b9
Merge remote-tracking branch 'origin/develop' into clokep/less-config…
clokep Oct 6, 2021
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
Prev Previous commit
Next Next commit
Simplify TLS config tests.
  • Loading branch information
@clokep
clokep committed Oct 5, 2021
commit d03a8db956268762a9ec977109b13e8cf5351704
38 changes: 19 additions & 19 deletions tests/config/test_tls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,39 +42,39 @@ def test_tls_client_minimum_default(self):
"""
config = {}
t = TestConfig()
t.read_config(config, config_dir_path="", data_dir_path="")
t.tls.read_config(config, config_dir_path="", data_dir_path="")

self.assertEqual(t.federation_client_minimum_tls_version, "1")
self.assertEqual(t.tls.federation_client_minimum_tls_version, "1")

def test_tls_client_minimum_set(self):
"""
The default client TLS version can be set to 1.0, 1.1, and 1.2.
"""
config = {"federation_client_minimum_tls_version": 1}
t = TestConfig()
t.read_config(config, config_dir_path="", data_dir_path="")
self.assertEqual(t.federation_client_minimum_tls_version, "1")
t.tls.read_config(config, config_dir_path="", data_dir_path="")
self.assertEqual(t.tls.federation_client_minimum_tls_version, "1")

config = {"federation_client_minimum_tls_version": 1.1}
t = TestConfig()
t.read_config(config, config_dir_path="", data_dir_path="")
self.assertEqual(t.federation_client_minimum_tls_version, "1.1")
t.tls.read_config(config, config_dir_path="", data_dir_path="")
self.assertEqual(t.tls.federation_client_minimum_tls_version, "1.1")

config = {"federation_client_minimum_tls_version": 1.2}
t = TestConfig()
t.read_config(config, config_dir_path="", data_dir_path="")
self.assertEqual(t.federation_client_minimum_tls_version, "1.2")
t.tls.read_config(config, config_dir_path="", data_dir_path="")
self.assertEqual(t.tls.federation_client_minimum_tls_version, "1.2")

# Also test a string version
config = {"federation_client_minimum_tls_version": "1"}
t = TestConfig()
t.read_config(config, config_dir_path="", data_dir_path="")
self.assertEqual(t.federation_client_minimum_tls_version, "1")
t.tls.read_config(config, config_dir_path="", data_dir_path="")
self.assertEqual(t.tls.federation_client_minimum_tls_version, "1")

config = {"federation_client_minimum_tls_version": "1.2"}
t = TestConfig()
t.read_config(config, config_dir_path="", data_dir_path="")
self.assertEqual(t.federation_client_minimum_tls_version, "1.2")
t.tls.read_config(config, config_dir_path="", data_dir_path="")
self.assertEqual(t.tls.federation_client_minimum_tls_version, "1.2")

def test_tls_client_minimum_1_point_3_missing(self):
"""
Expand All @@ -91,7 +91,7 @@ def test_tls_client_minimum_1_point_3_missing(self):
config = {"federation_client_minimum_tls_version": 1.3}
t = TestConfig()
with self.assertRaises(ConfigError) as e:
t.read_config(config, config_dir_path="", data_dir_path="")
t.tls.read_config(config, config_dir_path="", data_dir_path="")
self.assertEqual(
e.exception.args[0],
(
Expand All @@ -112,16 +112,16 @@ def test_tls_client_minimum_1_point_3_exists(self):

config = {"federation_client_minimum_tls_version": 1.3}
t = TestConfig()
t.read_config(config, config_dir_path="", data_dir_path="")
self.assertEqual(t.federation_client_minimum_tls_version, "1.3")
t.tls.read_config(config, config_dir_path="", data_dir_path="")
self.assertEqual(t.tls.federation_client_minimum_tls_version, "1.3")

def test_tls_client_minimum_set_passed_through_1_2(self):
"""
The configured TLS version is correctly configured by the ContextFactory.
"""
config = {"federation_client_minimum_tls_version": 1.2}
t = TestConfig()
t.read_config(config, config_dir_path="", data_dir_path="")
t.tls.read_config(config, config_dir_path="", data_dir_path="")

cf = FederationPolicyForHTTPS(t)
options = _get_ssl_context_options(cf._verify_ssl_context)
Expand All @@ -137,7 +137,7 @@ def test_tls_client_minimum_set_passed_through_1_0(self):
"""
config = {"federation_client_minimum_tls_version": 1}
t = TestConfig()
t.read_config(config, config_dir_path="", data_dir_path="")
t.tls.read_config(config, config_dir_path="", data_dir_path="")

cf = FederationPolicyForHTTPS(t)
options = _get_ssl_context_options(cf._verify_ssl_context)
Expand All @@ -159,7 +159,7 @@ def test_whitelist_idna_failure(self):
}
t = TestConfig()
e = self.assertRaises(
ConfigError, t.read_config, config, config_dir_path="", data_dir_path=""
ConfigError, t.tls.read_config, config, config_dir_path="", data_dir_path=""
)
self.assertIn("IDNA domain names", str(e))

Expand All @@ -174,7 +174,7 @@ def test_whitelist_idna_result(self):
]
}
t = TestConfig()
t.read_config(config, config_dir_path="", data_dir_path="")
t.tls.read_config(config, config_dir_path="", data_dir_path="")

cf = FederationPolicyForHTTPS(t)

Expand Down