mstro-app 0.4.16 → 0.4.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/server/services/platform.d.ts.map +1 -1
- package/dist/server/services/platform.js +2 -1
- package/dist/server/services/platform.js.map +1 -1
- package/dist/server/services/terminal/pty-manager.d.ts.map +1 -1
- package/dist/server/services/terminal/pty-manager.js +21 -2
- package/dist/server/services/terminal/pty-manager.js.map +1 -1
- package/dist/server/services/terminal/pty-utils.d.ts +11 -0
- package/dist/server/services/terminal/pty-utils.d.ts.map +1 -1
- package/dist/server/services/terminal/pty-utils.js +72 -0
- package/dist/server/services/terminal/pty-utils.js.map +1 -1
- package/dist/server/services/websocket/terminal-handlers.d.ts.map +1 -1
- package/dist/server/services/websocket/terminal-handlers.js +18 -5
- package/dist/server/services/websocket/terminal-handlers.js.map +1 -1
- package/package.json +1 -1
- package/server/services/platform.ts +2 -1
- package/server/services/terminal/pty-manager.ts +23 -1
- package/server/services/terminal/pty-utils.ts +78 -0
- package/server/services/websocket/terminal-handlers.ts +18 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../../../server/services/platform.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../../../server/services/platform.ts"],"names":[],"mappings":"AAyBA;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAM7C;AAcD,UAAU,mBAAmB;IAC3B,WAAW,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5C,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;IAC3B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;IAC3B,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAA;IAC9B,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CAC9C;AAKD,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,EAAE,CAAyB;IACnC,OAAO,CAAC,gBAAgB,CAA6C;IACrE,OAAO,CAAC,iBAAiB,CAAI;IAC7B,OAAO,CAAC,oBAAoB,CAAK;IACjC,OAAO,CAAC,qBAAqB,CAAQ;IACrC,OAAO,CAAC,gBAAgB,CAAQ;IAChC,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,oBAAoB,CAA8C;IAC1E,OAAO,CAAC,iBAAiB,CAA8C;IACvE,OAAO,CAAC,WAAW,CAAI;IACvB,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;gBAGhC,gBAAgB,EAAE,MAAM,EACxB,SAAS,GAAE,mBAAwB,EACnC,WAAW,CAAC,EAAE,MAAM;YAQR,iBAAiB;IA2B/B,OAAO,CAAC,sBAAsB;IAM9B,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,aAAa;IAkBrB,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,qBAAqB;IAO7B,OAAO,IAAI,IAAI;IAqGf,OAAO,CAAC,aAAa;IA0BrB,OAAO,CAAC,iBAAiB;IAiBzB,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAM5B,qBAAqB,IAAI,OAAO;IAIhC,UAAU,IAAI,IAAI;CAkBnB"}
|
|
@@ -14,6 +14,7 @@ import { AnalyticsEvents, trackEvent } from './analytics.js';
|
|
|
14
14
|
import { getClientId } from './client-id.js';
|
|
15
15
|
import { CLI_VERSION, getCredentials, shouldRefreshToken, updateCredentials, } from './platform-credentials.js';
|
|
16
16
|
import { captureException } from './sentry.js';
|
|
17
|
+
import { isBwrapAvailable } from './terminal/pty-utils.js';
|
|
17
18
|
/**
|
|
18
19
|
* Get machine identification string
|
|
19
20
|
* Example: "Jessica @ node-v22.21.1 linux (arm64)"
|
|
@@ -155,7 +156,7 @@ export class PlatformConnection {
|
|
|
155
156
|
osType,
|
|
156
157
|
cpuArch,
|
|
157
158
|
cliVersion: CLI_VERSION,
|
|
158
|
-
capabilities: JSON.stringify({}),
|
|
159
|
+
capabilities: JSON.stringify({ terminalSandbox: isBwrapAvailable() }),
|
|
159
160
|
startedAt: this.startedAt,
|
|
160
161
|
});
|
|
161
162
|
const wsUrl = `${this.platformUrl.replace(/^http/, 'ws')}/ws/client?${params}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../../../server/services/platform.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAC9D,gEAAgE;AAEhE;;;;;;;GAOG;AAEH,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EACL,WAAW,EACX,cAAc,EACd,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../../../server/services/platform.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty-manager.d.ts","sourceRoot":"","sources":["../../../../server/services/terminal/pty-manager.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"pty-manager.d.ts","sourceRoot":"","sources":["../../../../server/services/terminal/pty-manager.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAajD,YAAY,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,UAAW,SAAQ,YAAY;IAC1C,OAAO,CAAC,SAAS,CAAsC;;IAOvD,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAInC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAMrG,cAAc,IAAI,OAAO;IAIzB,yBAAyB,IAAI,MAAM;IAInC,MAAM,CACJ,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,GAAE,MAAW,EACjB,IAAI,GAAE,MAAW,EACjB,cAAc,CAAC,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,GAChC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE;IAuEzE,OAAO,CAAC,oBAAoB;IAyC5B,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAgBhD,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAe/D,KAAK,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAsBlC,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAMhD,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAItD,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAIhC,kBAAkB,IAAI,MAAM,EAAE;IAI9B,QAAQ,IAAI,IAAI;CAKjB;AAKD,wBAAgB,aAAa,IAAI,UAAU,CAK1C"}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
import { EventEmitter } from 'node:events';
|
|
10
10
|
import { homedir, platform } from 'node:os';
|
|
11
11
|
import { sanitizeEnvForSandbox } from '../sandbox-utils.js';
|
|
12
|
-
import { detectShell, getPty, getPtyInstallInstructions, getShellName, isPtyAvailable, SCROLLBACK_MAX_BYTES, ScrollbackBuffer, } from './pty-utils.js';
|
|
12
|
+
import { buildBwrapArgs, detectShell, getPty, getPtyInstallInstructions, getShellName, isBwrapAvailable, isPtyAvailable, SCROLLBACK_MAX_BYTES, ScrollbackBuffer, } from './pty-utils.js';
|
|
13
13
|
// Re-export public API for backward compatibility
|
|
14
14
|
export { isPtyAvailable, reloadPty } from './pty-utils.js';
|
|
15
15
|
export class PTYManager extends EventEmitter {
|
|
@@ -53,7 +53,26 @@ export class PTYManager extends EventEmitter {
|
|
|
53
53
|
? sanitizeEnvForSandbox(process.env, cwd)
|
|
54
54
|
: { ...process.env, HOME: homedir() };
|
|
55
55
|
const env = { ...baseEnv, TERM: 'xterm-256color', COLORTERM: 'truecolor' };
|
|
56
|
-
|
|
56
|
+
// Sandboxed terminals use bubblewrap (bwrap) for filesystem isolation.
|
|
57
|
+
// The shell is spawned inside a namespace that only sees the project directory (rw)
|
|
58
|
+
// and system directories (ro). Without bwrap, sandboxed terminals are not available.
|
|
59
|
+
let spawnCommand;
|
|
60
|
+
let spawnArgs;
|
|
61
|
+
let spawnCwd;
|
|
62
|
+
if (options?.sandboxed) {
|
|
63
|
+
if (!isBwrapAvailable()) {
|
|
64
|
+
throw new Error('SANDBOX_UNAVAILABLE:Terminal sandbox (bubblewrap) is not installed on this machine. Shared terminal sessions require bubblewrap for filesystem isolation.');
|
|
65
|
+
}
|
|
66
|
+
spawnCommand = '/usr/bin/bwrap';
|
|
67
|
+
spawnArgs = buildBwrapArgs(cwd, shell);
|
|
68
|
+
spawnCwd = '/'; // bwrap manages cwd internally via --chdir
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
spawnCommand = shell;
|
|
72
|
+
spawnArgs = [];
|
|
73
|
+
spawnCwd = cwd;
|
|
74
|
+
}
|
|
75
|
+
const ptyProcess = pty.spawn(spawnCommand, spawnArgs, { name: 'xterm-256color', cols, rows, cwd: spawnCwd, env });
|
|
57
76
|
const session = {
|
|
58
77
|
id: terminalId,
|
|
59
78
|
pty: ptyProcess,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty-manager.js","sourceRoot":"","sources":["../../../../server/services/terminal/pty-manager.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAC9D,gEAAgE;AAEhE;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EACL,WAAW,EACX,MAAM,EACN,yBAAyB,EACzB,YAAY,EACZ,cAAc,EACd,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AAGxB,kDAAkD;AAClD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3D,MAAM,OAAO,UAAW,SAAQ,YAAY;IAClC,SAAS,GAA4B,IAAI,GAAG,EAAE,CAAC;IAEvD;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,UAAkB;QACvB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAED,cAAc,CAAC,UAAkB;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC1B,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IAC5F,CAAC;IAED,cAAc;QACZ,OAAO,cAAc,EAAE,CAAC;IAC1B,CAAC;IAED,yBAAyB;QACvB,OAAO,yBAAyB,EAAE,CAAC;IACrC,CAAC;IAED,MAAM,CACJ,UAAkB,EAClB,UAAkB,EAClB,OAAe,EAAE,EACjB,OAAe,EAAE,EACjB,cAAuB,EACvB,OAAiC;QAEjC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;QACrB,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,KAAK,CAAC,qBAAqB,yBAAyB,EAAE,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,gCAAgC;QAChC,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACnC,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC;YACxD,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACvC,eAAe,CAAC,IAAI,GAAG,IAAI,CAAC;YAC5B,eAAe,CAAC,IAAI,GAAG,IAAI,CAAC;YAC5B,OAAO,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC;QAC7G,CAAC;QAED,MAAM,KAAK,GAAG,cAAc,IAAI,WAAW,EAAE,CAAC;QAC9C,MAAM,GAAG,GAAG,UAAU,IAAI,OAAO,EAAE,CAAC;QAEpC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,OAAO,EAAE,SAAS;gBAChC,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC;gBACzC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC;YACxC,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;YAE3E,MAAM,
|
|
1
|
+
{"version":3,"file":"pty-manager.js","sourceRoot":"","sources":["../../../../server/services/terminal/pty-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,17 @@ export declare function detectShell(): string;
|
|
|
25
25
|
* Get shell name from path
|
|
26
26
|
*/
|
|
27
27
|
export declare function getShellName(shellPath: string): string;
|
|
28
|
+
/**
|
|
29
|
+
* Check if bubblewrap (bwrap) is available for filesystem sandboxing.
|
|
30
|
+
* Required for sandboxed terminal sessions (shared "can control" users).
|
|
31
|
+
* Caches the result after first check.
|
|
32
|
+
*/
|
|
33
|
+
export declare function isBwrapAvailable(): boolean;
|
|
34
|
+
/**
|
|
35
|
+
* Build bwrap arguments to sandbox a shell to a specific directory.
|
|
36
|
+
* Provides read-only access to system directories, read-write to the project dir only.
|
|
37
|
+
*/
|
|
38
|
+
export declare function buildBwrapArgs(cwd: string, shell: string): string[];
|
|
28
39
|
export declare const SCROLLBACK_MAX_BYTES: number;
|
|
29
40
|
/**
|
|
30
41
|
* Fixed-size buffer that retains the most recent PTY output for replay on reconnect.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty-utils.d.ts","sourceRoot":"","sources":["../../../../server/services/terminal/pty-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pty-utils.d.ts","sourceRoot":"","sources":["../../../../server/services/terminal/pty-utils.ts"],"names":[],"mappings":"AA6BA,wBAAgB,MAAM,IAAI,cAAc,UAAU,CAAC,GAAG,IAAI,CAEzD;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,OAAO,CAExC;AAED;;;;;;;;GAQG;AACH,wBAAsB,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAclD;AAED;;GAEG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,CA2BlD;AAID;;GAEG;AACH,wBAAgB,WAAW,IAAI,MAAM,CAOpC;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAGtD;AAMD;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAgB1C;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CA2CnE;AAID,eAAO,MAAM,oBAAoB,QAAa,CAAC;AAE/C;;;GAGG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,QAAQ,CAAS;gBAEb,QAAQ,EAAE,MAAM;IAI5B,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAc1B,WAAW,IAAI,MAAM;IAIrB,KAAK,IAAI,IAAI;CAId;AAKD,KAAK,IAAI,GAAG,OAAO,UAAU,EAAE,IAAI,CAAC;AAEpC,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,IAAI,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,IAAI,CAAC;IACnD,UAAU,EAAE,gBAAgB,CAAC;CAC9B"}
|
|
@@ -6,6 +6,8 @@
|
|
|
6
6
|
* Separated from pty-manager.ts so the PTYManager class stays focused
|
|
7
7
|
* on session lifecycle orchestration.
|
|
8
8
|
*/
|
|
9
|
+
import { execSync } from 'node:child_process';
|
|
10
|
+
import { accessSync, constants as fsConstants, lstatSync } from 'node:fs';
|
|
9
11
|
import { createRequire } from 'node:module';
|
|
10
12
|
import { platform } from 'node:os';
|
|
11
13
|
// ── node-pty loading ──────────────────────────────────────────
|
|
@@ -104,6 +106,76 @@ export function getShellName(shellPath) {
|
|
|
104
106
|
const parts = shellPath.split(/[/\\]/);
|
|
105
107
|
return parts[parts.length - 1] || 'shell';
|
|
106
108
|
}
|
|
109
|
+
// ── Bubblewrap (bwrap) sandbox detection ─────────────────────
|
|
110
|
+
let _bwrapAvailable = null;
|
|
111
|
+
/**
|
|
112
|
+
* Check if bubblewrap (bwrap) is available for filesystem sandboxing.
|
|
113
|
+
* Required for sandboxed terminal sessions (shared "can control" users).
|
|
114
|
+
* Caches the result after first check.
|
|
115
|
+
*/
|
|
116
|
+
export function isBwrapAvailable() {
|
|
117
|
+
if (_bwrapAvailable !== null)
|
|
118
|
+
return _bwrapAvailable;
|
|
119
|
+
if (platform() !== 'linux') {
|
|
120
|
+
_bwrapAvailable = false;
|
|
121
|
+
return false;
|
|
122
|
+
}
|
|
123
|
+
try {
|
|
124
|
+
accessSync('/usr/bin/bwrap', fsConstants.X_OK);
|
|
125
|
+
execSync('bwrap --ro-bind / / -- /bin/true', { timeout: 5000, stdio: 'ignore' });
|
|
126
|
+
_bwrapAvailable = true;
|
|
127
|
+
}
|
|
128
|
+
catch {
|
|
129
|
+
_bwrapAvailable = false;
|
|
130
|
+
}
|
|
131
|
+
return _bwrapAvailable;
|
|
132
|
+
}
|
|
133
|
+
/**
|
|
134
|
+
* Build bwrap arguments to sandbox a shell to a specific directory.
|
|
135
|
+
* Provides read-only access to system directories, read-write to the project dir only.
|
|
136
|
+
*/
|
|
137
|
+
export function buildBwrapArgs(cwd, shell) {
|
|
138
|
+
const mergedUsr = (() => {
|
|
139
|
+
try {
|
|
140
|
+
return lstatSync('/bin').isSymbolicLink();
|
|
141
|
+
}
|
|
142
|
+
catch {
|
|
143
|
+
return false;
|
|
144
|
+
}
|
|
145
|
+
})();
|
|
146
|
+
const args = [
|
|
147
|
+
'--ro-bind', '/usr', '/usr',
|
|
148
|
+
'--ro-bind', '/etc', '/etc',
|
|
149
|
+
// Hide sensitive /etc files by binding /dev/null over them
|
|
150
|
+
'--ro-bind', '/dev/null', '/etc/shadow',
|
|
151
|
+
'--ro-bind', '/dev/null', '/etc/gshadow',
|
|
152
|
+
];
|
|
153
|
+
if (mergedUsr) {
|
|
154
|
+
// Merged-usr distros (Fedora, Ubuntu 20.04+, Arch, Debian 12+)
|
|
155
|
+
args.push('--symlink', 'usr/bin', '/bin');
|
|
156
|
+
args.push('--symlink', 'usr/sbin', '/sbin');
|
|
157
|
+
args.push('--symlink', 'usr/lib', '/lib');
|
|
158
|
+
try {
|
|
159
|
+
lstatSync('/lib64');
|
|
160
|
+
args.push('--symlink', 'usr/lib64', '/lib64');
|
|
161
|
+
}
|
|
162
|
+
catch { /* skip */ }
|
|
163
|
+
}
|
|
164
|
+
else {
|
|
165
|
+
args.push('--ro-bind', '/bin', '/bin');
|
|
166
|
+
args.push('--ro-bind', '/sbin', '/sbin');
|
|
167
|
+
args.push('--ro-bind', '/lib', '/lib');
|
|
168
|
+
try {
|
|
169
|
+
lstatSync('/lib64');
|
|
170
|
+
args.push('--ro-bind', '/lib64', '/lib64');
|
|
171
|
+
}
|
|
172
|
+
catch { /* skip */ }
|
|
173
|
+
}
|
|
174
|
+
args.push('--proc', '/proc', '--dev', '/dev', '--tmpfs', '/tmp', '--tmpfs', '/run',
|
|
175
|
+
// Read-write access to the project directory only
|
|
176
|
+
'--bind', cwd, cwd, '--unshare-pid', '--unshare-ipc', '--die-with-parent', '--chdir', cwd, '--', shell);
|
|
177
|
+
return args;
|
|
178
|
+
}
|
|
107
179
|
// ── Scrollback buffer ─────────────────────────────────────────
|
|
108
180
|
export const SCROLLBACK_MAX_BYTES = 256 * 1024; // 256KB
|
|
109
181
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty-utils.js","sourceRoot":"","sources":["../../../../server/services/terminal/pty-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pty-utils.js","sourceRoot":"","sources":["../../../../server/services/terminal/pty-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-handlers.d.ts","sourceRoot":"","sources":["../../../../server/services/websocket/terminal-handlers.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE9D,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,cAAc,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,CAsBzK;
|
|
1
|
+
{"version":3,"file":"terminal-handlers.d.ts","sourceRoot":"","sources":["../../../../server/services/websocket/terminal-handlers.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE9D,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,cAAc,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,CAsBzK;AA2QD;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,cAAc,EAAE,EAAE,EAAE,SAAS,GAAG,IAAI,CAmBnF"}
|
|
@@ -67,12 +67,25 @@ function handleTerminalInit(ctx, ws, terminalId, workingDir, requestedShell, col
|
|
|
67
67
|
});
|
|
68
68
|
}
|
|
69
69
|
catch (error) {
|
|
70
|
+
const errorMsg = error instanceof Error ? error.message : String(error);
|
|
70
71
|
console.error(`[WebSocketImproviseHandler] Failed to create terminal:`, error);
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
72
|
+
if (errorMsg.startsWith('SANDBOX_UNAVAILABLE:')) {
|
|
73
|
+
ctx.send(ws, {
|
|
74
|
+
type: 'terminalError',
|
|
75
|
+
terminalId,
|
|
76
|
+
data: {
|
|
77
|
+
error: 'SANDBOX_UNAVAILABLE',
|
|
78
|
+
message: 'Terminal requires bubblewrap (bwrap) to be installed on the host machine for shared app sessions. Ask the app owner to install it.',
|
|
79
|
+
}
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
ctx.send(ws, {
|
|
84
|
+
type: 'terminalError',
|
|
85
|
+
terminalId,
|
|
86
|
+
data: { error: errorMsg || 'Failed to create terminal' }
|
|
87
|
+
});
|
|
88
|
+
}
|
|
76
89
|
removeTerminalSubscriber(ctx, terminalId, ws);
|
|
77
90
|
}
|
|
78
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-handlers.js","sourceRoot":"","sources":["../../../../server/services/websocket/terminal-handlers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"terminal-handlers.js","sourceRoot":"","sources":["../../../../server/services/websocket/terminal-handlers.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -21,6 +21,7 @@ import {
|
|
|
21
21
|
updateCredentials,
|
|
22
22
|
} from './platform-credentials.js'
|
|
23
23
|
import { captureException } from './sentry.js'
|
|
24
|
+
import { isBwrapAvailable } from './terminal/pty-utils.js'
|
|
24
25
|
|
|
25
26
|
/**
|
|
26
27
|
* Get machine identification string
|
|
@@ -185,7 +186,7 @@ export class PlatformConnection {
|
|
|
185
186
|
osType,
|
|
186
187
|
cpuArch,
|
|
187
188
|
cliVersion: CLI_VERSION,
|
|
188
|
-
capabilities: JSON.stringify({}),
|
|
189
|
+
capabilities: JSON.stringify({ terminalSandbox: isBwrapAvailable() }),
|
|
189
190
|
startedAt: this.startedAt,
|
|
190
191
|
})
|
|
191
192
|
|
|
@@ -13,10 +13,12 @@ import { homedir, platform } from 'node:os';
|
|
|
13
13
|
import { sanitizeEnvForSandbox } from '../sandbox-utils.js';
|
|
14
14
|
import type { PTYSession } from './pty-utils.js';
|
|
15
15
|
import {
|
|
16
|
+
buildBwrapArgs,
|
|
16
17
|
detectShell,
|
|
17
18
|
getPty,
|
|
18
19
|
getPtyInstallInstructions,
|
|
19
20
|
getShellName,
|
|
21
|
+
isBwrapAvailable,
|
|
20
22
|
isPtyAvailable,
|
|
21
23
|
SCROLLBACK_MAX_BYTES,
|
|
22
24
|
ScrollbackBuffer,
|
|
@@ -83,7 +85,27 @@ export class PTYManager extends EventEmitter {
|
|
|
83
85
|
: { ...process.env, HOME: homedir() };
|
|
84
86
|
const env = { ...baseEnv, TERM: 'xterm-256color', COLORTERM: 'truecolor' };
|
|
85
87
|
|
|
86
|
-
|
|
88
|
+
// Sandboxed terminals use bubblewrap (bwrap) for filesystem isolation.
|
|
89
|
+
// The shell is spawned inside a namespace that only sees the project directory (rw)
|
|
90
|
+
// and system directories (ro). Without bwrap, sandboxed terminals are not available.
|
|
91
|
+
let spawnCommand: string;
|
|
92
|
+
let spawnArgs: string[];
|
|
93
|
+
let spawnCwd: string;
|
|
94
|
+
|
|
95
|
+
if (options?.sandboxed) {
|
|
96
|
+
if (!isBwrapAvailable()) {
|
|
97
|
+
throw new Error('SANDBOX_UNAVAILABLE:Terminal sandbox (bubblewrap) is not installed on this machine. Shared terminal sessions require bubblewrap for filesystem isolation.');
|
|
98
|
+
}
|
|
99
|
+
spawnCommand = '/usr/bin/bwrap';
|
|
100
|
+
spawnArgs = buildBwrapArgs(cwd, shell);
|
|
101
|
+
spawnCwd = '/'; // bwrap manages cwd internally via --chdir
|
|
102
|
+
} else {
|
|
103
|
+
spawnCommand = shell;
|
|
104
|
+
spawnArgs = [];
|
|
105
|
+
spawnCwd = cwd;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
const ptyProcess = pty.spawn(spawnCommand, spawnArgs, { name: 'xterm-256color', cols, rows, cwd: spawnCwd, env });
|
|
87
109
|
|
|
88
110
|
const session: PTYSession = {
|
|
89
111
|
id: terminalId,
|
|
@@ -8,6 +8,8 @@
|
|
|
8
8
|
* on session lifecycle orchestration.
|
|
9
9
|
*/
|
|
10
10
|
|
|
11
|
+
import { execSync } from 'node:child_process';
|
|
12
|
+
import { accessSync, constants as fsConstants, lstatSync } from 'node:fs';
|
|
11
13
|
import { createRequire } from 'node:module';
|
|
12
14
|
import { platform } from 'node:os';
|
|
13
15
|
|
|
@@ -115,6 +117,82 @@ export function getShellName(shellPath: string): string {
|
|
|
115
117
|
return parts[parts.length - 1] || 'shell';
|
|
116
118
|
}
|
|
117
119
|
|
|
120
|
+
// ── Bubblewrap (bwrap) sandbox detection ─────────────────────
|
|
121
|
+
|
|
122
|
+
let _bwrapAvailable: boolean | null = null;
|
|
123
|
+
|
|
124
|
+
/**
|
|
125
|
+
* Check if bubblewrap (bwrap) is available for filesystem sandboxing.
|
|
126
|
+
* Required for sandboxed terminal sessions (shared "can control" users).
|
|
127
|
+
* Caches the result after first check.
|
|
128
|
+
*/
|
|
129
|
+
export function isBwrapAvailable(): boolean {
|
|
130
|
+
if (_bwrapAvailable !== null) return _bwrapAvailable;
|
|
131
|
+
|
|
132
|
+
if (platform() !== 'linux') {
|
|
133
|
+
_bwrapAvailable = false;
|
|
134
|
+
return false;
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
try {
|
|
138
|
+
accessSync('/usr/bin/bwrap', fsConstants.X_OK);
|
|
139
|
+
execSync('bwrap --ro-bind / / -- /bin/true', { timeout: 5000, stdio: 'ignore' });
|
|
140
|
+
_bwrapAvailable = true;
|
|
141
|
+
} catch {
|
|
142
|
+
_bwrapAvailable = false;
|
|
143
|
+
}
|
|
144
|
+
return _bwrapAvailable;
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
/**
|
|
148
|
+
* Build bwrap arguments to sandbox a shell to a specific directory.
|
|
149
|
+
* Provides read-only access to system directories, read-write to the project dir only.
|
|
150
|
+
*/
|
|
151
|
+
export function buildBwrapArgs(cwd: string, shell: string): string[] {
|
|
152
|
+
const mergedUsr = (() => {
|
|
153
|
+
try { return lstatSync('/bin').isSymbolicLink(); }
|
|
154
|
+
catch { return false; }
|
|
155
|
+
})();
|
|
156
|
+
|
|
157
|
+
const args: string[] = [
|
|
158
|
+
'--ro-bind', '/usr', '/usr',
|
|
159
|
+
'--ro-bind', '/etc', '/etc',
|
|
160
|
+
// Hide sensitive /etc files by binding /dev/null over them
|
|
161
|
+
'--ro-bind', '/dev/null', '/etc/shadow',
|
|
162
|
+
'--ro-bind', '/dev/null', '/etc/gshadow',
|
|
163
|
+
];
|
|
164
|
+
|
|
165
|
+
if (mergedUsr) {
|
|
166
|
+
// Merged-usr distros (Fedora, Ubuntu 20.04+, Arch, Debian 12+)
|
|
167
|
+
args.push('--symlink', 'usr/bin', '/bin');
|
|
168
|
+
args.push('--symlink', 'usr/sbin', '/sbin');
|
|
169
|
+
args.push('--symlink', 'usr/lib', '/lib');
|
|
170
|
+
try { lstatSync('/lib64'); args.push('--symlink', 'usr/lib64', '/lib64'); } catch { /* skip */ }
|
|
171
|
+
} else {
|
|
172
|
+
args.push('--ro-bind', '/bin', '/bin');
|
|
173
|
+
args.push('--ro-bind', '/sbin', '/sbin');
|
|
174
|
+
args.push('--ro-bind', '/lib', '/lib');
|
|
175
|
+
try { lstatSync('/lib64'); args.push('--ro-bind', '/lib64', '/lib64'); } catch { /* skip */ }
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
args.push(
|
|
179
|
+
'--proc', '/proc',
|
|
180
|
+
'--dev', '/dev',
|
|
181
|
+
'--tmpfs', '/tmp',
|
|
182
|
+
'--tmpfs', '/run',
|
|
183
|
+
// Read-write access to the project directory only
|
|
184
|
+
'--bind', cwd, cwd,
|
|
185
|
+
'--unshare-pid',
|
|
186
|
+
'--unshare-ipc',
|
|
187
|
+
'--die-with-parent',
|
|
188
|
+
'--chdir', cwd,
|
|
189
|
+
'--',
|
|
190
|
+
shell,
|
|
191
|
+
);
|
|
192
|
+
|
|
193
|
+
return args;
|
|
194
|
+
}
|
|
195
|
+
|
|
118
196
|
// ── Scrollback buffer ─────────────────────────────────────────
|
|
119
197
|
|
|
120
198
|
export const SCROLLBACK_MAX_BYTES = 256 * 1024; // 256KB
|
|
@@ -94,12 +94,25 @@ function handleTerminalInit(
|
|
|
94
94
|
is_reconnect: isReconnect,
|
|
95
95
|
});
|
|
96
96
|
} catch (error: unknown) {
|
|
97
|
+
const errorMsg = error instanceof Error ? error.message : String(error);
|
|
97
98
|
console.error(`[WebSocketImproviseHandler] Failed to create terminal:`, error);
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
99
|
+
|
|
100
|
+
if (errorMsg.startsWith('SANDBOX_UNAVAILABLE:')) {
|
|
101
|
+
ctx.send(ws, {
|
|
102
|
+
type: 'terminalError',
|
|
103
|
+
terminalId,
|
|
104
|
+
data: {
|
|
105
|
+
error: 'SANDBOX_UNAVAILABLE',
|
|
106
|
+
message: 'Terminal requires bubblewrap (bwrap) to be installed on the host machine for shared app sessions. Ask the app owner to install it.',
|
|
107
|
+
}
|
|
108
|
+
});
|
|
109
|
+
} else {
|
|
110
|
+
ctx.send(ws, {
|
|
111
|
+
type: 'terminalError',
|
|
112
|
+
terminalId,
|
|
113
|
+
data: { error: errorMsg || 'Failed to create terminal' }
|
|
114
|
+
});
|
|
115
|
+
}
|
|
103
116
|
removeTerminalSubscriber(ctx, terminalId, ws);
|
|
104
117
|
}
|
|
105
118
|
}
|