From 1beac768e10ae52c9ecbb6cac56b5126f7aa1387 Mon Sep 17 00:00:00 2001
From: matt335672 <30179339+matt335672@users.noreply.github.com>
Date: Mon, 16 Dec 2024 16:04:11 +0000
Subject: [PATCH] Add sesexec_set_ecp_transport/sesexec_is_ecp_active()

These sesexec functions are needed for the discovery module to
function.
---
 sesman/sesexec/sesexec.c | 63 +++++++++++++++++++++++++++++++++++-----
 sesman/sesexec/sesexec.h | 20 +++++++++++++
 2 files changed, 75 insertions(+), 8 deletions(-)

diff --git a/sesman/sesexec/sesexec.c b/sesman/sesexec/sesexec.c
index 7f37a0d170..7c3f2a6ad4 100644
--- a/sesman/sesexec/sesexec.c
+++ b/sesman/sesexec/sesexec.c
@@ -68,6 +68,7 @@ pid_t g_pid;
  * Module-scope globals
  */
 static struct trans *g_ecp_trans;
+static pid_t g_ecp_pid;
 static int g_terminate_loop = 0;
 static int g_terminate_status = 0;
 
@@ -214,6 +215,53 @@ sesexec_terminate_main_loop(int status)
     g_terminate_status = status;
 }
 
+/******************************************************************************/
+int
+sesexec_set_ecp_transport(struct trans *t)
+{
+    int rv;
+    int pid;
+    int uid;
+    int gid;
+
+    if (t == NULL)
+    {
+        trans_delete(g_ecp_trans);
+        g_ecp_trans = NULL;
+        g_ecp_pid = 0;
+        rv = 0;
+    }
+    else if ((rv = g_sck_get_peer_cred(t->sck, &pid, &uid, &gid)) != 0)
+    {
+        LOG(LOG_LEVEL_ERROR, "Can't get credentials of sesman socket [%s]",
+            g_get_strerror());
+    }
+    else if (uid != 0 || gid != 0)
+    {
+        LOG(LOG_LEVEL_ERROR, "sesman PID %d is running as UID:GID %d:%d",
+            pid, uid, gid);
+        rv = 1;
+    }
+    else
+    {
+        trans_delete(g_ecp_trans);
+        g_ecp_trans = t;
+        g_ecp_pid = pid;
+        rv = 0;
+    }
+
+    return rv;
+}
+
+/******************************************************************************/
+int
+sesexec_is_ecp_active(void)
+{
+    return (g_ecp_trans != NULL &&
+            g_ecp_pid != 0 && g_pid_is_active(g_ecp_pid));
+
+}
+
 /******************************************************************************/
 static void
 process_sigchld_event(void)
@@ -367,8 +415,7 @@ sesexec_main_loop(void)
                     // restarts
                     LOG(LOG_LEVEL_INFO, "sesexec_main_loop: "
                         "sesman has exited");
-                    trans_delete(g_ecp_trans);
-                    g_ecp_trans = NULL;
+                    sesexec_set_ecp_transport(NULL);
                 }
                 else
                 {
@@ -394,8 +441,7 @@ sesexec_main_loop(void)
     }
 
     /* close sesman communications immediately */
-    trans_delete(g_ecp_trans);
-    g_ecp_trans = NULL;
+    sesexec_set_ecp_transport(NULL);
 
     return g_terminate_status;
 #undef MAX_ROBJS
@@ -527,6 +573,7 @@ main(int argc, char **argv)
         else
         {
             char text[128];
+            struct trans *t;
 
             g_pid = g_getpid();
 
@@ -547,10 +594,10 @@ main(int argc, char **argv)
 
             /* Set up an EICP process handler
              * Errors are logged by this call if necessary */
-            g_ecp_trans = eicp_init_trans_from_fd(eicp_fd,
-                                                  TRANS_TYPE_SERVER,
-                                                  sesexec_is_term);
-            if (g_ecp_trans != NULL)
+            t = eicp_init_trans_from_fd(eicp_fd,
+                                        TRANS_TYPE_SERVER,
+                                        sesexec_is_term);
+            if (t != NULL && sesexec_set_ecp_transport(t) == 0)
             {
                 g_ecp_trans->trans_data_in = sesexec_eicp_data_in;
                 g_ecp_trans->callback_data = NULL;
diff --git a/sesman/sesexec/sesexec.h b/sesman/sesexec/sesexec.h
index ff6fe7e0fc..7d476b2c23 100644
--- a/sesman/sesexec/sesexec.h
+++ b/sesman/sesexec/sesexec.h
@@ -67,4 +67,24 @@ sesexec_is_term(void);
 void
 sesexec_terminate_main_loop(int status);
 
+/**
+ * Sets the ECP (sesman) transport
+ *
+ * @param t Transport supposedly connected to the ECP protocol
+ *          provider (sesman), or NULL to clear the transport
+ * @return 0 for success
+ *
+ * Peer credentials are checked for root:root
+ */
+int
+sesexec_set_ecp_transport(struct trans *t);
+
+/*
+ * Is the ECP transport still active?
+ *
+ * @result boolean
+ */
+int
+sesexec_is_ecp_active(void);
+
 #endif // SESEXEC_H