From d22399a23bf3189fad8b4c008f6e91d3761b7a62 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Sat, 24 May 2025 22:47:08 -0500
Subject: T7352: add check for privileges in utility

---
 src/helpers/set_vyconf_backend.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/helpers/set_vyconf_backend.py b/src/helpers/set_vyconf_backend.py
index 6747e51c3..816452f3b 100755
--- a/src/helpers/set_vyconf_backend.py
+++ b/src/helpers/set_vyconf_backend.py
@@ -19,10 +19,14 @@
 # N.B. only for use within testing framework; explicit invocation will leave
 # system in inconsistent state.
 
+import os
+import sys
 from argparse import ArgumentParser
 
 from vyos.utils.backend import set_vyconf_backend
 
+if os.getuid() != 0:
+    sys.exit('Requires root privileges')
 
 parser = ArgumentParser()
 parser.add_argument('--disable', action='store_true',
-- 
cgit v1.2.3


From c3e7346ec7b514fe1f3276bbd29ed7719bcbe5cf Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Mon, 26 May 2025 15:57:25 -0500
Subject: T7374: add python cli script to compliment executable vyconf_cli

For certain commands, notably 'commit', a python script is preferable to
the more responsive executable vyconf_cli. Criteria are (1) longer
running process, not benefiting from a compiled tool (2) convenience of
integration with the ecosystem, for example pre-/post-commit hooks.
---
 src/helpers/vyconf_cli.py | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100755 src/helpers/vyconf_cli.py

(limited to 'src')

diff --git a/src/helpers/vyconf_cli.py b/src/helpers/vyconf_cli.py
new file mode 100755
index 000000000..a159a2678
--- /dev/null
+++ b/src/helpers/vyconf_cli.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2025 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+import os
+import sys
+
+from vyos.vyconf_session import VyconfSession
+
+
+pid = os.getppid()
+
+vs = VyconfSession(pid=pid)
+
+script_path = sys.argv[0]
+script_name = os.path.basename(script_path)
+# drop prefix 'vy_' if present
+if script_name.startswith('vy_'):
+    func_name = script_name[3:]
+else:
+    func_name = script_name
+
+if hasattr(vs, func_name):
+    func = getattr(vs, func_name)
+else:
+    sys.exit(f'Call unimplemented: {func_name}')
+
+out = func()
+if isinstance(out, bool):
+    # for use in shell scripts
+    sys.exit(int(not out))
+
+print(out)
-- 
cgit v1.2.3


From e1c765c912b9e313b9367b87b273075618a208da Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Mon, 26 May 2025 15:58:30 -0500
Subject: T7374: add environment variable vyconf_bin_dir

---
 src/etc/default/vyatta | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/etc/default/vyatta b/src/etc/default/vyatta
index e5fa3bb30..0a5129e8b 100644
--- a/src/etc/default/vyatta
+++ b/src/etc/default/vyatta
@@ -173,6 +173,7 @@ unset _vyatta_extglob
     declare -x -r vyos_bin_dir=/usr/bin
     declare -x -r vyos_sbin_dir=/usr/sbin
     declare -x -r vyos_share_dir=/usr/share
+    declare -x -r vyconf_bin_dir=/usr/libexec/vyos/vyconf/bin
 
     if test -z "$vyos_conf_scripts_dir" ; then
         declare -x -r vyos_conf_scripts_dir=$vyos_libexec_dir/conf_mode
-- 
cgit v1.2.3