From 5a1618a1bb5d432a646e273c00c49faac25dddf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Talbot?= <108630700+fetchfern@users.noreply.github.com> Date: Tue, 17 Nov 2026 17:49:22 -0500 Subject: [PATCH 1/2] chore(app): disable base64 intrinsics --- .../src/import/extract/mojang.rs | 90 +++++++++++++++++++ packages/app-lib/src/launcher/args.rs | 13 +++ packages/app-lib/src/launcher/mod.rs | 1 + 3 files changed, 104 insertions(+) diff --git a/apps/meta-generator/src/import/extract/mojang.rs b/apps/meta-generator/src/import/extract/mojang.rs index 6adb239c888..1d5a5c90b46 100644 --- a/apps/meta-generator/src/import/extract/mojang.rs +++ b/apps/meta-generator/src/import/extract/mojang.rs @@ -255,10 +255,42 @@ async fn make_version_manifest( .into_iter() .flat_map(crate::import::mojang::patch_library) .collect(); + disable_base64_intrinsics(&mut manifest); Ok((sha256, manifest)) } +// CVE-2026-114938 +const DISABLE_BASE64_INTRINSICS: &str = "-XX:-UseBASE64Intrinsics"; + +/// Disables base64 intrinsics for Java 17+ (CVE-2026-114938) +fn disable_base64_intrinsics(manifest: &mut mojang::VersionManifest) { + let requires_modern_java = manifest + .java_version + .as_ref() + // The CVE fix is only relevant for Java 17+, but the launcher will just + // use Java 17 for versions requiring Java 16. + .is_some_and(|java| java.major_version >= 16); + if !requires_modern_java { + return; + } + let Some(jvm_arguments) = manifest + .arguments + .as_mut() + .and_then(|arguments| arguments.get_mut(&mojang::ArgumentType::Jvm)) + else { + return; + }; + let already_present = jvm_arguments.iter().any(|argument| { + matches!(argument, mojang::Argument::Normal(value) if value == DISABLE_BASE64_INTRINSICS) + }); + if !already_present { + jvm_arguments.push(mojang::Argument::Normal( + DISABLE_BASE64_INTRINSICS.to_string(), + )); + } +} + #[cfg(test)] mod tests { use super::*; @@ -336,4 +368,62 @@ mod tests { ); assert!(select_versions(Vec::new(), &HashSet::new()).is_err()); } + + fn manifest(java_major_version: u32) -> mojang::VersionManifest { + serde_json::from_value(serde_json::json!({ + "arguments": { + "game": [], + "jvm": ["-cp", "${classpath}"] + }, + "assetIndex": { + "id": "1", + "sha1": Sha1::from_digest(b"assets").to_string(), + "size": 1, + "totalSize": 1, + "url": "https://example.com/assets.json" + }, + "assets": "1", + "downloads": {}, + "id": "test", + "javaVersion": { + "component": "java-runtime", + "majorVersion": java_major_version + }, + "libraries": [], + "mainClass": "net.minecraft.client.main.Main", + "minimumLauncherVersion": 21, + "releaseTime": "2026-01-01T00:00:00Z", + "time": "2026-01-01T00:00:00Z", + "type": "release" + })) + .unwrap() + } + + fn jvm_arguments(manifest: &mojang::VersionManifest) -> Vec { + manifest.arguments.as_ref().unwrap()[&mojang::ArgumentType::Jvm] + .iter() + .filter_map(|argument| match argument { + mojang::Argument::Normal(value) => Some(value.clone()), + mojang::Argument::Ruled { .. } => None, + }) + .collect() + } + + #[test] + fn base64_intrinsics_disabled_once_for_modern_java() { + let mut manifest = manifest(21); + disable_base64_intrinsics(&mut manifest); + disable_base64_intrinsics(&mut manifest); + assert_eq!( + jvm_arguments(&manifest), + ["-cp", "${classpath}", DISABLE_BASE64_INTRINSICS] + ); + } + + #[test] + fn base64_intrinsics_flag_skipped_for_java_8() { + let mut manifest = manifest(8); + disable_base64_intrinsics(&mut manifest); + assert_eq!(jvm_arguments(&manifest), ["-cp", "${classpath}"]); + } } diff --git a/packages/app-lib/src/launcher/args.rs b/packages/app-lib/src/launcher/args.rs index 3906ad26393..a59dcc79f82 100644 --- a/packages/app-lib/src/launcher/args.rs +++ b/packages/app-lib/src/launcher/args.rs @@ -114,6 +114,7 @@ pub fn get_jvm_arguments( memory: MemorySettings, custom_args: Vec, java_arch: &str, + java_major_version: u32, quick_play_type: &QuickPlayType, quick_play_version: QuickPlayVersion, log_config: Option<&LoggingConfiguration>, @@ -192,6 +193,14 @@ pub fn get_jvm_arguments( ]); } + if java_major_version >= MIN_JAVA_FOR_BASE64_INTRINSICS_FLAG + && !parsed_arguments + .iter() + .any(|arg| arg == DISABLE_BASE64_INTRINSICS) + { + parsed_arguments.push(DISABLE_BASE64_INTRINSICS.to_string()); + } + for arg in custom_args { if !arg.is_empty() { parsed_arguments.push(arg); @@ -201,6 +210,10 @@ pub fn get_jvm_arguments( Ok(parsed_arguments) } +// CVE-2026-114938 +const DISABLE_BASE64_INTRINSICS: &str = "-XX:-UseBASE64Intrinsics"; +const MIN_JAVA_FOR_BASE64_INTRINSICS_FLAG: u32 = 17; + fn parse_jvm_argument( mut argument: String, natives_path: &Path, diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs index 229bb3703a8..4f96ccc4ac3 100644 --- a/packages/app-lib/src/launcher/mod.rs +++ b/packages/app-lib/src/launcher/mod.rs @@ -1150,6 +1150,7 @@ pub async fn launch_minecraft( *memory, Vec::from(java_args), &java_version.architecture, + java_version.parsed_version, &quick_play_type, quick_play_version, version_info From 7151c58fc6851f1e946f4a9dc9a2add5f867feb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Talbot?= <108630700+fetchfern@users.noreply.github.com> Date: Wed, 18 Nov 2026 10:55:32 -0500 Subject: [PATCH 2/2] chore: rm tests --- .../src/import/extract/mojang.rs | 58 ------------------- 1 file changed, 58 deletions(-) diff --git a/apps/meta-generator/src/import/extract/mojang.rs b/apps/meta-generator/src/import/extract/mojang.rs index 1d5a5c90b46..5c4c75f0376 100644 --- a/apps/meta-generator/src/import/extract/mojang.rs +++ b/apps/meta-generator/src/import/extract/mojang.rs @@ -368,62 +368,4 @@ mod tests { ); assert!(select_versions(Vec::new(), &HashSet::new()).is_err()); } - - fn manifest(java_major_version: u32) -> mojang::VersionManifest { - serde_json::from_value(serde_json::json!({ - "arguments": { - "game": [], - "jvm": ["-cp", "${classpath}"] - }, - "assetIndex": { - "id": "1", - "sha1": Sha1::from_digest(b"assets").to_string(), - "size": 1, - "totalSize": 1, - "url": "https://example.com/assets.json" - }, - "assets": "1", - "downloads": {}, - "id": "test", - "javaVersion": { - "component": "java-runtime", - "majorVersion": java_major_version - }, - "libraries": [], - "mainClass": "net.minecraft.client.main.Main", - "minimumLauncherVersion": 21, - "releaseTime": "2026-01-01T00:00:00Z", - "time": "2026-01-01T00:00:00Z", - "type": "release" - })) - .unwrap() - } - - fn jvm_arguments(manifest: &mojang::VersionManifest) -> Vec { - manifest.arguments.as_ref().unwrap()[&mojang::ArgumentType::Jvm] - .iter() - .filter_map(|argument| match argument { - mojang::Argument::Normal(value) => Some(value.clone()), - mojang::Argument::Ruled { .. } => None, - }) - .collect() - } - - #[test] - fn base64_intrinsics_disabled_once_for_modern_java() { - let mut manifest = manifest(21); - disable_base64_intrinsics(&mut manifest); - disable_base64_intrinsics(&mut manifest); - assert_eq!( - jvm_arguments(&manifest), - ["-cp", "${classpath}", DISABLE_BASE64_INTRINSICS] - ); - } - - #[test] - fn base64_intrinsics_flag_skipped_for_java_8() { - let mut manifest = manifest(8); - disable_base64_intrinsics(&mut manifest); - assert_eq!(jvm_arguments(&manifest), ["-cp", "${classpath}"]); - } }