Repair OpenClaw exec approvals symlink
This commit is contained in:
@@ -5,7 +5,7 @@ import {
|
||||
syncSandboxOpenClawMcpConfig,
|
||||
revokeSandboxOpenClawMcpConfig,
|
||||
} from "./sandboxOpenClawMcpConfig"
|
||||
import { writeSandboxFilePrivileged } from "./sandboxPrivilegedFiles"
|
||||
import { repairOpenClawExecApprovalsFile, writeSandboxFilePrivileged } from "./sandboxPrivilegedFiles"
|
||||
|
||||
export const SANDBOX_MCP_MANIFEST_PATH = "/sandbox/openshell_control_mcp.md"
|
||||
|
||||
@@ -88,6 +88,7 @@ export async function syncSandboxMcpManifest(
|
||||
options.brokerBaseUrl,
|
||||
handoff.token,
|
||||
)
|
||||
const execApprovals = await repairOpenClawExecApprovalsFile(sandboxName)
|
||||
|
||||
return {
|
||||
path: uploaded.path,
|
||||
@@ -101,6 +102,7 @@ export async function syncSandboxMcpManifest(
|
||||
expiresAt: handoff.session.expiresAt,
|
||||
},
|
||||
openClaw,
|
||||
execApprovals,
|
||||
markdown: handoff.markdown,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,6 +50,38 @@ export async function writeSandboxFilePrivileged(
|
||||
}
|
||||
}
|
||||
|
||||
export async function repairOpenClawExecApprovalsFile(sandboxName: string) {
|
||||
const normalizeScript = [
|
||||
`const fs = require("fs")`,
|
||||
`const approval = "/sandbox/.openclaw/exec-approvals.json"`,
|
||||
`const tmp = process.argv[1]`,
|
||||
`let source = ""`,
|
||||
`try { source = fs.readFileSync(approval, "utf8") } catch {}`,
|
||||
`const trimmed = source.trim()`,
|
||||
`let payload = "{}\\n"`,
|
||||
`if (trimmed) { try { payload = JSON.stringify(JSON.parse(trimmed), null, 2) + "\\n" } catch {} }`,
|
||||
`fs.writeFileSync(tmp, payload)`,
|
||||
].join("; ")
|
||||
const script = [
|
||||
`mkdir -p /sandbox/.openclaw`,
|
||||
`tmp="/sandbox/.openclaw/.exec-approvals.json.$$"`,
|
||||
`node -e ${shellQuote(normalizeScript)} "$tmp"`,
|
||||
`rm -f /sandbox/.openclaw/exec-approvals.json`,
|
||||
`mv "$tmp" /sandbox/.openclaw/exec-approvals.json`,
|
||||
`chown sandbox:sandbox /sandbox/.openclaw/exec-approvals.json 2>/dev/null || chown 998:998 /sandbox/.openclaw/exec-approvals.json`,
|
||||
`chmod 0600 /sandbox/.openclaw/exec-approvals.json`,
|
||||
].join(" && ")
|
||||
const result = await runDockerKubectl(
|
||||
["exec", "-n", OPENSHELL_NAMESPACE, sandboxName, "--", "sh", "-lc", script],
|
||||
)
|
||||
if (result.code !== 0) throw new Error(result.stderr || "failed to repair OpenClaw exec approvals file")
|
||||
return {
|
||||
sandboxName,
|
||||
path: "/sandbox/.openclaw/exec-approvals.json",
|
||||
note: "Replaced OpenClaw exec approvals symlink with a real sandbox-owned file for newer OpenClaw versions.",
|
||||
}
|
||||
}
|
||||
|
||||
export async function stabilizeOpenClawGatewayConfig(sandboxName: string) {
|
||||
const patchConfig = [
|
||||
`const fs = require("fs")`,
|
||||
|
||||
Reference in New Issue
Block a user