mirror of
https://github.com/openclaw/openclaw.git
synced 2026-02-19 18:39:20 -05:00
security(web): sanitize WhatsApp accountId to prevent path traversal (#4610)
* security(web): sanitize WhatsApp accountId to prevent path traversal Apply normalizeAccountId() from routing/session-key to resolveDefaultAuthDir() so that malicious config values like "../../../etc" cannot escape the intended auth directory. Fixes #2692 * fix(web): check sanitized segment instead of full path in Windows test * style(web): fix oxfmt formatting in accounts test
This commit is contained in:
47
src/web/accounts.test.ts
Normal file
47
src/web/accounts.test.ts
Normal file
@@ -0,0 +1,47 @@
|
||||
import path from "node:path";
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { resolveWhatsAppAuthDir } from "./accounts.js";
|
||||
|
||||
describe("resolveWhatsAppAuthDir", () => {
|
||||
const stubCfg = { channels: { whatsapp: { accounts: {} } } } as Parameters<
|
||||
typeof resolveWhatsAppAuthDir
|
||||
>[0]["cfg"];
|
||||
|
||||
it("sanitizes path traversal sequences in accountId", () => {
|
||||
const { authDir } = resolveWhatsAppAuthDir({
|
||||
cfg: stubCfg,
|
||||
accountId: "../../../etc/passwd",
|
||||
});
|
||||
// Sanitized accountId must not escape the whatsapp auth directory.
|
||||
expect(authDir).not.toContain("..");
|
||||
expect(path.basename(authDir)).not.toContain("/");
|
||||
});
|
||||
|
||||
it("sanitizes special characters in accountId", () => {
|
||||
const { authDir } = resolveWhatsAppAuthDir({
|
||||
cfg: stubCfg,
|
||||
accountId: "foo/bar\\baz",
|
||||
});
|
||||
// Sprawdzaj sanityzacje na segmencie accountId, nie na calej sciezce
|
||||
// (Windows uzywa backslash jako separator katalogow).
|
||||
const segment = path.basename(authDir);
|
||||
expect(segment).not.toContain("/");
|
||||
expect(segment).not.toContain("\\");
|
||||
});
|
||||
|
||||
it("returns default directory for empty accountId", () => {
|
||||
const { authDir } = resolveWhatsAppAuthDir({
|
||||
cfg: stubCfg,
|
||||
accountId: "",
|
||||
});
|
||||
expect(authDir).toMatch(/whatsapp[/\\]default$/);
|
||||
});
|
||||
|
||||
it("preserves valid accountId unchanged", () => {
|
||||
const { authDir } = resolveWhatsAppAuthDir({
|
||||
cfg: stubCfg,
|
||||
accountId: "my-account-1",
|
||||
});
|
||||
expect(authDir).toMatch(/whatsapp[/\\]my-account-1$/);
|
||||
});
|
||||
});
|
||||
@@ -3,7 +3,7 @@ import path from "node:path";
|
||||
import type { OpenClawConfig } from "../config/config.js";
|
||||
import type { DmPolicy, GroupPolicy, WhatsAppAccountConfig } from "../config/types.js";
|
||||
import { resolveOAuthDir } from "../config/paths.js";
|
||||
import { DEFAULT_ACCOUNT_ID } from "../routing/session-key.js";
|
||||
import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "../routing/session-key.js";
|
||||
import { resolveUserPath } from "../utils.js";
|
||||
import { hasWebCredsSync } from "./auth-store.js";
|
||||
|
||||
@@ -95,7 +95,7 @@ function resolveAccountConfig(
|
||||
}
|
||||
|
||||
function resolveDefaultAuthDir(accountId: string): string {
|
||||
return path.join(resolveOAuthDir(), "whatsapp", accountId);
|
||||
return path.join(resolveOAuthDir(), "whatsapp", normalizeAccountId(accountId));
|
||||
}
|
||||
|
||||
function resolveLegacyAuthDir(): string {
|
||||
|
||||
Reference in New Issue
Block a user