1 files changed, 21 insertions, 39 deletions

diff --git a/src/conf_mode/interfaces-pppoe.py b/src/conf_mode/interfaces-pppoe.py
index f318614db..d432377e8 100755
--- a/src/conf_mode/interfaces-pppoe.py
+++ b/src/conf_mode/interfaces-pppoe.py
@@ -20,12 +20,10 @@ from sys import exit
 from copy import deepcopy
 from jinja2 import Template
 from subprocess import Popen, PIPE
-from pwd import getpwnam
-from grp import getgrnam
-from stat import S_IRUSR, S_IWUSR, S_IXUSR, S_IRGRP, S_IXGRP, S_IROTH, S_IXOTH
 
 from vyos.config import Config
 from vyos.ifconfig import Interface
+from vyos.util import chown_file, chmod_x_file
 from vyos import ConfigError
 from netifaces import interfaces
 
@@ -150,12 +148,12 @@ echo 1 > /proc/sys/net/ipv6/conf/{{ intf }}/autoconfigure
 {% endif %}
 """
 
-config_pppoe_ip_pre_up_tmpl = """#!/bin/sh
+config_pppoe_ip_up_tmpl = """#!/bin/sh
 
 # As PPPoE is an "on demand" interface we need to re-configure it when it
 # becomes up
 
-if [ "$6" != "pppoe0" ]; then
+if [ "$6" != "{{ intf }}" ]; then
     exit
 fi
 
@@ -306,60 +304,47 @@ def verify(pppoe):
 
 def generate(pppoe):
     config_file_pppoe = f"/etc/ppp/peers/{pppoe['intf']}"
-    ip_pre_up_script_file = f"/etc/ppp/ip-pre-up.d/9999-vyos-vrf-{pppoe['intf']}"
+    ip_up_script_file = f"/etc/ppp/ip-up.d/9990-vyos-vrf-{pppoe['intf']}"
     ipv6_if_up_script_file = f"/etc/ppp/ipv6-up.d/50-vyos-{pppoe['intf']}-autoconf"
 
+    config_files = [config_file_pppoe, ip_up_script_file, ipv6_if_up_script_file]
+
+    # Ensure directories for config files exist - otherwise create them on demand
+    for file in config_files:
+        dirname = os.path.dirname(file)
+        if not os.path.isdir(dirname):
+            os.mkdir(dirname)
+
     # Always hang-up PPPoE connection prior generating new configuration file
     cmd = f"systemctl stop ppp@{pppoe['intf']}.service"
     subprocess_cmd(cmd)
 
     if pppoe['deleted']:
         # Delete PPP configuration files
-        if os.path.exists(config_file_pppoe):
-            os.unlink(config_file_pppoe)
-
-        if os.path.exists(ipv6_if_up_script_file):
-            os.unlink(ipv6_if_up_script_file)
-
-        if os.path.exists(ip_pre_up_script_file):
-            os.unlink(ip_pre_up_script_file)
+        for file in config_files:
+            if os.path.exists(file):
+                os.unlink(file)
 
     else:
-        # PPP peers directory
-        dirname = os.path.dirname(config_file_pppoe)
-        if not os.path.isdir(dirname):
-            os.mkdir(dirname)
-
         # Create PPP configuration files
         tmpl = Template(config_pppoe_tmpl)
         config_text = tmpl.render(pppoe)
         with open(config_file_pppoe, 'w') as f:
             f.write(config_text)
 
-        # PPP ip-pre-up.d scripting directory
-        dirname = os.path.dirname(ip_pre_up_script_file)
-        if not os.path.isdir(dirname):
-            os.mkdir(dirname)
-
-        tmpl = Template(config_pppoe_ip_pre_up_tmpl)
+        tmpl = Template(config_pppoe_ip_up_tmpl)
         config_text = tmpl.render(pppoe)
-        with open(ip_pre_up_script_file, 'w') as f:
+        with open(ip_up_script_file, 'w') as f:
             f.write(config_text)
 
-        # PPP ipv6-up.d scripting directory
-        dirname = os.path.dirname(ipv6_if_up_script_file)
-        if not os.path.isdir(dirname):
-            os.mkdir(dirname)
-
         tmpl = Template(config_pppoe_ipv6_up_tmpl)
         config_text = tmpl.render(pppoe)
         with open(ipv6_if_up_script_file, 'w') as f:
             f.write(config_text)
 
-        bitmask = S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | \
-                  S_IROTH | S_IXOTH
-        os.chmod(ip_pre_up_script_file, bitmask)
-        os.chmod(ipv6_if_up_script_file, bitmask)
+        # make generated script file executable
+        chmod_x_file(ip_up_script_file)
+        chmod_x_file(ipv6_if_up_script_file)
 
     return None
 
@@ -374,10 +359,7 @@ def apply(pppoe):
         subprocess_cmd(cmd)
 
         # make logfile owned by root / vyattacfg
-        if os.path.isfile(pppoe['logfile']):
-            uid = getpwnam('root').pw_uid
-            gid = getgrnam('vyattacfg').gr_gid
-            os.chown(pppoe['logfile'], uid, gid)
+        chown_file(pppoe['logfile'], 'root', 'vyattacfg')
 
     return None