Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openvpn: T6374: only check TLS role for s2s if TLS is configured (backport #3541) #3544

Merged
merged 1 commit into from
May 29, 2024
Merged

openvpn: T6374: only check TLS role for s2s if TLS is configured (backport #3541) #3544

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions src/conf_mode/interfaces_openvpn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,14 @@ def verify_pki(openvpn):
'verification, consult the documentation for details.')

if tls:
if mode == 'site-to-site':
# XXX: site-to-site with PSKs is the only mode that can work without TLS,
# so 'tls role' is not mandatory for it,
# but we need to check that if it uses peer certificate fingerprints rather than PSKs,
# then the TLS role is set
if ('shared_secret_key' not in tls) and ('role' not in tls):
raise ConfigError('"tls role" is required for site-to-site OpenVPN with TLS')

if (mode in ['server', 'client']) and ('ca_certificate' not in tls):
raise ConfigError(f'Must specify "tls ca-certificate" on openvpn interface {interface},\
it is required in server and client modes')
Expand Down Expand Up @@ -260,11 +268,6 @@ def verify(openvpn):
# OpenVPN site-to-site - VERIFY
#
elif openvpn['mode'] == 'site-to-site':
# XXX: site-to-site is the only mode that still can work without TLS,
# so we need to make sure that if TLS is used, then TLS role is also specified
if 'shared_secret_key' not in openvpn['tls'] and 'role' not in openvpn['tls']:
raise ConfigError('"tls role" is required for site-to-site OpenVPN with TLS')

if 'local_address' not in openvpn and 'is_bridge_member' not in openvpn:
raise ConfigError('Must specify "local-address" or add interface to bridge')

Expand Down
Loading