Illusion/sharper.ly
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix(web): nonce JSON-LD scripts"

Browse Source 
This reverts commit 9119599e45.
This commit is contained in:
Illusion
2026-10-16 00:28:51 +02:00
parent 274ca6f5ca
commit 0b2c8d581f
2 changed files with 1 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/app/entry.server.tsx
+1 -5
View File
@@ -20,7 +20,6 @@ import type { RenderToPipeableStreamOptions } from "react-dom/server";
import { renderToPipeableStream } from "react-dom/server"; import { renderToPipeableStream } from "react-dom/server";
import { DEFAULT_LOCALE, getLocaleFromPathname } from "~/i18n/config"; import { DEFAULT_LOCALE, getLocaleFromPathname } from "~/i18n/config";
import { nonceJsonLdScripts } from "~/lib/csp-stream.server";
import { getServerEnv } from "~/lib/env.server"; import { getServerEnv } from "~/lib/env.server";
export const streamTimeout = 5_000; export const streamTimeout = 5_000;
@@ -114,10 +113,7 @@ export default function handleRequest(
callback(); callback();
}, },
}); });
const responseBody = nonce const stream = createReadableStreamFromReadable(body);
? body.pipe(nonceJsonLdScripts(nonce))
: body;
const stream = createReadableStreamFromReadable(responseBody);
responseHeaders.set("Content-Type", "text/html"); responseHeaders.set("Content-Type", "text/html");
responseHeaders.set("Content-Language", contentLanguage(request)); responseHeaders.set("Content-Language", contentLanguage(request));
apps/web/app/lib/csp-stream.server.ts
-47
View File
@@ -1,47 +0,0 @@
import { Transform } from "node:stream";
import type { TransformCallback } from "node:stream";
const JSON_LD_OPENING_TAG = Buffer.from('<script type="application/ld+json">');
export function nonceJsonLdScripts(nonce: string): Transform {
const nonceOpeningTag = Buffer.from(
`<script nonce="${nonce}" type="application/ld+json">`,
);
const retainedBytes = JSON_LD_OPENING_TAG.length - 1;
let pending = Buffer.alloc(0);
return new Transform({
transform(chunk: Buffer, _encoding: BufferEncoding, callback: TransformCallback) {
const data = Buffer.concat([pending, chunk]);
const safeLimit = Math.max(0, data.length - retainedBytes);
let cursor = 0;
let match = data.indexOf(JSON_LD_OPENING_TAG, cursor);
while (match !== -1 && match < safeLimit) {
this.push(data.subarray(cursor, match));
this.push(nonceOpeningTag);
cursor = match + JSON_LD_OPENING_TAG.length;
match = data.indexOf(JSON_LD_OPENING_TAG, cursor);
}
const safeEnd = Math.max(cursor, safeLimit);
if (safeEnd > cursor) this.push(data.subarray(cursor, safeEnd));
pending = Buffer.from(data.subarray(safeEnd));
callback();
},
flush(callback: TransformCallback) {
let cursor = 0;
let match = pending.indexOf(JSON_LD_OPENING_TAG, cursor);
while (match !== -1) {
this.push(pending.subarray(cursor, match));
this.push(nonceOpeningTag);
cursor = match + JSON_LD_OPENING_TAG.length;
match = pending.indexOf(JSON_LD_OPENING_TAG, cursor);
}
this.push(pending.subarray(cursor));
callback();
},
});
}