reject empty base64 image inputs

This commit is contained in:
Roy Han
2026-05-24 20:17:37 -07:00
parent 03e6c5f600
commit b88e4ec7bc
7 changed files with 238 additions and 24 deletions
+1
View File
@@ -5,6 +5,7 @@ pub(crate) const METHOD_NOT_FOUND_ERROR_CODE: i64 = -32601;
pub const INVALID_PARAMS_ERROR_CODE: i64 = -32602;
pub(crate) const INTERNAL_ERROR_CODE: i64 = -32603;
pub(crate) const OVERLOADED_ERROR_CODE: i64 = -32001;
pub(crate) const EMPTY_BASE64_IMAGE_INPUT_ERROR_CODE: &str = "empty_base64_image_input";
pub const INPUT_TOO_LARGE_ERROR_CODE: &str = "input_too_large";
pub(crate) fn invalid_request(message: impl Into<String>) -> JSONRPCErrorError {
@@ -3,6 +3,7 @@ use crate::bespoke_event_handling::maybe_emit_hook_prompt_item_completed;
use crate::command_exec::CommandExecManager;
use crate::command_exec::StartCommandExecParams;
use crate::config_manager::ConfigManager;
use crate::error_code::EMPTY_BASE64_IMAGE_INPUT_ERROR_CODE;
use crate::error_code::INPUT_TOO_LARGE_ERROR_CODE;
use crate::error_code::invalid_params;
use crate::models::supported_models;
@@ -46,6 +46,14 @@ struct ThreadSettingsBuildParams {
personality: Option<Personality>,
}
fn is_empty_base64_image_input(item: &V2UserInput) -> bool {
matches!(
item,
V2UserInput::Image { url, .. }
if codex_protocol::models::is_empty_base64_image_data_url(url)
)
}
impl TurnRequestProcessor {
#[allow(clippy::too_many_arguments)]
pub(crate) fn new(
@@ -344,6 +352,14 @@ impl TurnRequestProcessor {
error
}
fn empty_base64_image_input_error() -> JSONRPCErrorError {
let mut error = invalid_params("Could not attach image: empty image data.");
error.data = Some(serde_json::json!({
"input_error_code": EMPTY_BASE64_IMAGE_INPUT_ERROR_CODE,
}));
error
}
fn validate_v2_input_limit(items: &[V2UserInput]) -> Result<(), JSONRPCErrorError> {
let actual_chars: usize = items.iter().map(V2UserInput::text_char_count).sum();
if actual_chars > MAX_USER_INPUT_TEXT_CHARS {
@@ -367,6 +383,11 @@ impl TurnRequestProcessor {
);
return Err(error);
}
if params.input.iter().any(is_empty_base64_image_input) {
let error = Self::empty_base64_image_input_error();
self.track_error_response(&request_id, &error, /*error_type*/ None);
return Err(error);
}
let (thread_id, thread) =
self.load_thread(&params.thread_id)
.await
@@ -740,6 +761,11 @@ impl TurnRequestProcessor {
);
return Err(error);
}
if params.input.iter().any(is_empty_base64_image_input) {
let error = Self::empty_base64_image_input_error();
self.track_error_response(request_id, &error, /*error_type*/ None);
return Err(error);
}
let mapped_items: Vec<CoreInputItem> = params
.input
@@ -954,6 +954,69 @@ async fn turn_start_rejects_combined_oversized_text_input() -> Result<()> {
Ok(())
}
#[tokio::test]
async fn turn_start_rejects_empty_base64_image_before_starting_turn() -> Result<()> {
let codex_home = TempDir::new()?;
create_config_toml(
codex_home.path(),
"http://localhost/unused",
"never",
&BTreeMap::from([(Feature::Personality, true)]),
)?;
let mut mcp = McpProcess::new(codex_home.path()).await?;
timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??;
let thread_req = mcp
.send_thread_start_request(ThreadStartParams {
model: Some("mock-model".to_string()),
..Default::default()
})
.await?;
let thread_resp: JSONRPCResponse = timeout(
DEFAULT_READ_TIMEOUT,
mcp.read_stream_until_response_message(RequestId::Integer(thread_req)),
)
.await??;
let ThreadStartResponse { thread, .. } = to_response::<ThreadStartResponse>(thread_resp)?;
let turn_req = mcp
.send_turn_start_request(TurnStartParams {
thread_id: thread.id,
input: vec![V2UserInput::Image {
detail: None,
url: "data:image/png;base64,".to_string(),
}],
..Default::default()
})
.await?;
let err: JSONRPCError = timeout(
DEFAULT_READ_TIMEOUT,
mcp.read_stream_until_error_message(RequestId::Integer(turn_req)),
)
.await??;
assert_eq!(err.error.code, INVALID_PARAMS_ERROR_CODE);
assert_eq!(
err.error.message,
"Could not attach image: empty image data."
);
let data = err.error.data.expect("expected structured error data");
assert_eq!(data["input_error_code"], "empty_base64_image_input");
let turn_started = tokio::time::timeout(
std::time::Duration::from_millis(250),
mcp.read_stream_until_notification_message("turn/started"),
)
.await;
assert!(
turn_started.is_err(),
"did not expect a turn/started notification for rejected input"
);
Ok(())
}
#[tokio::test]
async fn turn_start_rejects_invalid_permission_selection_before_starting_turn() -> Result<()> {
let codex_home = TempDir::new()?;