diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2025-11-28 14:00:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-28 14:00:42 +0200 |
| commit | f4d46db92f9d95c2264c219304172b7b45094bb3 (patch) | |
| tree | dca004f52a6859681eada179160a56a5b9f61f51 /smoketest/scripts/cli | |
| parent | 4c3060b9f0bff246455eaf6704cd14dde444c77d (diff) | |
| parent | a3b37e68379745708981e8f31bc70c0ed9e8239d (diff) | |
| download | vyos-1x-f4d46db92f9d95c2264c219304172b7b45094bb3.tar.gz vyos-1x-f4d46db92f9d95c2264c219304172b7b45094bb3.zip | |
Merge pull request #4824 from alexandr-san4ez/T4251-current
syslog: T4251: Rename "permitted-peers" to "permitted-peer" and improve TLS checks
Diffstat (limited to 'smoketest/scripts/cli')
| -rwxr-xr-x | smoketest/scripts/cli/test_system_syslog.py | 40 |
1 files changed, 33 insertions, 7 deletions
diff --git a/smoketest/scripts/cli/test_system_syslog.py b/smoketest/scripts/cli/test_system_syslog.py index b04c3ea58..79fbe27ec 100755 --- a/smoketest/scripts/cli/test_system_syslog.py +++ b/smoketest/scripts/cli/test_system_syslog.py @@ -308,13 +308,13 @@ class TestRSYSLOGService(VyOSUnitTestSHIM.TestCase): '172.10.0.1': { 'facility': {'all': {'level': 'debug'}}, 'port': '6514', - 'protocol': 'udp', + 'protocol': 'tcp', 'tls': {}, }, '172.10.0.2': { 'facility': {'all': {'level': 'debug'}}, 'port': '6514', - 'protocol': 'udp', + 'protocol': 'tcp', 'tls': { 'auth-mode': 'anon', }, @@ -336,7 +336,10 @@ class TestRSYSLOGService(VyOSUnitTestSHIM.TestCase): 'ca-certificate': ca_cert_name, 'certificate': client_cert_name, 'auth-mode': 'fingerprint', - 'permitted-peers': 'SHA1:E1:DB:C4:FF:83:54:85:40:2D:56:E7:1A:C3:FF:70:22:0F:21:74:ED', + 'permitted-peer': [ + 'SHA1:E1:DB:C4:FF:83:54:85:40:2D:56:E7:1A:C3:FF:70:22:0F:21:74:ED', + ' SHA1:FF:70:22:0F:21:74:ED:54:85:40:2D:56:E7:1A:C3:E1:DB:C4:FF:83 ', + ], }, }, '172.10.0.5': { @@ -347,7 +350,10 @@ class TestRSYSLOGService(VyOSUnitTestSHIM.TestCase): 'ca-certificate': ca_cert_name, 'certificate': client_cert_name, 'auth-mode': 'name', - 'permitted-peers': 'logs.example.com', + 'permitted-peer': [ + 'logs.example.com', + ' ', + ], }, }, } @@ -372,7 +378,12 @@ class TestRSYSLOGService(VyOSUnitTestSHIM.TestCase): tls = remote_options['tls'] if tls: for key, value in tls.items(): - self.cli_set(remote_base + ['tls', key], value=value) + if type(value) is list: + values = value + for value in values: + self.cli_set(remote_base + ['tls', key], value=value) + else: + self.cli_set(remote_base + ['tls', key], value=value) else: self.cli_set(remote_base + ['tls']) @@ -412,13 +423,28 @@ class TestRSYSLOGService(VyOSUnitTestSHIM.TestCase): auth_mode = value if value == 'anon' else f'x509/{value}' self.assertIn(f'StreamDriverAuthMode="{auth_mode}"', config) - if 'permitted-peers' in tls: - value = tls['permitted-peers'] + if 'permitted-peer' in tls: + values = tls['permitted-peer'] + value = ','.join([v.strip() for v in values if v.strip()]) self.assertIn(f'StreamDriverPermittedPeers="{value}"', config) if not tls: self.assertIn(f'StreamDriverAuthMode="anon"', config) + def test_remote_tls_protocol_udp(self): + remote_base = base_path + ['remote', '172.11.0.1'] + self.cli_set(remote_base + ['port'], value='6514') + self.cli_set(remote_base + ['facility', 'all', 'level'], value='debug') + self.cli_set(remote_base + ['protocol'], value='udp') + self.cli_set(remote_base + ['tls']) + + err_msg = "TLS is enabled for remote \"172.11.0.1\", but protocol is set to UDP" + with self.assertRaisesRegex(ConfigSessionError, err_msg): + self.cli_commit() + + self.cli_set(base_path + ['remote', '172.11.0.1', 'protocol'], value='tcp') + self.cli_commit() + def test_vrf_source_address(self): rhosts = { '169.254.0.10': { }, |