From 121049e898cff12b240b092f84ffb2d474be52f3 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Tue, 22 Sep 2026 23:49:56 +0000
Subject: [PATCH] Check terminal request pids

---
 .../beacon/api/TerminalLaunchExchange.java    |  3 +++
 .../beacon/api/TerminalPrepareExchange.java   |  5 ++++-
 .../app/terminal/TerminalLauncherManager.java | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/xpipe/app/beacon/api/TerminalLaunchExchange.java b/app/src/main/java/io/xpipe/app/beacon/api/TerminalLaunchExchange.java
index 226366623..005704f8f 100644
--- a/app/src/main/java/io/xpipe/app/beacon/api/TerminalLaunchExchange.java
+++ b/app/src/main/java/io/xpipe/app/beacon/api/TerminalLaunchExchange.java
@@ -23,6 +23,7 @@ public class TerminalLaunchExchange extends BeaconInterface<TerminalLaunchExchan
 
     @Override
     public Object handle(HttpExchange exchange, Request msg) throws BeaconClientException, BeaconServerException {
+        TerminalLauncherManager.verifyPid(msg.getRequest(), msg.getPid());
         var r = TerminalLauncherManager.launchExchange(msg.getRequest());
         return Response.builder().targetFile(r).build();
     }
@@ -38,6 +39,8 @@ public class TerminalLaunchExchange extends BeaconInterface<TerminalLaunchExchan
     public static class Request {
         @NonNull
         UUID request;
+
+        long pid;
     }
 
     @Jacksonized
diff --git a/app/src/main/java/io/xpipe/app/beacon/api/TerminalPrepareExchange.java b/app/src/main/java/io/xpipe/app/beacon/api/TerminalPrepareExchange.java
index 79ebb4e3d..1c3ab4902 100644
--- a/app/src/main/java/io/xpipe/app/beacon/api/TerminalPrepareExchange.java
+++ b/app/src/main/java/io/xpipe/app/beacon/api/TerminalPrepareExchange.java
@@ -1,9 +1,11 @@
 package io.xpipe.app.beacon.api;
 
+import io.xpipe.app.beacon.BeaconClientException;
 import io.xpipe.app.beacon.BeaconInterface;
 import io.xpipe.app.prefs.AppPrefs;
 
 import com.sun.net.httpserver.HttpExchange;
+import io.xpipe.app.terminal.TerminalLauncherManager;
 import lombok.Builder;
 import lombok.NonNull;
 import lombok.Value;
@@ -19,7 +21,8 @@ public class TerminalPrepareExchange extends BeaconInterface<TerminalPrepareExch
     }
 
     @Override
-    public Object handle(HttpExchange exchange, Request msg) {
+    public Object handle(HttpExchange exchange, Request msg) throws BeaconClientException {
+        TerminalLauncherManager.verifyPid(msg.getRequest(), msg.getPid());
         var term = AppPrefs.get().terminalType().getValue();
         var unicode = term.supportsUnicode();
         var escapes = term.supportsEscapes();
diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalLauncherManager.java b/app/src/main/java/io/xpipe/app/terminal/TerminalLauncherManager.java
index a287c2478..608f0f671 100644
--- a/app/src/main/java/io/xpipe/app/terminal/TerminalLauncherManager.java
+++ b/app/src/main/java/io/xpipe/app/terminal/TerminalLauncherManager.java
@@ -89,6 +89,25 @@ public class TerminalLauncherManager {
         req.setShellPid(shell.pid());
     }
 
+    public static void verifyPid(UUID request, long pid) throws BeaconClientException {
+        TerminalLaunchRequest req;
+        synchronized (entries) {
+            req = entries.get(request);
+        }
+
+        if (req.getShellPid() != -1) {
+            ProcessHandle current = ProcessHandle.of(pid).orElseThrow();
+            do {
+                if (current.pid() == req.getShellPid()) {
+                    return;
+                }
+
+                current = current.parent().orElse(null);
+            } while (current != null);
+        }
+        throw new BeaconClientException("Wrong launch context");
+    }
+
     public static void waitExchange(UUID request) throws BeaconServerException {
         TerminalLaunchRequest req;
         synchronized (entries) {