mirror of
https://github.com/moltbot/moltbot.git
synced 2026-05-06 15:18:58 +00:00
* Allow config includes from approved roots Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add changelog for include roots Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Tighten include realpath handling Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: ificator <bcleaver+odspmdb@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
424 lines
13 KiB
TypeScript
424 lines
13 KiB
TypeScript
/**
|
|
* Config includes: $include directive for modular configs
|
|
*
|
|
* @example
|
|
* ```json5
|
|
* {
|
|
* "$include": "./base.json5", // single file
|
|
* "$include": ["./a.json5", "./b.json5"] // merge multiple
|
|
* }
|
|
* ```
|
|
*/
|
|
|
|
import fs from "node:fs";
|
|
import path from "node:path";
|
|
import JSON5 from "json5";
|
|
import { canUseBoundaryFileOpen, openBoundaryFileSync } from "../infra/boundary-file-read.js";
|
|
import { isPathInside } from "../security/scan-paths.js";
|
|
import { isPlainObject } from "../utils.js";
|
|
import { isBlockedObjectKey } from "./prototype-keys.js";
|
|
|
|
export const INCLUDE_KEY = "$include";
|
|
export const MAX_INCLUDE_DEPTH = 10;
|
|
export const MAX_INCLUDE_FILE_BYTES = 2 * 1024 * 1024;
|
|
|
|
// ============================================================================
|
|
// Types
|
|
// ============================================================================
|
|
|
|
export type IncludeResolver = {
|
|
readFile: (path: string) => string;
|
|
readFileWithGuards?: (params: IncludeFileReadParams) => string;
|
|
parseJson: (raw: string) => unknown;
|
|
};
|
|
|
|
export type IncludeFileReadParams = {
|
|
includePath: string;
|
|
resolvedPath: string;
|
|
rootRealDir: string;
|
|
ioFs?: typeof fs;
|
|
maxBytes?: number;
|
|
};
|
|
|
|
export type ResolveConfigIncludesOptions = {
|
|
/**
|
|
* Additional directories outside the config directory that `$include` paths
|
|
* may resolve into. Typically populated from `OPENCLAW_INCLUDE_ROOTS`.
|
|
* Each entry must be an absolute path; symlinks are resolved before the
|
|
* containment check, consistent with the config-directory boundary check.
|
|
*/
|
|
allowedRoots?: ReadonlyArray<string>;
|
|
};
|
|
|
|
type IncludeRoot = {
|
|
rootDir: string;
|
|
rootRealDir: string;
|
|
};
|
|
|
|
// ============================================================================
|
|
// Errors
|
|
// ============================================================================
|
|
|
|
export class ConfigIncludeError extends Error {
|
|
constructor(
|
|
message: string,
|
|
public readonly includePath: string,
|
|
public readonly cause?: Error,
|
|
) {
|
|
super(message);
|
|
this.name = "ConfigIncludeError";
|
|
}
|
|
}
|
|
|
|
export class CircularIncludeError extends ConfigIncludeError {
|
|
constructor(public readonly chain: string[]) {
|
|
super(`Circular include detected: ${chain.join(" -> ")}`, chain[chain.length - 1]);
|
|
this.name = "CircularIncludeError";
|
|
}
|
|
}
|
|
|
|
// ============================================================================
|
|
// Utilities
|
|
// ============================================================================
|
|
|
|
/** Deep merge: arrays concatenate, objects merge recursively, primitives: source wins */
|
|
export function deepMerge(target: unknown, source: unknown): unknown {
|
|
if (Array.isArray(target) && Array.isArray(source)) {
|
|
return [...target, ...source];
|
|
}
|
|
if (isPlainObject(target) && isPlainObject(source)) {
|
|
const result: Record<string, unknown> = { ...target };
|
|
for (const key of Object.keys(source)) {
|
|
if (isBlockedObjectKey(key)) {
|
|
continue;
|
|
}
|
|
result[key] = key in result ? deepMerge(result[key], source[key]) : source[key];
|
|
}
|
|
return result;
|
|
}
|
|
return source;
|
|
}
|
|
|
|
// ============================================================================
|
|
// Include Resolver Class
|
|
// ============================================================================
|
|
|
|
class IncludeProcessor {
|
|
private visited = new Set<string>();
|
|
private depth = 0;
|
|
private readonly configRoot: IncludeRoot;
|
|
private readonly allowedRoots: ReadonlyArray<IncludeRoot>;
|
|
|
|
constructor(
|
|
private basePath: string,
|
|
private resolver: IncludeResolver,
|
|
rootDir?: string,
|
|
allowedRoots?: ReadonlyArray<IncludeRoot>,
|
|
) {
|
|
this.visited.add(path.normalize(basePath));
|
|
const configRootDir = path.normalize(rootDir ?? path.dirname(basePath));
|
|
this.configRoot = {
|
|
rootDir: configRootDir,
|
|
rootRealDir: path.normalize(safeRealpath(configRootDir)),
|
|
};
|
|
this.allowedRoots = allowedRoots ?? [];
|
|
}
|
|
|
|
private get rootDir(): string {
|
|
return this.configRoot.rootDir;
|
|
}
|
|
|
|
process(obj: unknown): unknown {
|
|
if (Array.isArray(obj)) {
|
|
return obj.map((item) => this.process(item));
|
|
}
|
|
|
|
if (!isPlainObject(obj)) {
|
|
return obj;
|
|
}
|
|
|
|
if (!(INCLUDE_KEY in obj)) {
|
|
return this.processObject(obj);
|
|
}
|
|
|
|
return this.processInclude(obj);
|
|
}
|
|
|
|
private processObject(obj: Record<string, unknown>): Record<string, unknown> {
|
|
const result: Record<string, unknown> = {};
|
|
for (const [key, value] of Object.entries(obj)) {
|
|
result[key] = this.process(value);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
private processInclude(obj: Record<string, unknown>): unknown {
|
|
const includeValue = obj[INCLUDE_KEY];
|
|
const otherKeys = Object.keys(obj).filter((k) => k !== INCLUDE_KEY);
|
|
const included = this.resolveInclude(includeValue);
|
|
|
|
if (otherKeys.length === 0) {
|
|
return included;
|
|
}
|
|
|
|
if (!isPlainObject(included)) {
|
|
throw new ConfigIncludeError(
|
|
"Sibling keys require included content to be an object",
|
|
typeof includeValue === "string" ? includeValue : INCLUDE_KEY,
|
|
);
|
|
}
|
|
|
|
// Merge included content with sibling keys
|
|
const rest: Record<string, unknown> = {};
|
|
for (const key of otherKeys) {
|
|
rest[key] = this.process(obj[key]);
|
|
}
|
|
return deepMerge(included, rest);
|
|
}
|
|
|
|
private resolveInclude(value: unknown): unknown {
|
|
if (typeof value === "string") {
|
|
return this.loadFile(value);
|
|
}
|
|
|
|
if (Array.isArray(value)) {
|
|
return value.reduce<unknown>((merged, item) => {
|
|
if (typeof item !== "string") {
|
|
throw new ConfigIncludeError(
|
|
`Invalid $include array item: expected string, got ${typeof item}`,
|
|
String(item),
|
|
);
|
|
}
|
|
return deepMerge(merged, this.loadFile(item));
|
|
}, {});
|
|
}
|
|
|
|
throw new ConfigIncludeError(
|
|
`Invalid $include value: expected string or array of strings, got ${typeof value}`,
|
|
String(value),
|
|
);
|
|
}
|
|
|
|
private loadFile(includePath: string): unknown {
|
|
const { resolvedPath, root } = this.resolvePath(includePath);
|
|
|
|
this.checkCircular(resolvedPath);
|
|
this.checkDepth(includePath);
|
|
|
|
const raw = this.readFile(includePath, resolvedPath, root);
|
|
const parsed = this.parseFile(includePath, resolvedPath, raw);
|
|
|
|
return this.processNested(resolvedPath, parsed);
|
|
}
|
|
|
|
private resolvePath(includePath: string): { resolvedPath: string; root: IncludeRoot } {
|
|
const configDir = path.dirname(this.basePath);
|
|
const resolved = path.isAbsolute(includePath)
|
|
? includePath
|
|
: path.resolve(configDir, includePath);
|
|
const normalized = path.normalize(resolved);
|
|
|
|
// SECURITY: Reject paths outside the config directory and any caller-allowed
|
|
// roots (CWE-22: Path Traversal). Allowed roots come from
|
|
// OPENCLAW_INCLUDE_ROOTS and let operators opt into shared include trees
|
|
// without weakening the default lock-down.
|
|
const lexicalMatch = this.findContainingRoot(normalized, "rootDir");
|
|
if (!lexicalMatch) {
|
|
throw new ConfigIncludeError(
|
|
`Include path escapes config directory: ${includePath} (root: ${this.rootDir})`,
|
|
includePath,
|
|
);
|
|
}
|
|
|
|
// SECURITY: Resolve symlinks and re-validate to prevent symlink bypass.
|
|
// The realpath may legitimately land in a different allowed root than the
|
|
// lexical path (e.g. config dir contains a symlink into an allowed root),
|
|
// so we recheck across all roots rather than pinning to the lexical match.
|
|
try {
|
|
const real = fs.realpathSync(normalized);
|
|
const realMatch = this.findContainingRoot(real, "rootRealDir");
|
|
if (!realMatch) {
|
|
throw new ConfigIncludeError(
|
|
`Include path resolves outside config directory (symlink): ${includePath} (root: ${this.rootDir})`,
|
|
includePath,
|
|
);
|
|
}
|
|
return { resolvedPath: normalized, root: realMatch };
|
|
} catch (err) {
|
|
if (err instanceof ConfigIncludeError) {
|
|
throw err;
|
|
}
|
|
if (isNotFoundError(err)) {
|
|
// File doesn't exist yet - lexical containment check above is sufficient.
|
|
return { resolvedPath: normalized, root: lexicalMatch };
|
|
}
|
|
throw new ConfigIncludeError(
|
|
`Failed to resolve include file realpath: ${includePath} (resolved: ${normalized})`,
|
|
includePath,
|
|
err instanceof Error ? err : undefined,
|
|
);
|
|
}
|
|
}
|
|
|
|
private findContainingRoot(
|
|
candidate: string,
|
|
field: "rootDir" | "rootRealDir",
|
|
): IncludeRoot | null {
|
|
if (isPathInside(this.configRoot[field], candidate)) {
|
|
return this.configRoot;
|
|
}
|
|
for (const root of this.allowedRoots) {
|
|
if (isPathInside(root[field], candidate)) {
|
|
return root;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
private checkCircular(resolvedPath: string): void {
|
|
if (this.visited.has(resolvedPath)) {
|
|
throw new CircularIncludeError([...this.visited, resolvedPath]);
|
|
}
|
|
}
|
|
|
|
private checkDepth(includePath: string): void {
|
|
if (this.depth >= MAX_INCLUDE_DEPTH) {
|
|
throw new ConfigIncludeError(
|
|
`Maximum include depth (${MAX_INCLUDE_DEPTH}) exceeded at: ${includePath}`,
|
|
includePath,
|
|
);
|
|
}
|
|
}
|
|
|
|
private readFile(includePath: string, resolvedPath: string, root: IncludeRoot): string {
|
|
try {
|
|
if (this.resolver.readFileWithGuards) {
|
|
// This guard revalidates the opened file against root.rootRealDir, so
|
|
// symlink swaps between resolvePath() and read are rejected at open time.
|
|
return this.resolver.readFileWithGuards({
|
|
includePath,
|
|
resolvedPath,
|
|
rootRealDir: root.rootRealDir,
|
|
});
|
|
}
|
|
return this.resolver.readFile(resolvedPath);
|
|
} catch (err) {
|
|
if (err instanceof ConfigIncludeError) {
|
|
throw err;
|
|
}
|
|
throw new ConfigIncludeError(
|
|
`Failed to read include file: ${includePath} (resolved: ${resolvedPath})`,
|
|
includePath,
|
|
err instanceof Error ? err : undefined,
|
|
);
|
|
}
|
|
}
|
|
|
|
private parseFile(includePath: string, resolvedPath: string, raw: string): unknown {
|
|
try {
|
|
return this.resolver.parseJson(raw);
|
|
} catch (err) {
|
|
throw new ConfigIncludeError(
|
|
`Failed to parse include file: ${includePath} (resolved: ${resolvedPath})`,
|
|
includePath,
|
|
err instanceof Error ? err : undefined,
|
|
);
|
|
}
|
|
}
|
|
|
|
private processNested(resolvedPath: string, parsed: unknown): unknown {
|
|
const nested = new IncludeProcessor(
|
|
resolvedPath,
|
|
this.resolver,
|
|
this.rootDir,
|
|
this.allowedRoots,
|
|
);
|
|
nested.visited = new Set([...this.visited, resolvedPath]);
|
|
nested.depth = this.depth + 1;
|
|
return nested.process(parsed);
|
|
}
|
|
}
|
|
|
|
function safeRealpath(target: string): string {
|
|
try {
|
|
return fs.realpathSync(target);
|
|
} catch {
|
|
return target;
|
|
}
|
|
}
|
|
|
|
function isNotFoundError(error: unknown): boolean {
|
|
return Boolean(
|
|
error &&
|
|
typeof error === "object" &&
|
|
"code" in error &&
|
|
(error as { code?: unknown }).code === "ENOENT",
|
|
);
|
|
}
|
|
|
|
export function readConfigIncludeFileWithGuards(params: IncludeFileReadParams): string {
|
|
const ioFs = params.ioFs ?? fs;
|
|
const maxBytes = params.maxBytes ?? MAX_INCLUDE_FILE_BYTES;
|
|
if (!canUseBoundaryFileOpen(ioFs)) {
|
|
return ioFs.readFileSync(params.resolvedPath, "utf-8");
|
|
}
|
|
|
|
const opened = openBoundaryFileSync({
|
|
absolutePath: params.resolvedPath,
|
|
rootPath: params.rootRealDir,
|
|
rootRealPath: params.rootRealDir,
|
|
boundaryLabel: "config directory",
|
|
skipLexicalRootCheck: true,
|
|
maxBytes,
|
|
ioFs,
|
|
});
|
|
if (!opened.ok) {
|
|
if (opened.reason === "validation") {
|
|
throw new ConfigIncludeError(
|
|
`Include file failed security checks (regular file, max ${maxBytes} bytes, no hardlinks): ${params.includePath}`,
|
|
params.includePath,
|
|
);
|
|
}
|
|
throw new ConfigIncludeError(
|
|
`Failed to read include file: ${params.includePath} (resolved: ${params.resolvedPath})`,
|
|
params.includePath,
|
|
opened.error instanceof Error ? opened.error : undefined,
|
|
);
|
|
}
|
|
|
|
try {
|
|
return ioFs.readFileSync(opened.fd, "utf-8");
|
|
} finally {
|
|
ioFs.closeSync(opened.fd);
|
|
}
|
|
}
|
|
|
|
// ============================================================================
|
|
// Public API
|
|
// ============================================================================
|
|
|
|
const defaultResolver: IncludeResolver = {
|
|
readFile: (p) => fs.readFileSync(p, "utf-8"),
|
|
readFileWithGuards: ({ includePath, resolvedPath, rootRealDir }) =>
|
|
readConfigIncludeFileWithGuards({ includePath, resolvedPath, rootRealDir }),
|
|
parseJson: (raw) => JSON5.parse(raw),
|
|
};
|
|
|
|
/**
|
|
* Resolves all $include directives in a parsed config object.
|
|
*/
|
|
export function resolveConfigIncludes(
|
|
obj: unknown,
|
|
configPath: string,
|
|
resolver: IncludeResolver = defaultResolver,
|
|
options: ResolveConfigIncludesOptions = {},
|
|
): unknown {
|
|
const allowedRoots = (options.allowedRoots ?? [])
|
|
.filter((entry) => typeof entry === "string" && entry.length > 0 && path.isAbsolute(entry))
|
|
.map<IncludeRoot>((entry) => {
|
|
const rootDir = path.normalize(entry);
|
|
return { rootDir, rootRealDir: path.normalize(safeRealpath(rootDir)) };
|
|
});
|
|
return new IncludeProcessor(configPath, resolver, undefined, allowedRoots).process(obj);
|
|
}
|