Merge branch 'current' into 2fa

1 files changed, 22 insertions, 24 deletions

diff --git a/src/etc/dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook b/src/etc/dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook
index a7a9a2ce6..61a89e62a 100755
--- a/src/etc/dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook
+++ b/src/etc/dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook
@@ -35,19 +35,14 @@ fi
 python3 - <<PYEND
 import os
 import re
+
 from vyos.util import call
 from vyos.util import cmd
+from vyos.util import read_file
+from vyos.util import write_file
 
 SWANCTL_CONF="/etc/swanctl/swanctl.conf"
 
-def getlines(file):
-    with open(file, 'r') as f:
-        return f.readlines()
-
-def writelines(file, lines):
-    with open(file, 'w') as f:
-        f.writelines(lines)
-
 def ipsec_down(ip_address):
     # This prevents the need to restart ipsec and kill all active connections, only the stale connection is closed
     status = cmd('sudo ipsec statusall')
@@ -66,23 +61,26 @@ if __name__ == '__main__':
     new_ip = os.getenv('new_ip_address')
     old_ip = os.getenv('old_ip_address')
 
-    conf_lines = getlines(SWANCTL_CONF)
-    found = False
-    to_match = f'# dhcp:{interface}'
+    if os.path.exists(SWANCTL_CONF):
+        conf_lines = read_file(SWANCTL_CONF)
+        found = False
+        to_match = f'# dhcp:{interface}'
+
+        for i, line in enumerate(conf_lines):
+            if line.find(to_match) > 0:
+                conf_lines[i] = line.replace(old_ip, new_ip)
+                found = True
 
-    for i, line in enumerate(conf_lines):
-        if line.find(to_match) > 0:
-            conf_lines[i] = line.replace(old_ip, new_ip)
-            found = True
+        for i, line in enumerate(secrets_lines):
+            if line.find(to_match) > 0:
+                secrets_lines[i] = line.replace(old_ip, new_ip)
 
-    for i, line in enumerate(secrets_lines):
-        if line.find(to_match) > 0:
-            secrets_lines[i] = line.replace(old_ip, new_ip)
+        if found:
+            write_file(SWANCTL_CONF, conf_lines)
+            ipsec_down(old_ip)
+            call('sudo ipsec rereadall')
+            call('sudo ipsec reload')
+            call('sudo swanctl -q')
 
-    if found:
-        writelines(SWANCTL_CONF, conf_lines)
-        ipsec_down(old_ip)
-        call('sudo ipsec rereadall')
-        call('sudo ipsec reload')
-        call('sudo swanctl -q')
+    exit(0)
 PYEND
\ No newline at end of file