Update MeshAgent from Fork

.github/workflows/codeql-analysis.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
@@ -26,7 +26,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       # Override language selection by uncommenting this and choosing your languages
       with:
          languages: javascript, cpp
@@ -49,4 +49,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/linux-build.yml

@@ -0,0 +1,49 @@
+name: Linux Build
+run-name: Build Linux versions of MeshAgent
+on: [push]
+jobs:
+  linux-build-x86:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v7.0.0
+      - name: Install Packages
+        run: |
+          sudo dpkg --add-architecture i386 &&
+          sudo apt clean all && sudo apt update && 
+          sudo apt-get install -y libx11-dev libxtst-dev libxext-dev libjpeg62-dev build-essential &&
+          sudo apt-get install -y linux-libc-dev:i386 libc6-dev-i386 libjpeg62-dev:i386 &&
+          sudo apt-get install -y libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi libncurses5-dev gcc-arm-linux-gnueabihf && 
+          sudo apt-get install -y libxrandr-dev
+      - name: Build 32 Bit Linux
+        run: make -j4 linux ARCHID=5 && make clean
+      - name: Build 64 Bit Linux
+        run: make -j4 linux ARCHID=6 && make clean
+      - name: Build 32 Bit NOKVM Linux
+        run: make -j4 linux ARCHID=19 && make clean
+      - name: Build 64 Bit NOKVM Linux
+        run: make -j4 linux ARCHID=20 && make clean
+      - name: Build 64 Bit Alpine Linux
+        run: make -j4 linux ARCHID=33 && make clean
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v7.0.1
+        with:
+          name: meshagent-binaries-x86
+          path: ${{ github.workspace }}/meshagent_*
+
+  linux-build-arm:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v7.0.0
+      - name: Install Packages
+        run: |
+          sudo apt clean all && sudo apt update &&
+          sudo apt-get install -y libx11-dev libxtst-dev libxext-dev libjpeg-dev libxrandr-dev build-essential
+      - name: Build ARM64 Linux
+        run: make -j4 linux ARCHID=26 && make clean
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v7.0.1
+        with:
+          name: meshagent-binaries-arm
+          path: ${{ github.workspace }}/meshagent_*

.github/workflows/windows-build.yml

@@ -0,0 +1,27 @@
+name: Windows Build
+
+run-name: Build Windows versions of MeshAgent
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  windows-build:
+    runs-on: ${{ matrix.platform == 'ARM64' && 'windows-11-arm' || 'windows-2022' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [x64, x86, ARM64]
+    steps:
+    - uses: actions/checkout@v7
+    - name: Setup Visual Studio
+      uses: microsoft/setup-msbuild@v3
+    - name: Build ${{ matrix.platform }}
+      run: msbuild MeshAgent-2022.sln /p:Configuration=Release /p:Platform=${{ matrix.platform }}
+    - name: Upload ${{ matrix.platform }} artifacts
+      uses: actions/upload-artifact@v7
+      with:
+        name: meshagent-windows-${{ matrix.platform }}
+        path: Release/*.exe
+

com.meshagent.kvm.plist

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>com.meshagent.kvm</string>
+
+    <!--
+        Launchd loads this LaunchAgent into gui/<console-uid> (and
+        LoginWindow), so the kvm process runs natively in the user's
+        GUI audit session. com.apple.replayd is reachable from this
+        session, which is what makes ScreenCaptureKit / ReplayKit
+        screen-capture work on macOS Tahoe without the
+        audit_session_join workaround the daemon-spawn path needs.
+    -->
+    <key>LimitLoadToSessionType</key>
+    <array>
+        <string>Aqua</string>
+        <string>LoginWindow</string>
+    </array>
+
+    <key>ProgramArguments</key>
+    <array>
+        <string>/usr/local/mesh_services/meshagent/meshagent/meshagent</string>
+        <string>-kvmagent</string>
+    </array>
+
+    <!--
+        Always restart unless we exited cleanly. ThrottleInterval keeps
+        us from hammering on a persistent failure (e.g., replayd genuinely
+        unreachable).
+    -->
+    <key>RunAtLoad</key>
+    <true/>
+    <key>KeepAlive</key>
+    <dict>
+        <key>SuccessfulExit</key>
+        <false/>
+    </dict>
+    <key>ThrottleInterval</key>
+    <integer>30</integer>
+
+    <key>StandardOutPath</key>
+    <string>/tmp/meshagent-kvm.stdout.log</string>
+    <key>StandardErrorPath</key>
+    <string>/tmp/meshagent-kvm.stderr.log</string>
+</dict>
+</plist>

makefile

@@ -9,21 +9,27 @@
 #
 # To build MeshAgent2 on Linux you first got to download the dev libraries to compile the agent, we need x11, txt, ext and jpeg. To install, do this:
 #	Using APT:
-#		sudo apt-get install libx11-dev libxtst-dev libxext-dev libjpeg62-dev
+#		sudo apt-get install libx11-dev libxtst-dev libxext-dev libjpeg62-dev libxrandr-dev
 #
 #	Using YUM:
-#		sudo yum install libX11-devel libXtst-devel libXext-devel libjpeg-devel
+#		sudo yum install libX11-devel libXtst-devel libXext-devel libjpeg-devel libXrandr-devel
 #
 #	NOTE: If you install headers for jpeg8, you need to put the compiled .a in the v80 folder, and specify JPEGVER=v80 when building MeshAgent
 #		eg: make linux ARCHID=6 JPEGVER=v80
 #
 #
 # To build for 32 bit on 64 bit linux 
-#  sudo apt-get install linux-libc-dev:i386 libc6-dev-i386 libjpeg62-dev:i386
+#  sudo apt-get install linux-libc-dev:i386 libc6-dev-i386 libjpeg62-dev:i386 libxrandr-dev:i386
 #
 # To install ARM Cross Compiler for Raspberry PI
 #  sudo apt-get install libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi libncurses5-dev gcc-arm-linux-gnueabihf
 #
+# To build universal binaries for macOS, you need to install the Xcode command line tools,
+# and then use the following commands to build x86_64 and arm64 binaries, then combine them into a universal binary with lipo:
+#   make macos ARCHID=16   																		# macOS x86 64 bit
+#   make macos ARCHID=29																		# macOS ARM 64 bit
+#   lipo -create -output meshagent_osx-universal-64 meshagent_osx-x86-64 meshagent_osx-arm-64	# Combine the two binaries into a universal binary
+# 
 # Special builds:
 #
 #   make linux ARCHID=6 WEBLOG=1 KVM=0      # Linux x86 64 bit, with Web Logging, and KVM disabled

meshconsole/MeshConsole-2022.vcxproj

@@ -195,7 +195,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E377F156-BAED-4086-B534-3CC43164607A}</ProjectGuid>
     <RootNamespace>MicrostackDuktape</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>MeshConsole-2022</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

meshconsole/main.c

@@ -39,6 +39,12 @@ MeshAgentHostContainer *agentHost = NULL;
 char __agentExecPath[1024] = { 0 };
 #endif
 
+#if defined(__APPLE__)
+#include <bsm/audit.h>
+#include <bsm/audit_session.h>
+#include <unistd.h>
+#endif
+
 
 #ifdef WIN32
 BOOL CtrlHandler(DWORD fdwCtrlType)
@@ -277,6 +283,18 @@ char* crashMemory = ILib_POSIX_InstallCrashHandler(argv[0]);
 #if defined(_LINKVM) && defined(__APPLE__)
 	if (argc > 1 && strcasecmp(argv[1], "-kvm0") == 0)
 	{
+		// Tahoe audit-session join: pre-exec in SpawnProcessEx4 (as
+		// root) is what discovers and joins the user's gui session;
+		// post-exec call here as uid 501 inherits enough visibility
+		// from that to re-join cleanly and ensures the helper's
+		// kernel-tracked asid lands on the user's gui session before
+		// kvm_server_mainloop opens its XPC connection to
+		// com.apple.replayd. Both calls together are needed: the
+		// pre-exec join doesn't survive exec on its own, and
+		// post-exec alone is denied (uid 501 can't audit_session_port
+		// arbitrary asids on Tahoe).
+		extern int ILibProcessPipe_JoinUserAuditSession_OSX_PostExec(uid_t uid);
+		ILibProcessPipe_JoinUserAuditSession_OSX_PostExec(getuid());
 		kvm_server_mainloop(NULL);
 		return 0;
 	}
@@ -285,6 +303,33 @@ char* crashMemory = ILib_POSIX_InstallCrashHandler(argv[0]);
 		kvm_server_mainloop((void*)(uint64_t)getpid());
 		return 0;
 	}
+	else if (argc > 1 && strcasecmp(argv[1], "-kvmagent") == 0)
+	{
+		// User-context LaunchAgent mode: long-running KVM server that
+		// listens on a Unix domain socket in the console user's session.
+		// Loaded by launchd into gui/<uid> via a LaunchAgent plist; runs
+		// natively in the user's GUI audit session, so com.apple.replayd
+		// (which only registers in gui/<uid>) is reachable without the
+		// audit_session_join workaround the daemon-spawn path needs.
+		// Daemon connects to this socket when MeshCentral's Desktop tab
+		// opens, instead of fork+exec'ing a -kvm0 helper.
+		// Optional argv[2] = socket path; defaults to a tmp-dir path
+		// keyed by uid so the agent can bind it as a non-root user.
+		extern void kvm_set_listener_path(const char *path);
+		char defaultPath[128];
+		if (argc > 2 && argv[2] != NULL && argv[2][0] != '\0')
+		{
+			kvm_set_listener_path(argv[2]);
+		}
+		else
+		{
+			snprintf(defaultPath, sizeof(defaultPath),
+				"/tmp/meshagent-kvm-%u.sock", (unsigned)getuid());
+			kvm_set_listener_path(defaultPath);
+		}
+		kvm_server_mainloop((void*)(uint64_t)getpid());
+		return 0;
+	}
 #endif
 
 	if (argc > 2 && strcasecmp(argv[1], "-faddr") == 0)