Unverified Commit 6b7241a3 authored by Luis Alvarez D.'s avatar Luis Alvarez D. Committed by GitHub

Implement encryption key into turbopack as hash salt (#72933)

I checked that the encryption key is now being used as the hash_salt.
I'm not sure about how to add a test for this behavior so let me know
about any suggestions there. (I tried looking for tests that would use
the functions up the call tree without any luck)
parent d80bd573
...@@ -179,6 +179,7 @@ impl AppProject { ...@@ -179,6 +179,7 @@ impl AppProject {
Value::new(self.client_ty().await?.clone_value()), Value::new(self.client_ty().await?.clone_value()),
self.project().next_mode(), self.project().next_mode(),
self.project().next_config(), self.project().next_config(),
self.project().encryption_key(),
)) ))
} }
...@@ -213,6 +214,7 @@ impl AppProject { ...@@ -213,6 +214,7 @@ impl AppProject {
self.project().next_mode(), self.project().next_mode(),
self.project().next_config(), self.project().next_config(),
NextRuntime::NodeJs, NextRuntime::NodeJs,
self.project().encryption_key(),
)) ))
} }
...@@ -225,6 +227,7 @@ impl AppProject { ...@@ -225,6 +227,7 @@ impl AppProject {
self.project().next_mode(), self.project().next_mode(),
self.project().next_config(), self.project().next_config(),
NextRuntime::Edge, NextRuntime::Edge,
self.project().encryption_key(),
)) ))
} }
...@@ -237,6 +240,7 @@ impl AppProject { ...@@ -237,6 +240,7 @@ impl AppProject {
self.project().next_mode(), self.project().next_mode(),
self.project().next_config(), self.project().next_config(),
NextRuntime::NodeJs, NextRuntime::NodeJs,
self.project().encryption_key(),
)) ))
} }
...@@ -249,6 +253,7 @@ impl AppProject { ...@@ -249,6 +253,7 @@ impl AppProject {
self.project().next_mode(), self.project().next_mode(),
self.project().next_config(), self.project().next_config(),
NextRuntime::Edge, NextRuntime::Edge,
self.project().encryption_key(),
)) ))
} }
...@@ -551,6 +556,7 @@ impl AppProject { ...@@ -551,6 +556,7 @@ impl AppProject {
self.project().next_mode(), self.project().next_mode(),
self.project().next_config(), self.project().next_config(),
NextRuntime::NodeJs, NextRuntime::NodeJs,
self.project().encryption_key(),
)) ))
} }
...@@ -563,6 +569,7 @@ impl AppProject { ...@@ -563,6 +569,7 @@ impl AppProject {
self.project().next_mode(), self.project().next_mode(),
self.project().next_config(), self.project().next_config(),
NextRuntime::Edge, NextRuntime::Edge,
self.project().encryption_key(),
)) ))
} }
......
...@@ -330,6 +330,7 @@ impl PagesProject { ...@@ -330,6 +330,7 @@ impl PagesProject {
}), }),
self.project().next_mode(), self.project().next_mode(),
self.project().next_config(), self.project().next_config(),
self.project().encryption_key(),
)) ))
} }
...@@ -436,6 +437,7 @@ impl PagesProject { ...@@ -436,6 +437,7 @@ impl PagesProject {
self.project().next_mode(), self.project().next_mode(),
self.project().next_config(), self.project().next_config(),
NextRuntime::NodeJs, NextRuntime::NodeJs,
self.project().encryption_key(),
)) ))
} }
...@@ -450,6 +452,7 @@ impl PagesProject { ...@@ -450,6 +452,7 @@ impl PagesProject {
self.project().next_mode(), self.project().next_mode(),
self.project().next_config(), self.project().next_config(),
NextRuntime::Edge, NextRuntime::Edge,
self.project().encryption_key(),
)) ))
} }
...@@ -464,6 +467,7 @@ impl PagesProject { ...@@ -464,6 +467,7 @@ impl PagesProject {
self.project().next_mode(), self.project().next_mode(),
self.project().next_config(), self.project().next_config(),
NextRuntime::NodeJs, NextRuntime::NodeJs,
self.project().encryption_key(),
)) ))
} }
...@@ -478,6 +482,7 @@ impl PagesProject { ...@@ -478,6 +482,7 @@ impl PagesProject {
self.project().next_mode(), self.project().next_mode(),
self.project().next_config(), self.project().next_config(),
NextRuntime::Edge, NextRuntime::Edge,
self.project().encryption_key(),
)) ))
} }
...@@ -492,6 +497,7 @@ impl PagesProject { ...@@ -492,6 +497,7 @@ impl PagesProject {
self.project().next_mode(), self.project().next_mode(),
self.project().next_config(), self.project().next_config(),
NextRuntime::NodeJs, NextRuntime::NodeJs,
self.project().encryption_key(),
)) ))
} }
...@@ -508,6 +514,7 @@ impl PagesProject { ...@@ -508,6 +514,7 @@ impl PagesProject {
self.project().next_mode(), self.project().next_mode(),
self.project().next_config(), self.project().next_config(),
NextRuntime::Edge, NextRuntime::Edge,
self.project().encryption_key(),
)) ))
} }
......
...@@ -691,6 +691,11 @@ impl Project { ...@@ -691,6 +691,11 @@ impl Project {
*self.js_config *self.js_config
} }
#[turbo_tasks::function]
pub(super) fn encryption_key(&self) -> Vc<RcStr> {
Vc::cell(self.encryption_key.clone())
}
#[turbo_tasks::function] #[turbo_tasks::function]
pub(super) async fn should_create_webpack_stats(&self) -> Result<Vc<bool>> { pub(super) async fn should_create_webpack_stats(&self) -> Result<Vc<bool>> {
Ok(Vc::cell( Ok(Vc::cell(
...@@ -1122,6 +1127,7 @@ impl Project { ...@@ -1122,6 +1127,7 @@ impl Project {
self.next_mode(), self.next_mode(),
self.next_config(), self.next_config(),
NextRuntime::Edge, NextRuntime::Edge,
self.encryption_key(),
), ),
get_edge_resolve_options_context( get_edge_resolve_options_context(
self.project_path(), self.project_path(),
...@@ -1207,6 +1213,7 @@ impl Project { ...@@ -1207,6 +1213,7 @@ impl Project {
self.next_mode(), self.next_mode(),
self.next_config(), self.next_config(),
NextRuntime::NodeJs, NextRuntime::NodeJs,
self.encryption_key(),
), ),
get_server_resolve_options_context( get_server_resolve_options_context(
self.project_path(), self.project_path(),
...@@ -1261,6 +1268,7 @@ impl Project { ...@@ -1261,6 +1268,7 @@ impl Project {
self.next_mode(), self.next_mode(),
self.next_config(), self.next_config(),
NextRuntime::Edge, NextRuntime::Edge,
self.encryption_key(),
), ),
get_edge_resolve_options_context( get_edge_resolve_options_context(
self.project_path(), self.project_path(),
......
...@@ -228,6 +228,7 @@ pub async fn get_client_module_options_context( ...@@ -228,6 +228,7 @@ pub async fn get_client_module_options_context(
ty: Value<ClientContextType>, ty: Value<ClientContextType>,
mode: Vc<NextMode>, mode: Vc<NextMode>,
next_config: Vc<NextConfig>, next_config: Vc<NextConfig>,
encryption_key: ResolvedVc<RcStr>,
) -> Result<Vc<ModuleOptionsContext>> { ) -> Result<Vc<ModuleOptionsContext>> {
let next_mode = mode.await?; let next_mode = mode.await?;
let resolve_options_context = get_client_resolve_options_context( let resolve_options_context = get_client_resolve_options_context(
...@@ -283,9 +284,11 @@ pub async fn get_client_module_options_context( ...@@ -283,9 +284,11 @@ pub async fn get_client_module_options_context(
let target_browsers = env.runtime_versions(); let target_browsers = env.runtime_versions();
let mut next_client_rules = let mut next_client_rules =
get_next_client_transforms_rules(next_config, ty.into_value(), mode, false).await?; get_next_client_transforms_rules(next_config, ty.into_value(), mode, false, encryption_key)
.await?;
let foreign_next_client_rules = let foreign_next_client_rules =
get_next_client_transforms_rules(next_config, ty.into_value(), mode, true).await?; get_next_client_transforms_rules(next_config, ty.into_value(), mode, true, encryption_key)
.await?;
let additional_rules: Vec<ModuleRule> = vec![ let additional_rules: Vec<ModuleRule> = vec![
get_swc_ecma_transform_plugin_rule(next_config, project_path).await?, get_swc_ecma_transform_plugin_rule(next_config, project_path).await?,
get_relay_transform_rule(next_config, project_path).await?, get_relay_transform_rule(next_config, project_path).await?,
......
use anyhow::Result; use anyhow::Result;
use next_custom_transforms::transforms::strip_page_exports::ExportFilter; use next_custom_transforms::transforms::strip_page_exports::ExportFilter;
use turbo_tasks::Vc; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc};
use turbopack::module_options::ModuleRule; use turbopack::module_options::ModuleRule;
use crate::{ use crate::{
...@@ -27,6 +28,7 @@ pub async fn get_next_client_transforms_rules( ...@@ -27,6 +28,7 @@ pub async fn get_next_client_transforms_rules(
context_ty: ClientContextType, context_ty: ClientContextType,
mode: Vc<NextMode>, mode: Vc<NextMode>,
foreign_code: bool, foreign_code: bool,
encryption_key: ResolvedVc<RcStr>,
) -> Result<Vec<ModuleRule>> { ) -> Result<Vec<ModuleRule>> {
let mut rules = vec![]; let mut rules = vec![];
...@@ -73,6 +75,7 @@ pub async fn get_next_client_transforms_rules( ...@@ -73,6 +75,7 @@ pub async fn get_next_client_transforms_rules(
is_app_dir = true; is_app_dir = true;
rules.push(get_server_actions_transform_rule( rules.push(get_server_actions_transform_rule(
ActionsTransform::Client, ActionsTransform::Client,
encryption_key,
enable_mdx_rs, enable_mdx_rs,
dynamic_io_enabled, dynamic_io_enabled,
cache_kinds, cache_kinds,
......
...@@ -419,14 +419,27 @@ pub async fn get_server_module_options_context( ...@@ -419,14 +419,27 @@ pub async fn get_server_module_options_context(
mode: Vc<NextMode>, mode: Vc<NextMode>,
next_config: Vc<NextConfig>, next_config: Vc<NextConfig>,
next_runtime: NextRuntime, next_runtime: NextRuntime,
encryption_key: ResolvedVc<RcStr>,
) -> Result<Vc<ModuleOptionsContext>> { ) -> Result<Vc<ModuleOptionsContext>> {
let next_mode = mode.await?; let next_mode = mode.await?;
let mut next_server_rules = let mut next_server_rules = get_next_server_transforms_rules(
get_next_server_transforms_rules(next_config, ty.into_value(), mode, false, next_runtime) next_config,
.await?; ty.into_value(),
let mut foreign_next_server_rules = mode,
get_next_server_transforms_rules(next_config, ty.into_value(), mode, true, next_runtime) false,
.await?; next_runtime,
encryption_key,
)
.await?;
let mut foreign_next_server_rules = get_next_server_transforms_rules(
next_config,
ty.into_value(),
mode,
true,
next_runtime,
encryption_key,
)
.await?;
let mut internal_custom_rules = get_next_server_internal_transforms_rules( let mut internal_custom_rules = get_next_server_internal_transforms_rules(
ty.into_value(), ty.into_value(),
next_config.mdx_rs().await?.is_some(), next_config.mdx_rs().await?.is_some(),
......
use anyhow::Result; use anyhow::Result;
use next_custom_transforms::transforms::strip_page_exports::ExportFilter; use next_custom_transforms::transforms::strip_page_exports::ExportFilter;
use turbo_tasks::Vc; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc};
use turbopack::module_options::ModuleRule; use turbopack::module_options::ModuleRule;
use crate::{ use crate::{
...@@ -30,6 +31,7 @@ pub async fn get_next_server_transforms_rules( ...@@ -30,6 +31,7 @@ pub async fn get_next_server_transforms_rules(
mode: Vc<NextMode>, mode: Vc<NextMode>,
foreign_code: bool, foreign_code: bool,
next_runtime: NextRuntime, next_runtime: NextRuntime,
encryption_key: ResolvedVc<RcStr>,
) -> Result<Vec<ModuleRule>> { ) -> Result<Vec<ModuleRule>> {
let mut rules = vec![]; let mut rules = vec![];
...@@ -90,6 +92,7 @@ pub async fn get_next_server_transforms_rules( ...@@ -90,6 +92,7 @@ pub async fn get_next_server_transforms_rules(
// need to apply to foreign code too // need to apply to foreign code too
rules.push(get_server_actions_transform_rule( rules.push(get_server_actions_transform_rule(
ActionsTransform::Client, ActionsTransform::Client,
encryption_key,
mdx_rs, mdx_rs,
dynamic_io_enabled, dynamic_io_enabled,
cache_kinds, cache_kinds,
...@@ -102,6 +105,7 @@ pub async fn get_next_server_transforms_rules( ...@@ -102,6 +105,7 @@ pub async fn get_next_server_transforms_rules(
ServerContextType::AppRSC { .. } => { ServerContextType::AppRSC { .. } => {
rules.push(get_server_actions_transform_rule( rules.push(get_server_actions_transform_rule(
ActionsTransform::Server, ActionsTransform::Server,
encryption_key,
mdx_rs, mdx_rs,
dynamic_io_enabled, dynamic_io_enabled,
cache_kinds, cache_kinds,
...@@ -114,6 +118,7 @@ pub async fn get_next_server_transforms_rules( ...@@ -114,6 +118,7 @@ pub async fn get_next_server_transforms_rules(
ServerContextType::AppRoute { .. } => { ServerContextType::AppRoute { .. } => {
rules.push(get_server_actions_transform_rule( rules.push(get_server_actions_transform_rule(
ActionsTransform::Server, ActionsTransform::Server,
encryption_key,
mdx_rs, mdx_rs,
dynamic_io_enabled, dynamic_io_enabled,
cache_kinds, cache_kinds,
......
...@@ -2,6 +2,7 @@ use anyhow::Result; ...@@ -2,6 +2,7 @@ use anyhow::Result;
use async_trait::async_trait; use async_trait::async_trait;
use next_custom_transforms::transforms::server_actions::{server_actions, Config}; use next_custom_transforms::transforms::server_actions::{server_actions, Config};
use swc_core::{common::FileName, ecma::ast::Program}; use swc_core::{common::FileName, ecma::ast::Program};
use turbo_rcstr::RcStr;
use turbo_tasks::ResolvedVc; use turbo_tasks::ResolvedVc;
use turbopack::module_options::{ModuleRule, ModuleRuleEffect}; use turbopack::module_options::{ModuleRule, ModuleRuleEffect};
use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext}; use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext};
...@@ -18,6 +19,7 @@ pub enum ActionsTransform { ...@@ -18,6 +19,7 @@ pub enum ActionsTransform {
/// Returns a rule which applies the Next.js Server Actions transform. /// Returns a rule which applies the Next.js Server Actions transform.
pub fn get_server_actions_transform_rule( pub fn get_server_actions_transform_rule(
transform: ActionsTransform, transform: ActionsTransform,
encryption_key: ResolvedVc<RcStr>,
enable_mdx_rs: bool, enable_mdx_rs: bool,
dynamic_io_enabled: bool, dynamic_io_enabled: bool,
cache_kinds: ResolvedVc<CacheKinds>, cache_kinds: ResolvedVc<CacheKinds>,
...@@ -25,6 +27,7 @@ pub fn get_server_actions_transform_rule( ...@@ -25,6 +27,7 @@ pub fn get_server_actions_transform_rule(
let transformer = let transformer =
EcmascriptInputTransform::Plugin(ResolvedVc::cell(Box::new(NextServerActions { EcmascriptInputTransform::Plugin(ResolvedVc::cell(Box::new(NextServerActions {
transform, transform,
encryption_key,
dynamic_io_enabled, dynamic_io_enabled,
cache_kinds, cache_kinds,
}) as _)); }) as _));
...@@ -40,6 +43,7 @@ pub fn get_server_actions_transform_rule( ...@@ -40,6 +43,7 @@ pub fn get_server_actions_transform_rule(
#[derive(Debug)] #[derive(Debug)]
struct NextServerActions { struct NextServerActions {
transform: ActionsTransform, transform: ActionsTransform,
encryption_key: ResolvedVc<RcStr>,
dynamic_io_enabled: bool, dynamic_io_enabled: bool,
cache_kinds: ResolvedVc<CacheKinds>, cache_kinds: ResolvedVc<CacheKinds>,
} }
...@@ -53,7 +57,7 @@ impl CustomTransformer for NextServerActions { ...@@ -53,7 +57,7 @@ impl CustomTransformer for NextServerActions {
Config { Config {
is_react_server_layer: matches!(self.transform, ActionsTransform::Server), is_react_server_layer: matches!(self.transform, ActionsTransform::Server),
dynamic_io_enabled: self.dynamic_io_enabled, dynamic_io_enabled: self.dynamic_io_enabled,
hash_salt: "".into(), hash_salt: self.encryption_key.await?.to_string(),
cache_kinds: self.cache_kinds.await?.clone_value(), cache_kinds: self.cache_kinds.await?.clone_value(),
}, },
ctx.comments.clone(), ctx.comments.clone(),
......
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