Merge e25464cfce into 90f730c3d4

fix userID detect when the same local and domain user exist
Signed-off-by: Simon Smith <simonsmith5521@gmail.com>
2025-12-06 00:13:33 +00:00 · 2024-08-12 14:01:30 +02:00 · 2024-08-01 15:18:26 +01:00 · 2024-01-21 11:23:54 -08:00
2 changed files with 7 additions and 4 deletions
--- a/modules/monitor-info.js
+++ b/modules/monitor-info.js
@@ -390,7 +390,7 @@ function monitorinfo()
                }
                else
                {
-                    ch.stdin.write('ps -e | grep X\nexit\n');
+                    ch.stdin.write("ps -e -o comm,cgroup|egrep '^X.*(-|::/user.slice.*)$'\nexit\n");
                }
                ch.waitExit();

--- a/modules/win-registry.js
+++ b/modules/win-registry.js
@@ -319,7 +319,7 @@ function windows_registry()
            var sid = user;
            if (typeof (user) == 'string')
            {
-                // Try to find the Session ID for the specified domain user
+                // Try to find the Session ID for the specified local user
                var r = this.QueryKey(this.HKEY.LocalMachine, 'SAM\\SAM\\Domains\\Account\\Users\\Names\\' + user);
                sid = r.default._type;
            }
@@ -328,8 +328,11 @@ function windows_registry()
            {
                if(u.subkeys[i].endsWith('-' + sid))
                {
-                    // Try to find the Descriptor Key with the SID that we found
-                    return (u.subkeys[i]);
+                    if (this.QueryKey(this.HKEY.Users, u.subkeys[i] + '\\Volatile Environment', 'USERDOMAIN') == domain)
+                    {
+                        // Try to find the Descriptor Key with the SID that we found
+                        return (u.subkeys[i]);
+                    }
                }
            }
        }
Author	SHA1	Message	Date
gutschke	02a0b1671b	Merge `e25464cfce` into `90f730c3d4`	2024-08-12 14:01:30 +02:00
Simon Smith	90f730c3d4	fix userID detect when the same local and domain user exist Signed-off-by: Simon Smith <simonsmith5521@gmail.com>	2024-08-01 15:18:26 +01:00
Markus Gutschke	e25464cfce	Filter out X11 servers running inside containers. MeshAgent should only ever scan for X11 servers running on the host itself. Containerized servers (e.g. Xvfb inside of an LXC container) cannot be accessed by MeshAgent and would thus result in a "Desktop" tab that is non-functional. The control group for the candidate process should provide the necessary information to make this distinction. If the control group is either non-existent or if it is a user-session without any container namespace, then this is a process that belongs to the host. On the other hand, if the agent sees a namespace for a container (e.g. "0::/lxc/XXXX/ns"), it should ignore the process.	2024-01-21 11:23:54 -08:00