T7737: update init data as needed for vyos-commitd environment

Provide env vars of config session for injection into the commitd
environment. This information is needed for certain config-mode scripts,
namely those that reference the module vyos.utils.auth.

1 files changed, 10 insertions, 4 deletions

diff --git a/python/vyos/vyconf_session.py b/python/vyos/vyconf_session.py
index 4b79073ab..1f7f37663 100644
--- a/python/vyos/vyconf_session.py
+++ b/python/vyos/vyconf_session.py
@@ -41,18 +41,24 @@ class VyconfSession:
         self, token: str = None, pid: int = None, on_error: Type[Exception] = None
     ):
         self.pid = os.getpid() if pid is None else pid
+        self.sudo_user = os.environ.get('SUDO_USER', None)
+        self.user = os.environ.get('USER', None)
+
         if token is None:
             # CLI applications with arg pid=getppid() allow coordination
             # with the ambient session; other uses (such as ConfigSession)
             # may default to self pid
             out = vyconf_client.send_request('session_of_pid', client_pid=self.pid)
             if out.output is None:
-                out = vyconf_client.send_request('setup_session', client_pid=self.pid)
+                out = vyconf_client.send_request(
+                    'setup_session',
+                    client_pid=self.pid,
+                    client_sudo_user=self.sudo_user,
+                    client_user=self.user,
+                )
             self.__token = out.output
         else:
-            out = vyconf_client.send_request(
-                'session_update_pid', token=token, client_pid=self.pid
-            )
+            out = vyconf_client.send_request('session_exists', token=token)
             if out.status:
                 raise ValueError(f'No existing session for token: {token}')
             self.__token = token