mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-07-23 09:22:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Fix CSP navigation request blocking

Browse source 
Corresponds to 304782ca57
This commit is contained in:
Sam Atkins 2025-02-10 17:29:59 +00:00
parent a144481e6c
commit a01a3b18f5
Notes: github-actions[bot] 2025-02-12 17:28:01 +00:00
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibWeb/DOM/Document.cpp
View file

@ -3710,7 +3710,7 @@ HTML::SourceSnapshotParams Document::snapshot_source_snapshot_params() const
// fetch client // fetch client
// sourceDocument's relevant settings object // sourceDocument's relevant settings object
// source policy container // source policy container
// sourceDocument's policy container // a clone of sourceDocument's policy container
return HTML::SourceSnapshotParams { return HTML::SourceSnapshotParams {
.has_transient_activation = as<HTML::Window>(HTML::relevant_global_object(*this)).has_transient_activation(), .has_transient_activation = as<HTML::Window>(HTML::relevant_global_object(*this)).has_transient_activation(),

12
Libraries/LibWeb/HTML/Navigable.cpp
View file

@ -792,6 +792,7 @@ static WebIDL::ExceptionOr<Navigable::NavigationParamsVariant> create_navigation
// mode: "navigate" // mode: "navigate"
// referrer: entry's document state's request referrer // referrer: entry's document state's request referrer
// referrer policy: entry's document state's request referrer policy // referrer policy: entry's document state's request referrer policy
// policy container: sourceSnapshotParams's source policy container
auto request = Fetch::Infrastructure::Request::create(vm); auto request = Fetch::Infrastructure::Request::create(vm);
request->set_url(entry->url()); request->set_url(entry->url());
request->set_client(source_snapshot_params.fetch_client); request->set_client(source_snapshot_params.fetch_client);
@ -802,6 +803,7 @@ static WebIDL::ExceptionOr<Navigable::NavigationParamsVariant> create_navigation
request->set_replaces_client_id(active_document.relevant_settings_object().id); request->set_replaces_client_id(active_document.relevant_settings_object().id);
request->set_mode(Fetch::Infrastructure::Request::Mode::Navigate); request->set_mode(Fetch::Infrastructure::Request::Mode::Navigate);
request->set_referrer(entry->document_state()->request_referrer()); request->set_referrer(entry->document_state()->request_referrer());
request->set_policy_container(source_snapshot_params.source_policy_container);
// 4. If documentResource is a POST resource, then: // 4. If documentResource is a POST resource, then:
if (auto* post_resource = document_resource.get_pointer<POSTResource>()) { if (auto* post_resource = document_resource.get_pointer<POSTResource>()) {
@ -1460,10 +1462,10 @@ WebIDL::ExceptionOr<void> Navigable::navigate(NavigateParams params)
// 19. If url's scheme is "javascript", then: // 19. If url's scheme is "javascript", then:
if (url.scheme() == "javascript"sv) { if (url.scheme() == "javascript"sv) {
// 1. Queue a global task on the navigation and traversal task source given navigable's active window to navigate to a javascript: URL given navigable, url, historyHandling, initiatorOriginSnapshot, userInvolvement, and cspNavigationType. // 1. Queue a global task on the navigation and traversal task source given navigable's active window to navigate to a javascript: URL given navigable, url, historyHandling, sourceSnapshotParams, initiatorOriginSnapshot, userInvolvement, and cspNavigationType.
VERIFY(active_window()); VERIFY(active_window());
queue_global_task(Task::Source::NavigationAndTraversal, *active_window(), GC::create_function(heap(), [this, url, history_handling, initiator_origin_snapshot, user_involvement, csp_navigation_type, navigation_id] { queue_global_task(Task::Source::NavigationAndTraversal, *active_window(), GC::create_function(heap(), [this, url, history_handling, source_snapshot_params, initiator_origin_snapshot, user_involvement, csp_navigation_type, navigation_id] {
navigate_to_a_javascript_url(url, to_history_handling_behavior(history_handling), initiator_origin_snapshot, user_involvement, csp_navigation_type, navigation_id); navigate_to_a_javascript_url(url, to_history_handling_behavior(history_handling), source_snapshot_params, initiator_origin_snapshot, user_involvement, csp_navigation_type, navigation_id);
})); }));
// 2. Return. // 2. Return.
@ -1810,7 +1812,7 @@ GC::Ptr<DOM::Document> Navigable::evaluate_javascript_url(URL::URL const& url, U
} }
// https://html.spec.whatwg.org/multipage/browsing-the-web.html#navigate-to-a-javascript:-url // https://html.spec.whatwg.org/multipage/browsing-the-web.html#navigate-to-a-javascript:-url
void Navigable::navigate_to_a_javascript_url(URL::URL const& url, HistoryHandlingBehavior history_handling, URL::Origin const& initiator_origin, UserNavigationInvolvement user_involvement, CSPNavigationType csp_navigation_type, String navigation_id) void Navigable::navigate_to_a_javascript_url(URL::URL const& url, HistoryHandlingBehavior history_handling, SourceSnapshotParams, URL::Origin const& initiator_origin, UserNavigationInvolvement user_involvement, CSPNavigationType csp_navigation_type, String navigation_id)
{ {
// 1. Assert: historyHandling is "replace". // 1. Assert: historyHandling is "replace".
VERIFY(history_handling == HistoryHandlingBehavior::Replace); VERIFY(history_handling == HistoryHandlingBehavior::Replace);
@ -1822,7 +1824,7 @@ void Navigable::navigate_to_a_javascript_url(URL::URL const& url, HistoryHandlin
if (!initiator_origin.is_same_origin_domain(active_document()->origin())) if (!initiator_origin.is_same_origin_domain(active_document()->origin()))
return; return;
// FIXME: 4. Let request be a new request whose URL is url. // FIXME: 4. Let request be a new request whose URL is url and whose policy container is sourceSnapshotParams's source policy container.
// FIXME: 5. If the result of should navigation request of type be blocked by Content Security Policy? given request and cspNavigationType is "Blocked", then return. // FIXME: 5. If the result of should navigation request of type be blocked by Content Security Policy? given request and cspNavigationType is "Blocked", then return.
(void)csp_navigation_type; (void)csp_navigation_type;

2
Libraries/LibWeb/HTML/Navigable.h
View file

@ -154,7 +154,7 @@ public:
WebIDL::ExceptionOr<void> navigate_to_a_fragment(URL::URL const&, HistoryHandlingBehavior, UserNavigationInvolvement, GC::Ptr<DOM::Element> source_element, Optional<SerializationRecord> navigation_api_state, String navigation_id); WebIDL::ExceptionOr<void> navigate_to_a_fragment(URL::URL const&, HistoryHandlingBehavior, UserNavigationInvolvement, GC::Ptr<DOM::Element> source_element, Optional<SerializationRecord> navigation_api_state, String navigation_id);
GC::Ptr<DOM::Document> evaluate_javascript_url(URL::URL const&, URL::Origin const& new_document_origin, UserNavigationInvolvement, String navigation_id); GC::Ptr<DOM::Document> evaluate_javascript_url(URL::URL const&, URL::Origin const& new_document_origin, UserNavigationInvolvement, String navigation_id);
void navigate_to_a_javascript_url(URL::URL const&, HistoryHandlingBehavior, URL::Origin const& initiator_origin, UserNavigationInvolvement, CSPNavigationType csp_navigation_type, String navigation_id); void navigate_to_a_javascript_url(URL::URL const&, HistoryHandlingBehavior, SourceSnapshotParams, URL::Origin const& initiator_origin, UserNavigationInvolvement, CSPNavigationType csp_navigation_type, String navigation_id);
bool allowed_by_sandboxing_to_navigate(Navigable const& target, SourceSnapshotParams const&); bool allowed_by_sandboxing_to_navigate(Navigable const& target, SourceSnapshotParams const&);