github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-30 20:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(security): harden system.run companion command binding

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-25 00:01:53 +00:00
parent 8680240f7e
commit 55cf92578d
6 changed files with 520 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/macos/Sources/OpenClaw/ExecApprovalsSocket.swift
View File

@@ -361,7 +361,24 @@ private enum ExecHostExecutor {
reason: "invalid")
}
let context = await self.buildContext(request: request, command: command)
let validatedCommand = ExecSystemRunCommandValidator.resolve(
command: command,
rawCommand: request.rawCommand)
let displayCommand: String
switch validatedCommand {
case .ok(let resolved):
displayCommand = resolved.displayCommand
case .invalid(let message):
return self.errorResponse(
code: "INVALID_REQUEST",
message: message,
reason: "invalid")
}
let context = await self.buildContext(
request: request,
command: command,
rawCommand: displayCommand)
if context.security == .deny {
return self.errorResponse(
code: "UNAVAILABLE",
@@ -451,10 +468,14 @@ private enum ExecHostExecutor {
timeoutMs: request.timeoutMs)
}
private static func buildContext(request: ExecHostRequest, command: [String]) async -> ExecApprovalContext {
private static func buildContext(
request: ExecHostRequest,
command: [String],
rawCommand: String?) async -> ExecApprovalContext
{
await ExecApprovalEvaluator.evaluate(
command: command,
rawCommand: request.rawCommand,
rawCommand: rawCommand,
cwd: request.cwd,
envOverrides: request.env,
agentId: request.agentId)