kea: T7281: Set folder permissions to expected 0750

Author: sarthurdev

python/vyos/template.py

@@ -155,6 +155,7 @@ def render(
     user=None,
     group=None,
     location=None,
+    folder_permission=None
 ):
     """Render a template from the template directory to a file, raise on any errors.
 
@@ -167,7 +168,7 @@ def render(
     """
     # Create the directory if it does not exist
     folder = os.path.dirname(destination)
-    makedir(folder, user, group)
+    makedir(folder, user, group, folder_permission)
 
     # As we are opening the file with 'w', we are performing the rendering before
     # calling open() to not accidentally erase the file if rendering fails

python/vyos/utils/file.py

@@ -16,10 +16,12 @@
 import os
 from vyos.utils.permission import chown
 
-def makedir(path, user=None, group=None):
+def makedir(path, user=None, group=None, permission=None):
     if os.path.exists(path):
         return
-    os.makedirs(path, mode=0o755)
+    if not permission:
+        permission = 0o755
+    os.makedirs(path, mode=permission)
     chown(path, user, group)
 
 def file_is_persistent(path):

src/conf_mode/service_dhcp-server.py

@@ -565,6 +565,7 @@ def generate(dhcp):
         dhcp,
         user=user_group,
         group=user_group,
+        folder_permission=0o750
     )
     if 'dynamic_dns_update' in dhcp:
         render(

src/conf_mode/service_dhcpv6-server.py

@@ -282,7 +282,14 @@ def generate(dhcpv6):
     if not os.path.exists(lease_file):
         write_file(lease_file, '', user=user_group, group=user_group, mode=0o644)
 
-    render(config_file, 'dhcp-server/kea-dhcp6.conf.j2', dhcpv6, user=user_group, group=user_group)
+    render(
+        config_file,
+        'dhcp-server/kea-dhcp6.conf.j2',
+        dhcpv6,
+        user=user_group,
+        group=user_group,
+        folder_permission=0o750
+    )
     return None
 
 def apply(dhcpv6):