From bd2dc2aab94c95bb795d3d9156f61609669c9e78 Mon Sep 17 00:00:00 2001 From: ldm0 Date: Fri, 25 Sep 2026 09:58:07 +0800 Subject: [PATCH] fix(forms): honor Get action URL submission rules --- .../native_bridge/element/forms/submission.rs | 4 +- .../navigation/element_navigation.rs | 281 +++++++++--------- .../script_vm/tests/javascript_url_origin.rs | 3 +- 3 files changed, 147 insertions(+), 141 deletions(-) diff --git a/moli-renderer-v8/src/native_bridge/element/forms/submission.rs b/moli-renderer-v8/src/native_bridge/element/forms/submission.rs index d0ea853a2d6..24bdd6059d9 100644 --- a/moli-renderer-v8/src/native_bridge/element/forms/submission.rs +++ b/moli-renderer-v8/src/native_bridge/element/forms/submission.rs @@ -1003,9 +1003,7 @@ fn build_form_submission_request( if matches!(resolved_url.scheme(), "ftp" | "javascript") || (resolved_url.scheme() == "data" && method == "post") { - return Some(FormSubmissionMethod::Get { - resolved_url: resolved_url.to_string(), - }); + return Some(FormSubmissionMethod::Get { resolved_url }); } if method == "post" { let encoded = serialize_submission_body(scope, &entries, enctype?, submission_encoding)?; diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/element_navigation.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/element_navigation.rs index 8395ea13ab5..e13408d59ad 100644 --- a/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/element_navigation.rs +++ b/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/element_navigation.rs @@ -826,6 +826,151 @@ fn post_form_navigation_uses_target_intrinsic_form_data_constructor() { } } +#[tokio::test] +async fn form_action_scheme_selects_query_mutation_or_post_resource() { + for action in [ + "http://form-action.test/target?original=1#fragment", + "https://form-action.test/target?original=1#fragment", + "ftp://form-action.test/target?original=1#fragment", + "data:text/plain,payload?original=1#fragment", + "javascript:void('original?query#fragment')", + ] { + for method in ["get", "post"] { + for use_submitter in [false, true] { + let mut vm = + new_storage_page_task_executor_test_vm("https://form-action.test/source"); + vm.eval(&format!( + r#" + globalThis.formDataEvents = 0; + const form = document.createElement('form'); + form.innerHTML = ''; + form.onformdata = event => {{ + ++formDataEvents; + event.formData.append('from', 'event'); + }}; + document.body.append(form); + if ({use_submitter}) {{ + form.action = '/wrong'; + form.method = {method:?} === 'get' ? 'post' : 'get'; + const button = form.querySelector('button'); + button.formAction = {action:?}; button.formMethod = {method:?}; + form.requestSubmit(button); + }} else {{ + form.action = {action:?}; form.method = {method:?}; form.submit(); + }} + form.action = '/changed'; form.method = 'dialog'; + form.querySelector('input').value = 'changed'; + "# + )) + .unwrap(); + assert_eq!(vm.eval("formDataEvents").unwrap(), "1"); + assert!( + vm.run_one_dom_manipulation_body_for_test( + crate::runtime::PageDomManipulationTestFamily::FormNavigation, + ) + .await + .unwrap() + ); + let request = vm.take_pending_location_navigation_with_seed().unwrap(); + let mut expected_url = Url::parse(action).unwrap(); + let mutates_query = + method == "get" && matches!(expected_url.scheme(), "http" | "https" | "data"); + let posts_body = + method == "post" && matches!(expected_url.scheme(), "http" | "https"); + if mutates_query { + expected_url.set_query(Some("value=a+b&from=event")); + } + assert_eq!( + request.url, expected_url, + "{action}/{method}/{use_submitter}" + ); + assert_eq!( + request.request_method, + if posts_body { "POST" } else { "GET" } + ); + assert_eq!( + request.request_body.as_deref(), + posts_body.then_some(b"value=a+b&from=event".as_slice()) + ); + assert_eq!( + request.request_headers, + if posts_body { + vec![( + "Content-Type".to_owned(), + "application/x-www-form-urlencoded".to_owned(), + )] + } else { + vec![] + } + ); + } + } + } +} + +#[tokio::test] +async fn javascript_form_actions_execute_without_serializing_the_entry_list() { + for method in ["get", "post"] { + for action in [ + "javascript:parent.formResult='no query';void 0", + "javascript:parent.formResult='?original#fragment';void 0", + ] { + let loader = static_http_loader([]); + let mut vm = new_storage_page_task_executor_test_vm_with_loader( + "https://form-action.test/source", + &loader, + ); + vm.eval( + r#" + globalThis.frame = document.createElement('iframe'); frame.name = 'target'; + document.body.append(frame); + "#, + ) + .unwrap(); + vm.drain_ready_page_task_executor_turns_for_setup(&loader, 100) + .await + .unwrap(); + vm.eval(&format!( + r#" + globalThis.formResult = null; + globalThis.formDataEvents = 0; + const form = document.createElement('form'); + form.innerHTML = ''; + form.method = {method:?}; form.action = {action:?}; form.target = 'target'; + form.onformdata = event => {{ + ++formDataEvents; event.formData.append('event', 'ignored'); + }}; + document.body.append(form); form.submit(); + globalThis.afterSubmit = formResult; + "# + )) + .unwrap(); + assert_eq!(vm.eval("String(afterSubmit)").unwrap(), "null"); + advance_page_task_executor_until_eval_equals( + &mut vm, + &loader, + "String(formResult !== null)", + "true", + &format!("{method}: {action}"), + ) + .await; + assert_eq!( + vm.eval("formResult").unwrap(), + if action.contains('?') { + "?original#fragment" + } else { + "no query" + } + ); + assert_eq!(vm.eval("formDataEvents").unwrap(), "1"); + assert_eq!( + vm.eval("frame.contentWindow.location.href").unwrap(), + "about:blank" + ); + } + } +} + #[tokio::test] async fn cross_origin_planned_form_navigation_does_not_expose_source_to_target() { for method in ["get", "post"] { @@ -1436,142 +1581,6 @@ async fn navigation_entries_and_events_follow_document_initialness() { } } -#[test] -fn form_action_scheme_selects_query_mutation_or_post_resource() { - for action in [ - "http://form-action.test/target?original=1#fragment", - "https://form-action.test/target?original=1#fragment", - "ftp://form-action.test/target?original=1#fragment", - "data:text/plain,payload?original=1#fragment", - "javascript:void('original?query#fragment')", - ] { - for method in ["get", "post"] { - for use_submitter in [false, true] { - let mut vm = - new_storage_page_task_executor_test_vm("https://form-action.test/source"); - vm.eval(&format!( - r#" - globalThis.formDataEvents = 0; - const form = document.createElement('form'); - form.innerHTML = ''; - form.onformdata = event => {{ - ++formDataEvents; - event.formData.append('from', 'event'); - }}; - document.body.append(form); - if ({use_submitter}) {{ - form.action = '/wrong'; - form.method = {method:?} === 'get' ? 'post' : 'get'; - const button = form.querySelector('button'); - button.formAction = {action:?}; button.formMethod = {method:?}; - form.requestSubmit(button); - }} else {{ - form.action = {action:?}; form.method = {method:?}; form.submit(); - }} - form.action = '/changed'; form.method = 'dialog'; - form.querySelector('input').value = 'changed'; - "# - )) - .unwrap(); - assert_eq!(vm.eval("formDataEvents").unwrap(), "1"); - let request = vm.take_pending_location_navigation_with_seed().unwrap(); - let mut expected_url = Url::parse(action).unwrap(); - let mutates_query = - method == "get" && matches!(expected_url.scheme(), "http" | "https" | "data"); - let posts_body = - method == "post" && matches!(expected_url.scheme(), "http" | "https"); - if mutates_query { - expected_url.set_query(Some("value=a+b&from=event")); - } - assert_eq!( - request.url, expected_url, - "{action}/{method}/{use_submitter}" - ); - assert_eq!( - request.request_method, - if posts_body { "POST" } else { "GET" } - ); - assert_eq!( - request.request_body.as_deref(), - posts_body.then_some(b"value=a+b&from=event".as_slice()) - ); - assert_eq!( - request.request_headers, - if posts_body { - vec![( - "Content-Type".to_owned(), - "application/x-www-form-urlencoded".to_owned(), - )] - } else { - vec![] - } - ); - } - } - } -} - -#[tokio::test] -async fn javascript_form_actions_execute_without_serializing_the_entry_list() { - for method in ["get", "post"] { - for action in [ - "javascript:parent.formResult='no query';void 0", - "javascript:parent.formResult='?original#fragment';void 0", - ] { - let loader = static_http_loader([]); - let mut vm = new_storage_page_task_executor_test_vm_with_loader( - "https://form-action.test/source", - &loader, - ); - vm.eval( - r#" - globalThis.frame = document.createElement('iframe'); frame.name = 'target'; - document.body.append(frame); - "#, - ) - .unwrap(); - vm.drain_ready_page_task_executor_turns_for_setup(&loader, 100) - .await - .unwrap(); - vm.eval(&format!( - r#" - globalThis.formResult = null; - globalThis.formDataEvents = 0; - const form = document.createElement('form'); - form.innerHTML = ''; - form.method = {method:?}; form.action = {action:?}; form.target = 'target'; - form.onformdata = event => {{ - ++formDataEvents; event.formData.append('event', 'ignored'); - }}; - document.body.append(form); form.submit(); - "# - )) - .unwrap(); - advance_page_task_executor_until_eval_equals( - &mut vm, - &loader, - "String(formResult !== null)", - "true", - &format!("{method}: {action}"), - ) - .await; - assert_eq!( - vm.eval("formResult").unwrap(), - if action.contains('?') { - "?original#fragment" - } else { - "no query" - } - ); - assert_eq!(vm.eval("formDataEvents").unwrap(), "1"); - assert_eq!( - vm.eval("frame.contentWindow.location.href").unwrap(), - "about:blank" - ); - } - } -} - #[cfg(feature = "devtools")] #[test] fn location_assign_before_complete_load_respects_user_activation() { diff --git a/moli-renderer-v8/src/script_vm/tests/javascript_url_origin.rs b/moli-renderer-v8/src/script_vm/tests/javascript_url_origin.rs index 3e2e5068fc3..f1f473b2479 100644 --- a/moli-renderer-v8/src/script_vm/tests/javascript_url_origin.rs +++ b/moli-renderer-v8/src/script_vm/tests/javascript_url_origin.rs @@ -65,8 +65,7 @@ async fn assert_child_javascript_origin( globalThis.messages = []; onmessage = event => messages.push(event.data); globalThis.originProbeDone = false; - // Keep GET form serialization from turning an appended query into code. - const code = "javascript:parent.postMessage('ran', '*');void 0;//"; + const code = "javascript:parent.postMessage('ran', '*');void 0"; {navigation} {after_navigation} requestIdleCallback(() => originProbeDone = true);