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

T6896: OpenVPN change CRL revoke without restart #4245

Merged
merged 1 commit into from
Dec 31, 2024
Merged

T6896: OpenVPN change CRL revoke without restart #4245

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
28 changes: 24 additions & 4 deletions src/conf_mode/interfaces_openvpn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
from vyos.config import Config
from vyos.configdict import get_interface_dict
from vyos.configdict import is_node_changed
from vyos.configdiff import get_config_diff
from vyos.configverify import verify_vrf
from vyos.configverify import verify_bridge_delete
from vyos.configverify import verify_mirror_redirect
Expand Down Expand Up @@ -94,6 +95,23 @@ def get_config(config=None):
if 'deleted' in openvpn:
return openvpn

if not is_node_changed(conf, base) and dict_search_args(openvpn, 'tls'):
diff = get_config_diff(conf)
if diff.get_child_nodes_diff(['pki'], recursive=True).get('add') == ['ca', 'certificate']:
crl_path = os.path.join(cfg_dir, f'{ifname}_crl.pem')
if os.path.exists(crl_path):
# do not restart service when changed only CRL and crl file already exist
openvpn.update({'no_restart_crl': True})
for rec in diff.get_child_nodes_diff(['pki', 'ca'], recursive=True).get('add'):
if diff.get_child_nodes_diff(['pki', 'ca', rec], recursive=True).get('add') != ['crl']:
openvpn.update({'no_restart_crl': False})
break
if openvpn.get('no_restart_crl'):
for rec in diff.get_child_nodes_diff(['pki', 'certificate'], recursive=True).get('add'):
if diff.get_child_nodes_diff(['pki', 'certificate', rec], recursive=True).get('add') != ['revoke']:
openvpn.update({'no_restart_crl': False})
break

if is_node_changed(conf, base + [ifname, 'openvpn-option']):
openvpn.update({'restart_required': {}})
if is_node_changed(conf, base + [ifname, 'enable-dco']):
Expand Down Expand Up @@ -786,10 +804,12 @@ def apply(openvpn):

# No matching OpenVPN process running - maybe it got killed or none
# existed - nevertheless, spawn new OpenVPN process
action = 'reload-or-restart'
if 'restart_required' in openvpn:
action = 'restart'
call(f'systemctl {action} openvpn@{interface}.service')

if not openvpn.get('no_restart_crl'):
action = 'reload-or-restart'
if 'restart_required' in openvpn:
action = 'restart'
call(f'systemctl {action} openvpn@{interface}.service')

o = VTunIf(**openvpn)
o.update(openvpn)
Expand Down
Loading