mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-08 09:21:23 +00:00
refactor(security): share safe temp media path builder (#20810)
Merged via /review-pr -> /prepare-pr -> /merge-pr.
Prepared head SHA: 7a088e6801
Co-authored-by: mbelinky <132747814+mbelinky@users.noreply.github.com>
Co-authored-by: mbelinky <132747814+mbelinky@users.noreply.github.com>
Reviewed-by: @mbelinky
This commit is contained in:
@@ -19,6 +19,7 @@ Docs: https://docs.openclaw.ai
|
|||||||
- Security/Skills: for the next npm release, reject symlinks during skill packaging to prevent external file inclusion in distributed `.skill` archives. Thanks @aether-ai-agent for reporting.
|
- Security/Skills: for the next npm release, reject symlinks during skill packaging to prevent external file inclusion in distributed `.skill` archives. Thanks @aether-ai-agent for reporting.
|
||||||
- Security/Feishu: prevent path traversal in Feishu inbound media temp-file writes by replacing key-derived temp filenames with UUID-based names. Thanks @allsmog for reporting.
|
- Security/Feishu: prevent path traversal in Feishu inbound media temp-file writes by replacing key-derived temp filenames with UUID-based names. Thanks @allsmog for reporting.
|
||||||
- LINE/Security: harden inbound media temp-file naming by using UUID-based temp paths for downloaded media instead of external message IDs. (#20792) Thanks @mbelinky.
|
- LINE/Security: harden inbound media temp-file naming by using UUID-based temp paths for downloaded media instead of external message IDs. (#20792) Thanks @mbelinky.
|
||||||
|
- Security/Refactor: centralize hardened temp-file path generation for Feishu and LINE media downloads via shared `buildRandomTempFilePath` helper to reduce drift risk. (#20810) Thanks @mbelinky.
|
||||||
- Security/Media: harden local media ingestion against TOCTOU/symlink swap attacks by pinning reads to a single file descriptor with symlink rejection and inode/device verification in `saveMediaSource`. Thanks @dorjoos for reporting.
|
- Security/Media: harden local media ingestion against TOCTOU/symlink swap attacks by pinning reads to a single file descriptor with symlink rejection and inode/device verification in `saveMediaSource`. Thanks @dorjoos for reporting.
|
||||||
- Security/Lobster (Windows): for the next npm release, remove shell-based fallback when launching Lobster wrappers (`.cmd`/`.bat`) and switch to explicit argv execution with wrapper entrypoint resolution, preventing command injection while preserving Windows wrapper compatibility. Thanks @tdjackey for reporting.
|
- Security/Lobster (Windows): for the next npm release, remove shell-based fallback when launching Lobster wrappers (`.cmd`/`.bat`) and switch to explicit argv execution with wrapper entrypoint resolution, preventing command injection while preserving Windows wrapper compatibility. Thanks @tdjackey for reporting.
|
||||||
- Agents/Streaming: keep assistant partial streaming active during reasoning streams, handle native `thinking_*` stream events consistently, dedupe mixed reasoning-end signals, and clear stale mutating tool errors after same-target retry success. (#20635) Thanks @obviyus.
|
- Agents/Streaming: keep assistant partial streaming active during reasoning streams, handle native `thinking_*` stream events consistently, dedupe mixed reasoning-end signals, and clear stale mutating tool errors after same-target retry success. (#20635) Thanks @obviyus.
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
import fs from "fs";
|
import fs from "fs";
|
||||||
import crypto from "node:crypto";
|
|
||||||
import os from "os";
|
|
||||||
import path from "path";
|
import path from "path";
|
||||||
import { Readable } from "stream";
|
import { Readable } from "stream";
|
||||||
import type { ClawdbotConfig } from "openclaw/plugin-sdk";
|
import { buildRandomTempFilePath, type ClawdbotConfig } from "openclaw/plugin-sdk";
|
||||||
import { resolveFeishuAccount } from "./accounts.js";
|
import { resolveFeishuAccount } from "./accounts.js";
|
||||||
import { createFeishuClient } from "./client.js";
|
import { createFeishuClient } from "./client.js";
|
||||||
import { getFeishuRuntime } from "./runtime.js";
|
import { getFeishuRuntime } from "./runtime.js";
|
||||||
@@ -100,7 +98,7 @@ export async function downloadImageFeishu(params: {
|
|||||||
path: { image_key: imageKey },
|
path: { image_key: imageKey },
|
||||||
});
|
});
|
||||||
|
|
||||||
const tmpPath = path.join(os.tmpdir(), `feishu_img_${Date.now()}_${crypto.randomUUID()}`);
|
const tmpPath = buildRandomTempFilePath({ prefix: "feishu_img" });
|
||||||
const buffer = await readFeishuResponseBuffer({
|
const buffer = await readFeishuResponseBuffer({
|
||||||
response,
|
response,
|
||||||
tmpPath,
|
tmpPath,
|
||||||
@@ -133,7 +131,7 @@ export async function downloadMessageResourceFeishu(params: {
|
|||||||
params: { type },
|
params: { type },
|
||||||
});
|
});
|
||||||
|
|
||||||
const tmpPath = path.join(os.tmpdir(), `feishu_${Date.now()}_${crypto.randomUUID()}`);
|
const tmpPath = buildRandomTempFilePath({ prefix: "feishu" });
|
||||||
const buffer = await readFeishuResponseBuffer({
|
const buffer = await readFeishuResponseBuffer({
|
||||||
response,
|
response,
|
||||||
tmpPath,
|
tmpPath,
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
import crypto from "node:crypto";
|
|
||||||
import fs from "node:fs";
|
import fs from "node:fs";
|
||||||
import os from "node:os";
|
|
||||||
import path from "node:path";
|
|
||||||
import { messagingApi } from "@line/bot-sdk";
|
import { messagingApi } from "@line/bot-sdk";
|
||||||
import { logVerbose } from "../globals.js";
|
import { logVerbose } from "../globals.js";
|
||||||
|
import { buildRandomTempFilePath } from "../plugin-sdk/temp-path.js";
|
||||||
|
|
||||||
interface DownloadResult {
|
interface DownloadResult {
|
||||||
path: string;
|
path: string;
|
||||||
@@ -11,10 +9,6 @@ interface DownloadResult {
|
|||||||
size: number;
|
size: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildLineTempMediaPath(extension: string): string {
|
|
||||||
return path.join(os.tmpdir(), `line-media-${Date.now()}-${crypto.randomUUID()}${extension}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function downloadLineMedia(
|
export async function downloadLineMedia(
|
||||||
messageId: string,
|
messageId: string,
|
||||||
channelAccessToken: string,
|
channelAccessToken: string,
|
||||||
@@ -45,7 +39,7 @@ export async function downloadLineMedia(
|
|||||||
const ext = getExtensionForContentType(contentType);
|
const ext = getExtensionForContentType(contentType);
|
||||||
|
|
||||||
// Use random temp names; never derive paths from external message identifiers.
|
// Use random temp names; never derive paths from external message identifiers.
|
||||||
const filePath = buildLineTempMediaPath(ext);
|
const filePath = buildRandomTempFilePath({ prefix: "line-media", extension: ext });
|
||||||
|
|
||||||
await fs.promises.writeFile(filePath, buffer);
|
await fs.promises.writeFile(filePath, buffer);
|
||||||
|
|
||||||
|
|||||||
@@ -154,6 +154,7 @@ export { extractToolSend } from "./tool-send.js";
|
|||||||
export { resolveChannelAccountConfigBasePath } from "./config-paths.js";
|
export { resolveChannelAccountConfigBasePath } from "./config-paths.js";
|
||||||
export { chunkTextForOutbound } from "./text-chunking.js";
|
export { chunkTextForOutbound } from "./text-chunking.js";
|
||||||
export { readJsonFileWithFallback, writeJsonFileAtomically } from "./json-store.js";
|
export { readJsonFileWithFallback, writeJsonFileAtomically } from "./json-store.js";
|
||||||
|
export { buildRandomTempFilePath } from "./temp-path.js";
|
||||||
export type { ChatType } from "../channels/chat-type.js";
|
export type { ChatType } from "../channels/chat-type.js";
|
||||||
/** @deprecated Use ChatType instead */
|
/** @deprecated Use ChatType instead */
|
||||||
export type { RoutePeerKind } from "../routing/resolve-route.js";
|
export type { RoutePeerKind } from "../routing/resolve-route.js";
|
||||||
|
|||||||
32
src/plugin-sdk/temp-path.test.ts
Normal file
32
src/plugin-sdk/temp-path.test.ts
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
import os from "node:os";
|
||||||
|
import path from "node:path";
|
||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
import { buildRandomTempFilePath } from "./temp-path.js";
|
||||||
|
|
||||||
|
describe("buildRandomTempFilePath", () => {
|
||||||
|
it("builds deterministic paths when now/uuid are provided", () => {
|
||||||
|
const result = buildRandomTempFilePath({
|
||||||
|
prefix: "line-media",
|
||||||
|
extension: ".jpg",
|
||||||
|
tmpDir: "/tmp",
|
||||||
|
now: 123,
|
||||||
|
uuid: "abc",
|
||||||
|
});
|
||||||
|
expect(result).toBe(path.join("/tmp", "line-media-123-abc.jpg"));
|
||||||
|
});
|
||||||
|
|
||||||
|
it("sanitizes prefix and extension to avoid path traversal segments", () => {
|
||||||
|
const result = buildRandomTempFilePath({
|
||||||
|
prefix: "../../line/../media",
|
||||||
|
extension: "/../.jpg",
|
||||||
|
now: 123,
|
||||||
|
uuid: "abc",
|
||||||
|
});
|
||||||
|
const tmpRoot = path.resolve(os.tmpdir());
|
||||||
|
const resolved = path.resolve(result);
|
||||||
|
const rel = path.relative(tmpRoot, resolved);
|
||||||
|
expect(rel === ".." || rel.startsWith(`..${path.sep}`)).toBe(false);
|
||||||
|
expect(path.basename(result)).toBe("line-media-123-abc.jpg");
|
||||||
|
expect(result).not.toContain("..");
|
||||||
|
});
|
||||||
|
});
|
||||||
39
src/plugin-sdk/temp-path.ts
Normal file
39
src/plugin-sdk/temp-path.ts
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
import crypto from "node:crypto";
|
||||||
|
import os from "node:os";
|
||||||
|
import path from "node:path";
|
||||||
|
|
||||||
|
function sanitizePrefix(prefix: string): string {
|
||||||
|
const normalized = prefix.replace(/[^a-zA-Z0-9_-]+/g, "-").replace(/^-+|-+$/g, "");
|
||||||
|
return normalized || "tmp";
|
||||||
|
}
|
||||||
|
|
||||||
|
function sanitizeExtension(extension?: string): string {
|
||||||
|
if (!extension) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
const normalized = extension.startsWith(".") ? extension : `.${extension}`;
|
||||||
|
const suffix = normalized.match(/[a-zA-Z0-9._-]+$/)?.[0] ?? "";
|
||||||
|
const token = suffix.replace(/^[._-]+/, "");
|
||||||
|
if (!token) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return `.${token}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildRandomTempFilePath(params: {
|
||||||
|
prefix: string;
|
||||||
|
extension?: string;
|
||||||
|
tmpDir?: string;
|
||||||
|
now?: number;
|
||||||
|
uuid?: string;
|
||||||
|
}): string {
|
||||||
|
const prefix = sanitizePrefix(params.prefix);
|
||||||
|
const extension = sanitizeExtension(params.extension);
|
||||||
|
const nowCandidate = params.now;
|
||||||
|
const now =
|
||||||
|
typeof nowCandidate === "number" && Number.isFinite(nowCandidate)
|
||||||
|
? Math.trunc(nowCandidate)
|
||||||
|
: Date.now();
|
||||||
|
const uuid = params.uuid?.trim() || crypto.randomUUID();
|
||||||
|
return path.join(params.tmpDir ?? os.tmpdir(), `${prefix}-${now}-${uuid}${extension}`);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user