Skip to content

T8027: vpn: adding config for swanctl "send-cert always" #4859

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

Open
wants to merge 1 commit into
base: current
Choose a base branch
from
+26 −4
Open

T8027: vpn: adding config for swanctl "send-cert always" #4859

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions data/templates/ipsec/swanctl/remote_access.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
proposals = {{ ike_group[rw_conf.ike_group] | get_esp_ike_cipher | join(',') }}
version = {{ ike.key_exchange[4:] if ike.key_exchange is vyos_defined else "0" }}
send_certreq = no
{% if rw_conf.authentication.always_send_cert is vyos_defined %}
send_cert = always
{% endif %}
{% if ike.dead_peer_detection is vyos_defined %}
dpd_timeout = {{ ike.dead_peer_detection.timeout }}
dpd_delay = {{ ike.dead_peer_detection.interval }}
Expand Down
6 changes: 6 additions & 0 deletions interface-definitions/vpn_ipsec.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,12 @@
<defaultValue>eap-mschapv2</defaultValue>
</leafNode>
#include <include/auth-local-users.xml.i>
<leafNode name="always-send-cert">
<properties>
<help>Always send local certificate for this connection</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="server-mode">
<properties>
<help>Server authentication mode</help>
Expand Down
21 changes: 17 additions & 4 deletions smoketest/scripts/cli/test_vpn_ipsec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,10 +1151,7 @@ def test_remote_access_x509(self):
for line in swanctl_lines:
self.assertIn(line, swanctl_conf)

swanctl_unexpected_lines = [
f'auth = eap-',
f'eap_id'
]
swanctl_unexpected_lines = [f'auth = eap-', f'eap_id', f'send_cert =']
for unexpected_line in swanctl_unexpected_lines:
self.assertNotIn(unexpected_line, swanctl_conf)

Expand All @@ -1171,6 +1168,22 @@ def test_remote_access_x509(self):
self.assertTrue(os.path.exists(os.path.join(CA_PATH, f'{int_ca_name}.pem')))
self.assertTrue(os.path.exists(os.path.join(CERT_PATH, f'{peer_name}.pem')))

# Add the always-send-cert config and observe the change
self.cli_set(
base_path
+ [
'remote-access',
'connection',
conn_name,
'authentication',
'always-send-cert',
]
)
self.cli_commit()

swanctl_conf = read_file(swanctl_file)
self.assertIn(f'send_cert = always', swanctl_conf)

self.tearDownPKI()

def test_remote_access_dhcp_fail_handling(self):
Expand Down
Loading