kea: T7821: Update paths for Kea v2.7.9 security changes

Author: sarthurdev

data/templates/dhcp-server/kea-dhcp-ddns.conf.j2

@@ -5,10 +5,10 @@
         "control-socket": {
 {% if vrf_context is vyos_defined %}
             "socket-type": "unix",
-            "socket-name": "/run/kea/kea-ddns-{{ vrf_context }}-ctrl-socket"
+            "socket-name": "/var/run/kea/kea-ddns-{{ vrf_context }}-ctrl-socket"
 {% else %}
             "socket-type": "unix",
-            "socket-name": "/run/kea/kea-ddns-ctrl-socket"
+            "socket-name": "/var/run/kea/kea-ddns-ctrl-socket"
 {% endif %}
         },
         "tsig-keys": {{ dynamic_dns_update | kea_dynamic_dns_update_tsig_key_json }},

data/templates/dhcp-server/kea-dhcp4.conf.j2

@@ -17,10 +17,10 @@
         "control-socket": {
 {% if vrf_context is vyos_defined %}
             "socket-type": "unix",
-            "socket-name": "/run/kea/dhcp4-{{ vrf_context }}-ctrl-socket"
+            "socket-name": "/var/run/kea/dhcp4-{{ vrf_context }}-ctrl-socket"
 {% else %}
             "socket-type": "unix",
-            "socket-name": "/run/kea/dhcp4-ctrl-socket"
+            "socket-name": "/var/run/kea/dhcp4-ctrl-socket"
 {% endif %}
         },
         "lease-database": {

data/templates/dhcp-server/kea-dhcp6.conf.j2

@@ -12,10 +12,10 @@
         "control-socket": {
 {% if vrf_context is vyos_defined %}
             "socket-type": "unix",
-            "socket-name": "/run/kea/dhcp6-{{ vrf_context }}-ctrl-socket"
+            "socket-name": "/var/run/kea/dhcp6-{{ vrf_context }}-ctrl-socket"
 {% else %}
             "socket-type": "unix",
-            "socket-name": "/run/kea/dhcp6-ctrl-socket"
+            "socket-name": "/var/run/kea/dhcp6-ctrl-socket"
 {% endif %}
         },
         "lease-database": {

python/vyos/kea.py

@@ -60,7 +60,7 @@
     'capwap_controller': 'capwap-ac-v6',
 }
 
-kea_ctrl_socket = '/run/kea/dhcp{inet}{vrf_append}-ctrl-socket'
+kea_ctrl_socket = '/var/run/kea/dhcp{inet}{vrf_append}-ctrl-socket'
 
 
 def _format_hex_string(in_str):

smoketest/scripts/cli/test_service_dhcp-server.py

@@ -33,9 +33,9 @@
 
 PROCESS_NAME = 'kea-dhcp4'
 D2_PROCESS_NAME = 'kea-dhcp-ddns'
-KEA4_CONF = '/run/kea/kea-dhcp4.conf'
-KEA4_D2_CONF = '/run/kea/kea-dhcp-ddns.conf'
-KEA4_CTRL = '/run/kea/dhcp4-ctrl-socket'
+KEA4_CONF = '/var/run/kea/kea-dhcp4.conf'
+KEA4_D2_CONF = '/var/run/kea/kea-dhcp-ddns.conf'
+KEA4_CTRL = '/var/run/kea/dhcp4-ctrl-socket'
 HOSTSD_CLIENT = '/usr/bin/vyos-hostsd-client'
 base_path = ['service', 'dhcp-server']
 interface = 'dum8765'

smoketest/scripts/cli/test_service_dhcpv6-server.py

@@ -26,7 +26,7 @@
 from vyos.utils.file import read_file
 
 PROCESS_NAME = 'kea-dhcp6'
-KEA6_CONF = '/run/kea/kea-dhcp6.conf'
+KEA6_CONF = '/var/run/kea/kea-dhcp6.conf'
 base_path = ['service', 'dhcpv6-server']
 
 subnet = '2001:db8:f00::/64'

smoketest/scripts/cli/test_vrf.py

@@ -652,7 +652,7 @@ def test_dhcp_single_pool(self):
 
         # declare fiels
         process_name = 'kea-dhcp4'
-        kea4_conf = f'/run/kea/kea-{vrf}-dhcp4.conf'
+        kea4_conf = f'/var/run/kea/kea-{vrf}-dhcp4.conf'
 
         # create interface
         cidr_mask = subnet.split('/')[-1]
@@ -791,7 +791,7 @@ def test_dhcpv6_single_pool(self):
 
         # declare fiels
         process_name = 'kea-dhcp6'
-        kea6_conf = f'/run/kea/kea-{vrf}-dhcp6.conf'
+        kea6_conf = f'/var/run/kea/kea-{vrf}-dhcp6.conf'
 
         # create interface
         self.cli_set(['interfaces', 'dummy', interface, 'address', f'{interface_addr}'])

src/etc/systemd/system/isc-kea-dhcp-ddns-server.service.d/override.conf

@@ -4,4 +4,4 @@ After=vyos-router.service
 
 [Service]
 ExecStart=
-ExecStart=/usr/sbin/kea-dhcp-ddns -c /run/kea/kea-dhcp-ddns.conf
+ExecStart=/usr/sbin/kea-dhcp-ddns -c /var/run/kea/kea-dhcp-ddns.conf

src/etc/systemd/system/isc-kea-dhcp-ddns-server@.service

@@ -14,8 +14,8 @@ RuntimeDirectoryPreserve=yes
 LogsDirectory=kea
 LogsDirectoryMode=0750
 StateDirectory=kea
-ExecStart=sudo /bin/ip vrf exec %i /usr/sbin/kea-dhcp-ddns -c /run/kea/kea-%i-dhcp-ddns.conf
-ExecStartPost=/bin/sh -c 'sleep 10 && sudo /usr/bin/chown _kea:_kea /run/kea/kea-%i-dhcp-ddns* && sudo /usr/bin/chown _kea:_kea /run/kea/logger_lockfile'
+ExecStart=sudo /bin/ip vrf exec %i /usr/sbin/kea-dhcp-ddns -c /var/run/kea/kea-%i-dhcp-ddns.conf
+ExecStartPost=/bin/sh -c 'sleep 10 && sudo /usr/bin/chown _kea:_kea /var/run/kea/kea-%i-dhcp-ddns* && sudo /usr/bin/chown _kea:_kea /run/kea/logger_lockfile'
 Restart=on-failure
 
 [Install]

src/etc/systemd/system/isc-kea-dhcp4-server.service.d/override.conf

@@ -3,7 +3,9 @@ After=
 After=vyos-router.service
 
 [Service]
+Environment="KEA_DHCP_DATA_DIR=/config/dhcp"
+Environment="KEA_HOOK_SCRIPTS_PATH=/usr/libexec/vyos/system"
 ExecStart=
-ExecStart=/usr/sbin/kea-dhcp4 -c /run/kea/kea-dhcp4.conf
+ExecStart=/usr/sbin/kea-dhcp4 -c /var/run/kea/kea-dhcp4.conf
 ExecStartPost=!/usr/bin/python3 /usr/libexec/vyos/system/sync-dhcp-lease-to-hosts.py --inet
 Restart=on-failure