github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-09 15:14:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(gateway): reuse shared validators + baseHash

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-16 01:19:01 +00:00
parent 71cee673b2
commit b743e652c0
4 changed files with 40 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/gateway/server-methods/exec-approvals.ts
View File

@@ -11,22 +11,14 @@ import {
import {
ErrorCodes,
errorShape,
formatValidationErrors,
validateExecApprovalsGetParams,
validateExecApprovalsNodeGetParams,
validateExecApprovalsNodeSetParams,
validateExecApprovalsSetParams,
} from "../protocol/index.js";
import { resolveBaseHashParam } from "./base-hash.js";
import { respondUnavailableOnThrow, safeParseJson } from "./nodes.helpers.js";
function resolveBaseHash(params: unknown): string | null {
const raw = (params as { baseHash?: unknown })?.baseHash;
if (typeof raw !== "string") {
return null;
}
const trimmed = raw.trim();
return trimmed ? trimmed : null;
}
import { assertValidParams } from "./validation.js";
function requireApprovalsBaseHash(
params: unknown,
@@ -47,7 +39,7 @@ function requireApprovalsBaseHash(
);
return false;
}
const baseHash = resolveBaseHash(params);
const baseHash = resolveBaseHashParam(params);
if (!baseHash) {
respond(
false,
@@ -83,15 +75,7 @@ function redactExecApprovals(file: ExecApprovalsFile): ExecApprovalsFile {
export const execApprovalsHandlers: GatewayRequestHandlers = {
"exec.approvals.get": ({ params, respond }) => {
if (!validateExecApprovalsGetParams(params)) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid exec.approvals.get params: ${formatValidationErrors(validateExecApprovalsGetParams.errors)}`,
),
);
if (!assertValidParams(params, validateExecApprovalsGetParams, "exec.approvals.get", respond)) {
return;
}
ensureExecApprovals();
@@ -108,15 +92,7 @@ export const execApprovalsHandlers: GatewayRequestHandlers = {
);
},
"exec.approvals.set": ({ params, respond }) => {
if (!validateExecApprovalsSetParams(params)) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid exec.approvals.set params: ${formatValidationErrors(validateExecApprovalsSetParams.errors)}`,
),
);
if (!assertValidParams(params, validateExecApprovalsSetParams, "exec.approvals.set", respond)) {
return;
}
ensureExecApprovals();
@@ -149,15 +125,14 @@ export const execApprovalsHandlers: GatewayRequestHandlers = {
);
},
"exec.approvals.node.get": async ({ params, respond, context }) => {
if (!validateExecApprovalsNodeGetParams(params)) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid exec.approvals.node.get params: ${formatValidationErrors(validateExecApprovalsNodeGetParams.errors)}`,
),
);
if (
!assertValidParams(
params,
validateExecApprovalsNodeGetParams,
"exec.approvals.node.get",
respond,
)
) {
return;
}
const { nodeId } = params as { nodeId: string };
@@ -187,15 +162,14 @@ export const execApprovalsHandlers: GatewayRequestHandlers = {
});
},
"exec.approvals.node.set": async ({ params, respond, context }) => {
if (!validateExecApprovalsNodeSetParams(params)) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid exec.approvals.node.set params: ${formatValidationErrors(validateExecApprovalsNodeSetParams.errors)}`,
),
);
if (
!assertValidParams(
params,
validateExecApprovalsNodeSetParams,
"exec.approvals.node.set",
respond,
)
) {
return;
}
const { nodeId, file, baseHash } = params as {