Write MCP broker config with privileged sandbox path
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
import { revokeSandboxMcpBrokerSession, rotateSandboxMcpBrokerSession } from "./mcpBrokerStore"
|
||||
import { uploadSandboxFile } from "./sandboxFiles"
|
||||
import { resolveSandboxName } from "./sandboxFiles"
|
||||
import { writeSandboxFilePrivileged } from "./sandboxPrivilegedFiles"
|
||||
|
||||
export const SANDBOX_MCP_MANIFEST_PATH = "/sandbox/openshell_control_mcp.md"
|
||||
|
||||
@@ -66,10 +67,10 @@ export async function syncSandboxMcpManifest(
|
||||
options: BrokerHandoffOptions,
|
||||
) {
|
||||
const handoff = await buildSandboxMcpBrokerHandoff(sandbox, options)
|
||||
const uploaded = await uploadSandboxFile(
|
||||
sandbox.id,
|
||||
const sandboxName = sandbox.name || await resolveSandboxName(sandbox.id)
|
||||
const uploaded = await writeSandboxFilePrivileged(
|
||||
sandboxName,
|
||||
SANDBOX_MCP_MANIFEST_PATH,
|
||||
"openshell_control_mcp.md",
|
||||
Buffer.from(handoff.markdown, "utf8"),
|
||||
)
|
||||
|
||||
@@ -103,10 +104,10 @@ export async function revokeSandboxMcpManifest(sandbox: SandboxRef) {
|
||||
"The previous broker token has been revoked. Ask the operator to enable an MCP server and issue a new broker config if MCP access is needed.",
|
||||
"",
|
||||
].join("\n")
|
||||
const uploaded = await uploadSandboxFile(
|
||||
sandbox.id,
|
||||
const sandboxName = sandbox.name || await resolveSandboxName(sandbox.id)
|
||||
const uploaded = await writeSandboxFilePrivileged(
|
||||
sandboxName,
|
||||
SANDBOX_MCP_MANIFEST_PATH,
|
||||
"openshell_control_mcp.md",
|
||||
Buffer.from(markdown, "utf8"),
|
||||
)
|
||||
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
import { spawn } from "node:child_process"
|
||||
import { HOST_PATH } from "./hostCommands"
|
||||
|
||||
const DOCKER_BIN = process.env.DOCKER_BIN || "docker"
|
||||
const OPENSHELL_CLUSTER_CONTAINER = process.env.OPENSHELL_CLUSTER_CONTAINER || "openshell-cluster-nemoclaw"
|
||||
const OPENSHELL_NAMESPACE = process.env.OPENSHELL_SANDBOX_NAMESPACE || "openshell"
|
||||
|
||||
function shellQuote(value: string) {
|
||||
return `'${value.replace(/'/g, `'\\''`)}'`
|
||||
}
|
||||
|
||||
function runDockerKubectl(args: string[], input?: Buffer | string) {
|
||||
return new Promise<{ stdout: string; stderr: string; code: number | null }>((resolve, reject) => {
|
||||
const child = spawn(DOCKER_BIN, ["exec", ...(input ? ["-i"] : []), OPENSHELL_CLUSTER_CONTAINER, "kubectl", ...args], {
|
||||
env: { ...process.env, PATH: HOST_PATH },
|
||||
stdio: ["pipe", "pipe", "pipe"],
|
||||
})
|
||||
let stdout = ""
|
||||
let stderr = ""
|
||||
child.stdout.on("data", (chunk) => { stdout += String(chunk) })
|
||||
child.stderr.on("data", (chunk) => { stderr += String(chunk) })
|
||||
child.on("error", reject)
|
||||
child.on("close", (code) => resolve({ stdout: stdout.trim(), stderr: stderr.trim(), code }))
|
||||
if (input) child.stdin.end(input)
|
||||
else child.stdin.end()
|
||||
})
|
||||
}
|
||||
|
||||
export async function writeSandboxFilePrivileged(
|
||||
sandboxName: string,
|
||||
targetPath: string,
|
||||
payload: Buffer,
|
||||
mode = "0644",
|
||||
) {
|
||||
const script = [
|
||||
`mkdir -p ${shellQuote(targetPath.split("/").slice(0, -1).join("/") || "/")}`,
|
||||
`cat > ${shellQuote(targetPath)}`,
|
||||
`chmod ${shellQuote(mode)} ${shellQuote(targetPath)}`,
|
||||
`chown root:root ${shellQuote(targetPath)} 2>/dev/null || true`,
|
||||
].join(" && ")
|
||||
const result = await runDockerKubectl(
|
||||
["exec", "-i", "-n", OPENSHELL_NAMESPACE, sandboxName, "--", "sh", "-lc", script],
|
||||
payload,
|
||||
)
|
||||
if (result.code !== 0) throw new Error(result.stderr || `failed to write ${targetPath}`)
|
||||
return {
|
||||
sandboxName,
|
||||
path: targetPath,
|
||||
bytes: payload.byteLength,
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user