mirror of
https://github.com/openclaw/openclaw.git
synced 2026-04-26 16:41:49 +00:00
Onboarding/Media: harden QR scanner and data URL parsing
This commit is contained in:
committed by
Mariano Belinky
parent
06adadc759
commit
bc05143e4e
@@ -413,4 +413,32 @@ describe("local media root guard", () => {
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it("loads base64 data URLs", async () => {
|
||||
const pngBuffer = await sharp({
|
||||
create: { width: 2, height: 2, channels: 3, background: "#00aaff" },
|
||||
})
|
||||
.png()
|
||||
.toBuffer();
|
||||
const dataUrl = `data:image/png;base64,${pngBuffer.toString("base64")}`;
|
||||
|
||||
const result = await loadWebMedia(dataUrl, 1024 * 1024);
|
||||
|
||||
expect(result.kind).toBe("image");
|
||||
expect(result.contentType).toBe("image/jpeg");
|
||||
expect(result.buffer.length).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
it("rejects non-base64 data URLs", async () => {
|
||||
await expect(loadWebMedia("data:image/png,hello", 1024)).rejects.toThrow(
|
||||
/Only base64 data: URLs are supported/i,
|
||||
);
|
||||
});
|
||||
|
||||
it("rejects oversized base64 data URLs before decode", async () => {
|
||||
const body = Buffer.alloc(4096, 1).toString("base64");
|
||||
const dataUrl = `data:application/octet-stream;base64,${body}`;
|
||||
|
||||
await expect(loadWebMediaRaw(dataUrl, 128)).rejects.toThrow(/exceeds .*limit/i);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -91,6 +91,8 @@ async function assertLocalMediaAllowed(
|
||||
|
||||
const HEIC_MIME_RE = /^image\/hei[cf]$/i;
|
||||
const HEIC_EXT_RE = /\.(heic|heif)$/i;
|
||||
const DATA_URL_RE = /^data:([^;,]+)?(;base64)?,(.*)$/i;
|
||||
const BASE64_BODY_RE = /^[A-Za-z0-9+/]*={0,2}$/;
|
||||
const MB = 1024 * 1024;
|
||||
|
||||
function formatMb(bytes: number, digits = 2): string {
|
||||
@@ -130,6 +132,38 @@ function toJpegFileName(fileName?: string): string | undefined {
|
||||
return path.format({ dir: parsed.dir, name: parsed.name, ext: ".jpg" });
|
||||
}
|
||||
|
||||
function parseBase64DataUrl(mediaUrl: string): { contentType: string; base64Body: string } | null {
|
||||
const match = mediaUrl.match(DATA_URL_RE);
|
||||
if (!match) {
|
||||
return null;
|
||||
}
|
||||
if (!match[2]) {
|
||||
throw new Error("Only base64 data: URLs are supported");
|
||||
}
|
||||
const contentType = match[1] || "application/octet-stream";
|
||||
const base64Body = (match[3] || "").replaceAll(/\s+/g, "");
|
||||
if (base64Body.length === 0) {
|
||||
return { contentType, base64Body };
|
||||
}
|
||||
if (!BASE64_BODY_RE.test(base64Body) || base64Body.length % 4 === 1) {
|
||||
throw new Error("Invalid base64 data in data: URL");
|
||||
}
|
||||
return { contentType, base64Body };
|
||||
}
|
||||
|
||||
function estimateDecodedBase64Bytes(base64Body: string): number {
|
||||
if (base64Body.length === 0) {
|
||||
return 0;
|
||||
}
|
||||
let padding = 0;
|
||||
if (base64Body.endsWith("==")) {
|
||||
padding = 2;
|
||||
} else if (base64Body.endsWith("=")) {
|
||||
padding = 1;
|
||||
}
|
||||
return Math.floor((base64Body.length * 3) / 4) - padding;
|
||||
}
|
||||
|
||||
type OptimizedImage = {
|
||||
buffer: Buffer;
|
||||
optimizedSize: number;
|
||||
@@ -273,16 +307,22 @@ async function loadWebMediaInternal(
|
||||
};
|
||||
};
|
||||
|
||||
// Handle data: URLs (base64-encoded inline data)
|
||||
if (mediaUrl.startsWith("data:")) {
|
||||
const match = mediaUrl.match(/^data:([^;,]+)?(?:;base64)?,(.*)$/);
|
||||
if (!match) {
|
||||
throw new Error("Invalid data: URL format");
|
||||
}
|
||||
const contentType = match[1] || "application/octet-stream";
|
||||
const base64Data = match[2];
|
||||
const buffer = Buffer.from(base64Data, "base64");
|
||||
const parsedDataUrl = parseBase64DataUrl(mediaUrl);
|
||||
if (parsedDataUrl) {
|
||||
const { contentType, base64Body } = parsedDataUrl;
|
||||
const kind = mediaKindFromMime(contentType);
|
||||
const defaultFetchCap = maxBytesForKind("unknown");
|
||||
const decodeCap =
|
||||
maxBytes === undefined
|
||||
? defaultFetchCap
|
||||
: optimizeImages && kind === "image"
|
||||
? Math.max(maxBytes, defaultFetchCap)
|
||||
: maxBytes;
|
||||
const estimatedBytes = estimateDecodedBase64Bytes(base64Body);
|
||||
if (estimatedBytes > decodeCap) {
|
||||
throw new Error(formatCapLimit("Media", decodeCap, estimatedBytes));
|
||||
}
|
||||
const buffer = Buffer.from(base64Body, "base64");
|
||||
return await clampAndFinalize({ buffer, contentType, kind });
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user