ipsec: T9254: split get_esp_ike_cipher() into get_esp_cipher() / get_ike_cipher()

get_esp_ike_cipher() took an esn flag defaulting to True (ESP/CHILD_SA
semantics), and every IKE_SA call site had to remember to pass
esn=False. Nothing enforced that, so a future call site could reintroduce
the ESN-in-IKE bug this task fixed.

Following review feedback from hedrok, split it into two public filters:

  get_esp_cipher(group_config, ike_group=None)  ESP/CHILD_SA, esn=True
  get_ike_cipher(group_config)                  IKE_SA, esn=False always

The shared implementation moves to _get_esp_ike_cipher() (no
register_filter), so a template can no longer call it directly and
skip picking one of the two entry points.

Updated call sites: peer.j2, profile.j2, remote_access.j2, l2tp.j2
(proposals -> get_ike_cipher, esp_proposals -> get_esp_cipher), and
test_template.py.

4 files changed, 9 insertions, 9 deletions

diff --git a/data/templates/ipsec/swanctl/l2tp.j2 b/data/templates/ipsec/swanctl/l2tp.j2
index da3ff40d5..6f7145ca2 100644
--- a/data/templates/ipsec/swanctl/l2tp.j2
+++ b/data/templates/ipsec/swanctl/l2tp.j2
@@ -2,7 +2,7 @@
 {% set l2tp_ike = ike_group[l2tp.ike_group] if l2tp.ike_group is vyos_defined else None %}
 {% set l2tp_esp = esp_group[l2tp.esp_group] if l2tp.esp_group is vyos_defined else None %}
     l2tp_remote_access {
-        proposals = {{ l2tp_ike | get_esp_ike_cipher(esn=False) | join(',') if l2tp_ike else l2tp_ike_default }}
+        proposals = {{ l2tp_ike | get_ike_cipher | join(',') if l2tp_ike else l2tp_ike_default }}
         local_addrs = {{ l2tp_outside_address }}
         dpd_delay = 15s
         dpd_timeout = 45s
@@ -23,7 +23,7 @@
         children {
             l2tp_remote_access_esp {
                 mode = transport
-                esp_proposals = {{ l2tp_esp | get_esp_ike_cipher(l2tp_ike) | join(',') if l2tp_esp else l2tp_esp_default }}
+                esp_proposals = {{ l2tp_esp | get_esp_cipher(l2tp_ike) | join(',') if l2tp_esp else l2tp_esp_default }}
                 life_time = {{ l2tp_esp.lifetime if l2tp_esp else l2tp.lifetime }}s
                 local_ts = dynamic[/1701]
                 remote_ts = dynamic
diff --git a/data/templates/ipsec/swanctl/peer.j2 b/data/templates/ipsec/swanctl/peer.j2
index ee2efcc50..7ce2111c4 100644
--- a/data/templates/ipsec/swanctl/peer.j2
+++ b/data/templates/ipsec/swanctl/peer.j2
@@ -19,7 +19,7 @@
 {% if peer_conf.childless is vyos_defined %}
         childless = {{ peer_conf.childless }}
 {% endif %}
-        proposals = {{ ike | get_esp_ike_cipher(esn=False) | join(',') }}
+        proposals = {{ ike | get_ike_cipher | join(',') }}
         version = {{ ike.key_exchange[4:] if ike.key_exchange is vyos_defined else "0" }}
 {% if peer_conf.virtual_address is vyos_defined %}
         vips = {{ peer_conf.virtual_address | join(', ') }}
@@ -77,7 +77,7 @@
 {% if peer_conf.vti.bind is vyos_defined and peer_conf.tunnel is not vyos_defined %}
 {%     set vti_esp = esp_group[ peer_conf.vti.esp_group ] if peer_conf.vti.esp_group is vyos_defined else esp_group[ peer_conf.default_esp_group ] %}
             {{ name }}-vti {
-                esp_proposals = {{ vti_esp | get_esp_ike_cipher(ike) | join(',') }}
+                esp_proposals = {{ vti_esp | get_esp_cipher(ike) | join(',') }}
 {%     if vti_esp.life_bytes is vyos_defined %}
                 life_bytes = {{ vti_esp.life_bytes }}
 {%     endif %}
@@ -144,7 +144,7 @@
 {%         set remote_port = tunnel_conf.remote.port if tunnel_conf.remote.port is vyos_defined else '' %}
 {%         set remote_suffix = '[{0}/{1}]'.format(proto, remote_port) if proto or remote_port else '' %}
             {{ name }}-tunnel-{{ tunnel_id }} {
-                esp_proposals = {{ tunnel_esp | get_esp_ike_cipher(ike) | join(',') }}
+                esp_proposals = {{ tunnel_esp | get_esp_cipher(ike) | join(',') }}
 {%         if tunnel_esp.life_bytes is vyos_defined %}
                 life_bytes = {{ tunnel_esp.life_bytes }}
 {%         endif %}
diff --git a/data/templates/ipsec/swanctl/profile.j2 b/data/templates/ipsec/swanctl/profile.j2
index 1aec635fd..187429a26 100644
--- a/data/templates/ipsec/swanctl/profile.j2
+++ b/data/templates/ipsec/swanctl/profile.j2
@@ -5,7 +5,7 @@
 {% if profile_conf.bind.tunnel is vyos_defined %}
 {%     for interface in profile_conf.bind.tunnel %}
     dmvpn-{{ name }}-{{ interface }} {
-        proposals = {{ ike_group[profile_conf.ike_group] | get_esp_ike_cipher(esn=False) | join(',') }}
+        proposals = {{ ike_group[profile_conf.ike_group] | get_ike_cipher | join(',') }}
         version = {{ ike.key_exchange[4:] if ike.key_exchange is vyos_defined else "0" }}
         rekey_time = {{ ike.lifetime }}s
         keyingtries = 0
@@ -26,7 +26,7 @@
 {%         endif %}
         children {
             dmvpn-{{ name }}-{{ interface }}-child {
-                esp_proposals = {{ esp | get_esp_ike_cipher(ike) | join(',') }}
+                esp_proposals = {{ esp | get_esp_cipher(ike) | join(',') }}
                 rekey_time = {{ esp.lifetime }}s
                 rand_time = 540s
                 local_ts = dynamic[gre]
diff --git a/data/templates/ipsec/swanctl/remote_access.j2 b/data/templates/ipsec/swanctl/remote_access.j2
index 7d89ced8b..b39885bf1 100644
--- a/data/templates/ipsec/swanctl/remote_access.j2
+++ b/data/templates/ipsec/swanctl/remote_access.j2
@@ -14,7 +14,7 @@
 {% endif %}
         remote_addrs = %any
         local_addrs = {{ rw_conf.local_address if rw_conf.local_address is not vyos_defined('any') else '%any' }} # dhcp:{{ rw_conf.dhcp_interface if rw_conf.dhcp_interface is vyos_defined else 'no' }}
-        proposals = {{ ike_group[rw_conf.ike_group] | get_esp_ike_cipher(esn=False) | join(',') }}
+        proposals = {{ ike_group[rw_conf.ike_group] | get_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 %}
@@ -59,7 +59,7 @@
         }
         children {
             {{ name }}-client  {
-                esp_proposals = {{ esp | get_esp_ike_cipher(ike) | join(',') }}
+                esp_proposals = {{ esp | get_esp_cipher(ike) | join(',') }}
 {% if esp.life_bytes is vyos_defined %}
                 life_bytes = {{ esp.life_bytes }}
 {% endif %}