login: T1948: drop absolut path to /usr/libexec/vyos, re-use vyos.defaults

2 files changed, 23 insertions, 19 deletions

diff --git a/python/vyos/defaults.py b/python/vyos/defaults.py
index 7de458960..db0def8ed 100644
--- a/python/vyos/defaults.py
+++ b/python/vyos/defaults.py
@@ -1,4 +1,4 @@
-# Copyright 2018 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright 2018-2023 VyOS maintainers and contributors <maintainers@vyos.io>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,19 +15,22 @@
 
 import os
 
+base_dir = '/usr/libexec/vyos/'
+
 directories = {
-  "data": "/usr/share/vyos/",
-  "conf_mode": "/usr/libexec/vyos/conf_mode",
-  "op_mode": "/usr/libexec/vyos/op_mode",
-  "config": "/opt/vyatta/etc/config",
-  "current": "/opt/vyatta/etc/config-migrate/current",
-  "migrate": "/opt/vyatta/etc/config-migrate/migrate",
-  "log": "/var/log/vyatta",
-  "templates": "/usr/share/vyos/templates/",
-  "certbot": "/config/auth/letsencrypt",
-  "api_schema": "/usr/libexec/vyos/services/api/graphql/graphql/schema/",
-  "api_templates": "/usr/libexec/vyos/services/api/graphql/session/templates/",
-  "vyos_udev_dir": "/run/udev/vyos"
+  'base' : base_dir,
+  'data' : '/usr/share/vyos/',
+  'conf_mode' : f'{base_dir}/conf_mode',
+  'op_mode' : f'{base_dir}/op_mode',
+  'config' : '/opt/vyatta/etc/config',
+  'current' : '/opt/vyatta/etc/config-migrate/current',
+  'migrate' : '/opt/vyatta/etc/config-migrate/migrate',
+  'log' : '/var/log/vyatta',
+  'templates' : '/usr/share/vyos/templates/',
+  'certbot' : '/config/auth/letsencrypt',
+  'api_schema': f'{base_dir}/services/api/graphql/graphql/schema/',
+  'api_templates': f'{base_dir}/services/api/graphql/session/templates/',
+  'vyos_udev_dir' : '/run/udev/vyos'
 }
 
 config_status = '/tmp/vyos-config-status'
@@ -50,12 +53,12 @@ api_data = {
     'socket' : False,
     'strict' : False,
     'debug' : False,
-    'api_keys' : [ {"id": "testapp", "key": "qwerty"} ]
+    'api_keys' : [ {'id' : 'testapp', 'key' : 'qwerty'} ]
 }
 
 vyos_cert_data = {
-    "conf": "/etc/nginx/snippets/vyos-cert.conf",
-    "crt": "/etc/ssl/certs/vyos-selfsigned.crt",
-    "key": "/etc/ssl/private/vyos-selfsign",
-    "lifetime": "365",
+    'conf' : '/etc/nginx/snippets/vyos-cert.conf',
+    'crt' : '/etc/ssl/certs/vyos-selfsigned.crt',
+    'key' : '/etc/ssl/private/vyos-selfsign',
+    'lifetime' : '365',
 }
diff --git a/src/conf_mode/system-login.py b/src/conf_mode/system-login.py
index e26b81e3d..8fc18bc37 100755
--- a/src/conf_mode/system-login.py
+++ b/src/conf_mode/system-login.py
@@ -28,6 +28,7 @@ from time import sleep
 from vyos.config import Config
 from vyos.configdict import dict_merge
 from vyos.configverify import verify_vrf
+from vyos.defaults import directories
 from vyos.template import render
 from vyos.template import is_ipv4
 from vyos.util import cmd
@@ -159,7 +160,7 @@ def generate(login):
 
                 # remove old plaintext password and set new encrypted password
                 env = os.environ.copy()
-                env['vyos_libexec_dir'] = '/usr/libexec/vyos'
+                env['vyos_libexec_dir'] = directories['base']
 
                 # Set default commands for re-adding user with encrypted password
                 del_user_plain = f"system login user '{user}' authentication plaintext-password"