From 1af57126a0a4655aa627b190647c9d209f45bee9 Mon Sep 17 00:00:00 2001 From: Mex <44814932+MMexicann@users.noreply.github.com> Date: Sun, 15 Nov 2026 16:55:35 +0100 Subject: [PATCH] fix: reject incomplete Base64 character tails (#2152) * fix: reject incomplete Base64 character tails Reject a final six-bit fragment that cannot form a byte while preserving existing accepted encoding forms. * fix: reject Base64 data after padding Track padding before accumulator updates and cover the reviewed Zg==A case while retaining whitespace and repeated padding. --- crates/engine/src/cmd.rs | 42 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/crates/engine/src/cmd.rs b/crates/engine/src/cmd.rs index e3a50f689..59160df14 100644 --- a/crates/engine/src/cmd.rs +++ b/crates/engine/src/cmd.rs @@ -628,6 +628,7 @@ pub fn base64_decode(s: &str) -> Option> { let mut out = Vec::with_capacity(s.len() / 4 * 3); let mut acc = 0u32; let mut bits = 0; + let mut padded = false; for c in s.bytes() { let v = match c { b'A'..=b'Z' => c - b'A', @@ -635,9 +636,17 @@ pub fn base64_decode(s: &str) -> Option> { b'0'..=b'9' => c - b'0' + 52, b'+' | b'-' => 62, b'/' | b'_' => 63, - b'=' | b'\n' | b'\r' | b' ' => continue, + b'=' => { + padded = true; + continue; + } + b'\n' | b'\r' | b' ' => continue, _ => return None, } as u32; + // Padding ends the payload; no further data may be decoded. + if padded { + return None; + } acc = (acc << 6) | v; bits += 6; if bits >= 8 { @@ -645,13 +654,42 @@ pub fn base64_decode(s: &str) -> Option> { out.push(((acc >> bits) & 0xff) as u8); } } - Some(out) + // A trailing lone Base64 character cannot encode another byte. + (bits != 6).then_some(out) } #[cfg(test)] mod tests { use super::*; + #[test] + fn base64_rejects_a_single_character_tail() { + for (encoded, decoded) in [ + ("", b"".as_slice()), + ("Zg==", b"f"), + ("Zg", b"f"), + ("Zm8=", b"fo"), + ("Zm8", b"fo"), + (" Zm9v \r\n", b"foo"), + ("data:text/plain;base64,Zm9v", b"foo"), + ("+/8=", &[0xfb, 0xff]), + ("-_8=", &[0xfb, 0xff]), + ] { + assert_eq!(base64_decode(encoded).as_deref(), Some(decoded), "{encoded:?}"); + } + for encoded in ["A", "AAAAA", "Zm9vZ", " Zm9vZ \r\n", "data:text/plain;base64,Z"] { + assert!(base64_decode(encoded).is_none(), "{encoded:?}"); + } + } + + #[test] + fn base64_rejects_data_after_padding() { + assert_eq!(base64_decode("Zg== \r\n=="), Some(b"f".to_vec())); + for encoded in ["Zg==A", "Zg== Zm8=", "Zm8=A", "=Zg", "Zg==\r\nA", "data:text/plain;base64,Zg==A"] { + assert!(base64_decode(encoded).is_none(), "{encoded:?}"); + } + } + #[test] fn the_palette_skips_a_command_that_needs_a_value() { assert!(needs_arguments("{path}"));