Skip to content

Commit 5cd0e32

Browse files
authored
Merge pull request #3526 from vyos/mergify/bp/sagitta/pr-3523
reverse-proxy: T6402: Fix invalid checks in validation script (backport #3523)
2 parents b35188d + d575ce3 commit 5cd0e32

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/conf_mode/load-balancing_reverse-proxy.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,22 @@ def verify(lb):
8888
if {'send_proxy', 'send_proxy_v2'} <= set(bk_server_conf):
8989
raise ConfigError(f'Cannot use both "send-proxy" and "send-proxy-v2" for server "{bk_server}"')
9090

91+
if 'ssl' in back_config:
92+
if {'no_verify', 'ca_certificate'} <= set(back_config['ssl']):
93+
raise ConfigError(f'backend {back} cannot have both ssl options no-verify and ca-certificate set!')
94+
9195
# Check if http-response-headers are configured in any frontend/backend where mode != http
9296
for group in ['service', 'backend']:
9397
for config_name, config in lb[group].items():
9498
if 'http_response_headers' in config and ('mode' not in config or config['mode'] != 'http'):
9599
raise ConfigError(f'{group} {config_name} must be set to http mode to use http_response_headers!')
96100

97-
if 'ssl' in back_config:
98-
if {'no_verify', 'ca_certificate'} <= set(back_config['ssl']):
99-
raise ConfigError(f'backend {back} cannot have both ssl options no-verify and ca-certificate set!')
100-
101101
for front, front_config in lb['service'].items():
102102
for cert in dict_search('ssl.certificate', front_config) or []:
103103
verify_pki_certificate(lb, cert)
104104

105105
for back, back_config in lb['backend'].items():
106-
tmp = dict_search('ssl.ca_certificate', front_config)
106+
tmp = dict_search('ssl.ca_certificate', back_config)
107107
if tmp: verify_pki_ca_certificate(lb, tmp)
108108

109109

0 commit comments

Comments
 (0)