Unverified Commit ccee817b authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: support Subresource Integrity

 (#90152)

A spinoff from https://github.com/vercel/next.js/pull/90045

- [x] The SRI test is failing for unrelated reasons (hardcoded chunk name matching)
- [x] Somehow, the hashes are wrong
parent 3b94d802
...@@ -88,6 +88,7 @@ use crate::{ ...@@ -88,6 +88,7 @@ use crate::{
AppPageRoute, Endpoint, EndpointOutput, EndpointOutputPaths, ModuleGraphs, Route, Routes, AppPageRoute, Endpoint, EndpointOutput, EndpointOutputPaths, ModuleGraphs, Route, Routes,
}, },
server_actions::{build_server_actions_loader, create_server_actions_manifest}, server_actions::{build_server_actions_loader, create_server_actions_manifest},
sri_manifest::get_sri_manifest_asset,
webpack_stats::generate_webpack_stats, webpack_stats::generate_webpack_stats,
}; };
...@@ -1576,6 +1577,16 @@ impl AppEndpoint { ...@@ -1576,6 +1577,16 @@ impl AppEndpoint {
file_paths_from_root.insert(rcstr!("server/server-reference-manifest.js")); file_paths_from_root.insert(rcstr!("server/server-reference-manifest.js"));
} }
if project
.next_config()
.experimental_sri()
.await?
.as_ref()
.is_some_and(|v| v.algorithm.is_some())
{
file_paths_from_root.insert(rcstr!("server/subresource-integrity-manifest.js"));
}
let mut wasm_paths_from_root = fxindexset![]; let mut wasm_paths_from_root = fxindexset![];
let node_root_value = node_root.clone(); let node_root_value = node_root.clone();
...@@ -2012,6 +2023,23 @@ impl Endpoint for AppEndpoint { ...@@ -2012,6 +2023,23 @@ impl Endpoint for AppEndpoint {
let client_relative_root = project.client_relative_path().owned().await?; let client_relative_root = project.client_relative_path().owned().await?;
let output_assets = output.output_assets(); let output_assets = output.output_assets();
let output_assets = if let Some(sri) =
&*project.next_config().experimental_sri().await?
&& let Some(algorithm) = sri.algorithm.clone()
{
let sri_manifest = get_sri_manifest_asset(
node_root.join(&format!(
"server/app{}/subresource-integrity-manifest.json",
&self.app_endpoint_entry().await?.original_name
))?,
output_assets,
client_relative_root.clone(),
algorithm,
);
output_assets.concat_asset(sri_manifest)
} else {
output_assets
};
let (server_paths, client_paths) = if project.next_mode().await?.is_development() { let (server_paths, client_paths) = if project.next_mode().await?.is_development() {
let server_paths = all_asset_paths(output_assets, node_root.clone(), None) let server_paths = all_asset_paths(output_assets, node_root.clone(), None)
......
use anyhow::Result;
use serde::{Serializer, ser::SerializeMap};
use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::{File, FileContent, FileSystemPath};
use turbopack_core::{
asset::{Asset, AssetContent},
output::{OutputAsset, OutputAssetsReference},
};
use crate::paths::{AssetPath, AssetPaths};
/// Generates a manifest mapping asset paths to their content hashes. The manifest is generated as a
/// JSON file with the following format:
/// ```json
/// {
/// "path/to/asset1.js": "hash_prefix-contenthash1",
/// "path/to/asset2.css": "hash_prefix-contenthash2",
/// ...
/// }
/// ```
#[turbo_tasks::value]
pub struct AssetHashesManifestAsset {
output_path: FileSystemPath,
asset_paths: ResolvedVc<AssetPaths>,
/// Optional prefix to add to the hash (e.g. "sha256-" for SRI hashes)
hash_prefix: Option<RcStr>,
}
#[turbo_tasks::value_impl]
impl AssetHashesManifestAsset {
#[turbo_tasks::function]
pub fn new(
output_path: FileSystemPath,
asset_paths: ResolvedVc<AssetPaths>,
hash_prefix: Option<RcStr>,
) -> Vc<Self> {
AssetHashesManifestAsset {
output_path,
asset_paths,
hash_prefix,
}
.cell()
}
}
#[turbo_tasks::value_impl]
impl OutputAssetsReference for AssetHashesManifestAsset {}
#[turbo_tasks::value_impl]
impl OutputAsset for AssetHashesManifestAsset {
#[turbo_tasks::function]
async fn path(&self) -> Vc<FileSystemPath> {
self.output_path.clone().cell()
}
}
#[turbo_tasks::value_impl]
impl Asset for AssetHashesManifestAsset {
#[turbo_tasks::function]
async fn content(&self) -> Result<Vc<AssetContent>> {
let files = self.asset_paths.await?;
struct Manifest<'a> {
asset_paths: &'a Vec<AssetPath>,
hash_prefix: &'a Option<RcStr>,
}
impl serde::Serialize for Manifest<'_> {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
let mut map = serializer.serialize_map(Some(self.asset_paths.len()))?;
let mut buf = String::new();
for entry in self.asset_paths {
if let Some(prefix) = self.hash_prefix {
use std::fmt::Write;
buf.clear();
write!(buf, "{}{}", prefix, entry.content_hash).unwrap();
map.serialize_entry(&entry.path, &buf)?;
} else {
map.serialize_entry(&entry.path, &entry.content_hash)?;
}
}
map.end()
}
}
let json = serde_json::to_string(&Manifest {
asset_paths: &files,
hash_prefix: &self.hash_prefix,
})?;
Ok(AssetContent::file(
FileContent::Content(File::from(json)).cell(),
))
}
}
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
pub mod analyze; pub mod analyze;
mod app; mod app;
mod asset_hashes_manifest;
mod client_references; mod client_references;
mod dynamic_imports; mod dynamic_imports;
mod empty; mod empty;
...@@ -23,5 +24,6 @@ pub mod project; ...@@ -23,5 +24,6 @@ pub mod project;
pub mod route; pub mod route;
pub mod routes_hashes_manifest; pub mod routes_hashes_manifest;
mod server_actions; mod server_actions;
mod sri_manifest;
mod versioned_content_map; mod versioned_content_map;
mod webpack_stats; mod webpack_stats;
...@@ -80,6 +80,7 @@ use crate::{ ...@@ -80,6 +80,7 @@ use crate::{
}, },
project::Project, project::Project,
route::{Endpoint, EndpointOutput, EndpointOutputPaths, ModuleGraphs, Route, Routes}, route::{Endpoint, EndpointOutput, EndpointOutputPaths, ModuleGraphs, Route, Routes},
sri_manifest::get_sri_manifest_asset,
webpack_stats::generate_webpack_stats, webpack_stats::generate_webpack_stats,
}; };
...@@ -1607,6 +1608,23 @@ impl Endpoint for PageEndpoint { ...@@ -1607,6 +1608,23 @@ impl Endpoint for PageEndpoint {
let client_relative_root = project.client_relative_path().owned().await?; let client_relative_root = project.client_relative_path().owned().await?;
let output_assets = output.output_assets(); let output_assets = output.output_assets();
let output_assets = if let Some(sri) =
&*project.next_config().experimental_sri().await?
&& let Some(algorithm) = sri.algorithm.clone()
{
let sri_manifest = get_sri_manifest_asset(
node_root.join(&format!(
"server/pages{}/subresource-integrity-manifest.json",
get_asset_prefix_from_pathname(&this.pathname)
))?,
output_assets,
client_relative_root.clone(),
algorithm,
);
output_assets.concat_asset(sri_manifest)
} else {
output_assets
};
let (server_paths, client_paths) = if project.next_mode().await?.is_development() { let (server_paths, client_paths) = if project.next_mode().await?.is_development() {
let server_paths = all_asset_paths(output_assets, node_root.clone(), None) let server_paths = all_asset_paths(output_assets, node_root.clone(), None)
......
use anyhow::{Result, bail};
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::Vc;
use turbo_tasks_fs::FileSystemPath;
use turbo_tasks_hash::HashAlgorithm;
use turbopack_core::output::{OutputAsset, OutputAssets};
use crate::{asset_hashes_manifest::AssetHashesManifestAsset, paths::all_asset_paths};
#[turbo_tasks::function]
pub fn get_sri_manifest_asset(
output_path: FileSystemPath,
output_assets: Vc<OutputAssets>,
client_relative_root: FileSystemPath,
algorithm: RcStr,
) -> Result<Vc<Box<dyn OutputAsset>>> {
let (algorithm, prefix) = match algorithm.as_str() {
"sha256" => (HashAlgorithm::Sha256Base64, rcstr!("sha256-")),
"sha384" => (HashAlgorithm::Sha384Base64, rcstr!("sha384-")),
"sha512" => (HashAlgorithm::Sha512Base64, rcstr!("sha512-")),
_ => bail!("Unsupported SRI algorithm: {}", algorithm),
};
Ok(Vc::upcast(AssetHashesManifestAsset::new(
output_path,
all_asset_paths(output_assets, client_relative_root, Some(algorithm)),
Some(prefix),
)))
}
...@@ -1820,11 +1820,10 @@ impl NextConfig { ...@@ -1820,11 +1820,10 @@ impl NextConfig {
Vc::cell(self.experimental.swc_plugins.clone().unwrap_or_default()) Vc::cell(self.experimental.swc_plugins.clone().unwrap_or_default())
} }
// TODO not implemented yet #[turbo_tasks::function]
// #[turbo_tasks::function] pub fn experimental_sri(&self) -> Vc<OptionSubResourceIntegrity> {
// pub fn experimental_sri(&self) -> Vc<OptionSubResourceIntegrity> { Vc::cell(self.experimental.sri.clone())
// Vc::cell(self.experimental.sri.clone()) }
// }
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn experimental_turbopack_use_builtin_babel(&self) -> Vc<Option<bool>> { pub fn experimental_turbopack_use_builtin_babel(&self) -> Vc<Option<bool>> {
......
...@@ -82,6 +82,8 @@ export async function handleRouteType({ ...@@ -82,6 +82,8 @@ export async function handleRouteType({
await manifestLoader.loadFontManifest('/_app', 'pages') await manifestLoader.loadFontManifest('/_app', 'pages')
await manifestLoader.loadFontManifest(page, 'pages') await manifestLoader.loadFontManifest(page, 'pages')
await manifestLoader.loadSriManifest(page, 'pages')
if (shouldCreateWebpackStats) { if (shouldCreateWebpackStats) {
await manifestLoader.loadWebpackStats(page, 'pages') await manifestLoader.loadWebpackStats(page, 'pages')
} }
...@@ -114,6 +116,8 @@ export async function handleRouteType({ ...@@ -114,6 +116,8 @@ export async function handleRouteType({
manifestLoader.loadActionManifest(page) manifestLoader.loadActionManifest(page)
manifestLoader.loadFontManifest(page, 'app') manifestLoader.loadFontManifest(page, 'app')
manifestLoader.loadSriManifest(page, 'app')
if (shouldCreateWebpackStats) { if (shouldCreateWebpackStats) {
manifestLoader.loadWebpackStats(page, 'app') manifestLoader.loadWebpackStats(page, 'app')
} }
......
...@@ -375,6 +375,8 @@ export type PrerenderManifest = { ...@@ -375,6 +375,8 @@ export type PrerenderManifest = {
preview: __ApiPreviewProps preview: __ApiPreviewProps
} }
export type SubresourceIntegrityManifest = Record<string, string>
type ManifestBuiltRoute = { type ManifestBuiltRoute = {
/** /**
* The route pattern used to match requests for this route. * The route pattern used to match requests for this route.
......
...@@ -114,6 +114,8 @@ export async function turbopackBuild(): Promise<{ ...@@ -114,6 +114,8 @@ export async function turbopackBuild(): Promise<{
isShortSession: true, isShortSession: true,
} }
const sriEnabled = Boolean(config.experimental.sri?.algorithm)
const project = await bindings.turbo.createProject( const project = await bindings.turbo.createProject(
{ {
...sharedProjectOptions, ...sharedProjectOptions,
...@@ -180,6 +182,7 @@ export async function turbopackBuild(): Promise<{ ...@@ -180,6 +182,7 @@ export async function turbopackBuild(): Promise<{
encryptionKey, encryptionKey,
dev: false, dev: false,
deploymentId: config.deploymentId, deploymentId: config.deploymentId,
sriEnabled,
}) })
const currentEntrypoints = await rawEntrypointsToEntrypoints( const currentEntrypoints = await rawEntrypointsToEntrypoints(
......
...@@ -24,7 +24,6 @@ const unsupportedTurbopackNextConfigOptions = [ ...@@ -24,7 +24,6 @@ const unsupportedTurbopackNextConfigOptions = [
'experimental.extensionAlias', 'experimental.extensionAlias',
'experimental.fallbackNodePolyfills', 'experimental.fallbackNodePolyfills',
'experimental.sri.algorithm',
'experimental.swcTraceProfiling', 'experimental.swcTraceProfiling',
// Left to be implemented (Might not be needed for Turbopack) // Left to be implemented (Might not be needed for Turbopack)
......
...@@ -450,6 +450,7 @@ export async function createHotReloaderTurbopack( ...@@ -450,6 +450,7 @@ export async function createHotReloaderTurbopack(
encryptionKey, encryptionKey,
dev: true, dev: true,
deploymentId: nextConfig.deploymentId, deploymentId: nextConfig.deploymentId,
sriEnabled: false,
}) })
// Dev specific // Dev specific
......
...@@ -24,6 +24,7 @@ import { ...@@ -24,6 +24,7 @@ import {
NEXT_FONT_MANIFEST, NEXT_FONT_MANIFEST,
PAGES_MANIFEST, PAGES_MANIFEST,
SERVER_REFERENCE_MANIFEST, SERVER_REFERENCE_MANIFEST,
SUBRESOURCE_INTEGRITY_MANIFEST,
TURBOPACK_CLIENT_BUILD_MANIFEST, TURBOPACK_CLIENT_BUILD_MANIFEST,
TURBOPACK_CLIENT_MIDDLEWARE_MANIFEST, TURBOPACK_CLIENT_MIDDLEWARE_MANIFEST,
WEBPACK_STATS, WEBPACK_STATS,
...@@ -54,6 +55,7 @@ import { ...@@ -54,6 +55,7 @@ import {
processRoute, processRoute,
createEdgeRuntimeManifest, createEdgeRuntimeManifest,
} from '../../../build/webpack/plugins/build-manifest-plugin-utils' } from '../../../build/webpack/plugins/build-manifest-plugin-utils'
import type { SubresourceIntegrityManifest } from '../../../build'
interface InstrumentationDefinition { interface InstrumentationDefinition {
files: string[] files: string[]
...@@ -71,6 +73,7 @@ type ManifestName = ...@@ -71,6 +73,7 @@ type ManifestName =
| typeof WEBPACK_STATS | typeof WEBPACK_STATS
| typeof APP_PATHS_MANIFEST | typeof APP_PATHS_MANIFEST
| `${typeof SERVER_REFERENCE_MANIFEST}.json` | `${typeof SERVER_REFERENCE_MANIFEST}.json`
| `${typeof SUBRESOURCE_INTEGRITY_MANIFEST}.json`
| `${typeof NEXT_FONT_MANIFEST}.json` | `${typeof NEXT_FONT_MANIFEST}.json`
| typeof REACT_LOADABLE_MANIFEST | typeof REACT_LOADABLE_MANIFEST
| typeof TURBOPACK_CLIENT_BUILD_MANIFEST | typeof TURBOPACK_CLIENT_BUILD_MANIFEST
...@@ -200,6 +203,8 @@ export class TurbopackManifestLoader { ...@@ -200,6 +203,8 @@ export class TurbopackManifestLoader {
new ManifestsMap() new ManifestsMap()
private webpackStats: ManifestsMap<EntryKey, WebpackStats> = private webpackStats: ManifestsMap<EntryKey, WebpackStats> =
new ManifestsMap() new ManifestsMap()
private sriManifests: ManifestsMap<EntryKey, SubresourceIntegrityManifest> =
new ManifestsMap()
private encryptionKey: string private encryptionKey: string
/// interceptionRewrites that have been written to disk /// interceptionRewrites that have been written to disk
/// This is used to avoid unnecessary writes if the rewrites haven't changed /// This is used to avoid unnecessary writes if the rewrites haven't changed
...@@ -209,6 +214,7 @@ export class TurbopackManifestLoader { ...@@ -209,6 +214,7 @@ export class TurbopackManifestLoader {
private readonly buildId: string private readonly buildId: string
private readonly deploymentId: string private readonly deploymentId: string
private readonly dev: boolean private readonly dev: boolean
private readonly sriEnabled: boolean
constructor({ constructor({
distDir, distDir,
...@@ -216,18 +222,21 @@ export class TurbopackManifestLoader { ...@@ -216,18 +222,21 @@ export class TurbopackManifestLoader {
encryptionKey, encryptionKey,
dev, dev,
deploymentId, deploymentId,
sriEnabled,
}: { }: {
buildId: string buildId: string
distDir: string distDir: string
encryptionKey: string encryptionKey: string
dev: boolean dev: boolean
deploymentId: string deploymentId: string
sriEnabled: boolean
}) { }) {
this.distDir = distDir this.distDir = distDir
this.buildId = buildId this.buildId = buildId
this.encryptionKey = encryptionKey this.encryptionKey = encryptionKey
this.dev = dev this.dev = dev
this.deploymentId = deploymentId this.deploymentId = deploymentId
this.sriEnabled = sriEnabled
} }
delete(key: EntryKey) { delete(key: EntryKey) {
...@@ -363,6 +372,32 @@ export class TurbopackManifestLoader { ...@@ -363,6 +372,32 @@ export class TurbopackManifestLoader {
writeFileAtomic(path, JSON.stringify(webpackStats, null, 2)) writeFileAtomic(path, JSON.stringify(webpackStats, null, 2))
} }
private writeSriManifest(): void {
if (!this.sriEnabled || !this.sriManifests.takeChanged()) {
return
}
const sriManifest = this.mergeSriManifests(this.sriManifests.values())
const pathJson = join(
this.distDir,
'server',
`${SUBRESOURCE_INTEGRITY_MANIFEST}.json`
)
const pathJs = join(
this.distDir,
'server',
`${SUBRESOURCE_INTEGRITY_MANIFEST}.js`
)
deleteCache(pathJson)
deleteCache(pathJs)
writeFileAtomic(pathJson, JSON.stringify(sriManifest, null, 2))
writeFileAtomic(
pathJs,
`self.__SUBRESOURCE_INTEGRITY_MANIFEST=${JSON.stringify(
JSON.stringify(sriManifest)
)}`
)
}
loadBuildManifest(pageName: string, type: 'app' | 'pages' = 'pages'): void { loadBuildManifest(pageName: string, type: 'app' | 'pages' = 'pages'): void {
this.buildManifests.set( this.buildManifests.set(
getEntryKey(type, 'server', pageName), getEntryKey(type, 'server', pageName),
...@@ -392,6 +427,19 @@ export class TurbopackManifestLoader { ...@@ -392,6 +427,19 @@ export class TurbopackManifestLoader {
) )
} }
loadSriManifest(pageName: string, type: 'app' | 'pages' = 'pages'): void {
if (!this.sriEnabled) return
this.sriManifests.set(
getEntryKey(type, 'client', pageName),
readPartialManifestContent(
this.distDir,
`${SUBRESOURCE_INTEGRITY_MANIFEST}.json`,
pageName,
type
)
)
}
private mergeWebpackStats(statsFiles: Iterable<WebpackStats>): WebpackStats { private mergeWebpackStats(statsFiles: Iterable<WebpackStats>): WebpackStats {
const entrypoints: Record<string, StatsChunkGroup> = {} const entrypoints: Record<string, StatsChunkGroup> = {}
const assets: Map<string, StatsAsset> = new Map() const assets: Map<string, StatsAsset> = new Map()
...@@ -882,6 +930,14 @@ export class TurbopackManifestLoader { ...@@ -882,6 +930,14 @@ export class TurbopackManifestLoader {
return sortObjectByKey(manifest) return sortObjectByKey(manifest)
} }
private mergeSriManifests(manifests: Iterable<SubresourceIntegrityManifest>) {
const manifest: SubresourceIntegrityManifest = {}
for (const m of manifests) {
Object.assign(manifest, m)
}
return sortObjectByKey(manifest)
}
private writePagesManifest(): void { private writePagesManifest(): void {
if (!this.pagesManifests.takeChanged()) { if (!this.pagesManifests.takeChanged()) {
return return
...@@ -914,6 +970,8 @@ export class TurbopackManifestLoader { ...@@ -914,6 +970,8 @@ export class TurbopackManifestLoader {
this.writeNextFontManifest() this.writeNextFontManifest()
this.writePagesManifest() this.writePagesManifest()
this.writeSriManifest()
if (process.env.TURBOPACK_STATS != null) { if (process.env.TURBOPACK_STATS != null) {
this.writeWebpackStats() this.writeWebpackStats()
} }
......
'use client'
export function Client() {
return <button>this is my client component</button>
}
export const dynamic = 'force-dynamic' export const dynamic = 'force-dynamic'
import { Client } from '../client'
export default function Page() { export default function Page() {
return <p>hello world</p> return (
<div>
<p>hello world</p>
<Client />
</div>
)
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment