From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 20 Sep 2018 17:45:32 -0700 Subject: can_create_window.patch diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc index c5e56bc15cfbf95f7564cc4d080243c48e585f20..30b945c417d04106a05a0d3dcb86e5df87845c0c 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc @@ -3163,6 +3163,38 @@ void RenderFrameHostImpl::CreateNewWindow( "frame_tree_node", frame_tree_node_->frame_tree_node_id(), "url", params->target_url.possibly_invalid_spec()); + scoped_refptr body; + if (params->body->has_object) { + body = new network::ResourceRequestBody; + std::vector elements; + for (const auto& iter : params->body->elements) { + network::DataElement element; + switch (iter->type) { + case network::DataElement::TYPE_BYTES: { + element.SetToBytes(iter->bytes.data(), iter->bytes.length()); + break; + } + case network::DataElement::TYPE_FILE: { + element.SetToFilePathRange(iter->path, iter->offset, iter->length, + iter->expected_modification_time); + break; + } + case network::DataElement::TYPE_BLOB: { + element.SetToBlobRange(iter->blob_uuid, iter->offset, iter->length); + break; + } + case network::DataElement::TYPE_DATA_PIPE: + default: + NOTREACHED(); + break; + } + elements.push_back(std::move(element)); + } + body->swap_elements(&elements); + body->set_identifier(params->body->identifier); + body->set_contains_sensitive_info(params->body->contains_sensitive_info); + } + bool no_javascript_access = false; // Filter out URLs to which navigation is disallowed from this context. @@ -3191,6 +3223,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_.GetURL(), params->window_container_type, params->target_url, params->referrer, params->frame_name, params->disposition, *params->features, + params->additional_features, body, effective_transient_activation_state, params->opener_suppressed, &no_javascript_access); diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc index e9cb49ebc81d7b9babe25a0a9c9ddfdf1db843d9..23776e0911f2315b60451d132ddd3cd002a241a2 100644 --- a/content/browser/security_exploit_browsertest.cc +++ b/content/browser/security_exploit_browsertest.cc @@ -300,6 +300,7 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest, mojom::CreateNewWindowParamsPtr params = mojom::CreateNewWindowParams::New(); params->target_url = GURL("about:blank"); + params->body = mojom::ResourceRequestBody::New(); pending_rfh->CreateNewWindow( std::move(params), base::BindOnce([](mojom::CreateNewWindowStatus, mojom::CreateNewWindowReplyPtr) {})); diff --git a/content/common/frame.mojom b/content/common/frame.mojom index c2ce967c17ac6a61b3aeb6e26f88212211f7a9f4..8c8d149b9c0de26e050b196a1a2a1bf6e953f121 100644 --- a/content/common/frame.mojom +++ b/content/common/frame.mojom @@ -12,6 +12,8 @@ import "content/public/common/resource_type.mojom"; import "content/public/common/resource_load_info.mojom"; import "content/public/common/transferrable_url_loader.mojom"; import "content/public/common/window_container_type.mojom"; +import "mojo/public/mojom/base/file_path.mojom"; +import "mojo/public/mojom/base/time.mojom"; import "mojo/public/mojom/base/string16.mojom"; import "mojo/public/mojom/base/unguessable_token.mojom"; import "services/network/public/mojom/url_loader.mojom"; @@ -168,6 +170,24 @@ interface FrameFactory { CreateFrame(int32 frame_routing_id, Frame& frame); }; +struct DataElement { + int32 type; + int64 length; + string bytes; + mojo_base.mojom.FilePath path; + int64 offset; + mojo_base.mojom.Time expected_modification_time; + url.mojom.Url filesystem_url; + string blob_uuid; +}; + +struct ResourceRequestBody { + bool has_object; + int64 identifier; + bool contains_sensitive_info; + array elements; +}; + struct CreateNewWindowParams { // True if this open request came in the context of a user gesture. // @@ -207,6 +227,10 @@ struct CreateNewWindowParams { // The window features to use for the new window. blink.mojom.WindowFeatures features; + + // Extra fields added by Electron. + array additional_features; + ResourceRequestBody body; }; // Operation result when the renderer asks the browser to create a new window. diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc index 8e652e4b66f08ff86c3184adf0ef9704fab0d11c..12411003ad4d54576117cc719bff804da1706170 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -453,6 +453,8 @@ bool ContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, + const std::vector& additional_features, + const scoped_refptr& body, bool user_gesture, bool opener_suppressed, bool* no_javascript_access) { diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h index bc2b501331e9d628c5285eee003ca3b55f3cb98f..89674a18276e34eebc0038e588ea4629a4eaca6c 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -169,6 +169,7 @@ class RenderFrameHost; class RenderProcessHost; class RenderViewHost; class ResourceContext; +class ResourceRequestBody; class ServiceManagerConnection; class SiteInstance; class SpeechRecognitionManagerDelegate; @@ -734,6 +735,8 @@ class CONTENT_EXPORT ContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, + const std::vector& additional_features, + const scoped_refptr& body, bool user_gesture, bool opener_suppressed, bool* no_javascript_access); diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 215c4a750f046939cb59ba8f53059eb4c3e35ef6..0e6199a8f594fd6c7384147c541e6c06a263f51e 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -78,6 +78,7 @@ #include "content/renderer/ime_event_guard.h" #include "content/renderer/internal_document_state_data.h" #include "content/renderer/loader/request_extra_data.h" +#include "content/renderer/loader/web_url_request_util.h" #include "content/renderer/media/audio/audio_device_factory.h" #include "content/renderer/media/stream/media_stream_device_observer.h" #include "content/renderer/media/video_capture_impl_manager.h" @@ -1421,6 +1422,46 @@ WebView* RenderViewImpl::CreateView(WebLocalFrame* creator, } params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features); + params->body = mojom::ResourceRequestBody::New(); + auto body = GetRequestBodyForWebURLRequest(request); + if (body) { + params->body->has_object = true; + params->body->identifier = body->identifier(); + params->body->contains_sensitive_info = body->contains_sensitive_info(); + for (const auto& element : *body->elements()) { + content::mojom::DataElementPtr ptr = content::mojom::DataElement::New(); + ptr->type = element.type(); + switch (element.type()) { + case network::DataElement::TYPE_BYTES: { + ptr->bytes = std::string(element.bytes(), element.length()); + break; + } + case network::DataElement::TYPE_FILE: { + ptr->path = element.path(); + ptr->offset = element.offset(); + ptr->length = element.length(); + ptr->expected_modification_time = element.expected_modification_time(); + break; + } + case network::DataElement::TYPE_BLOB: { + ptr->blob_uuid = element.blob_uuid(); + ptr->offset = element.offset(); + ptr->length = element.length(); + break; + } + case network::DataElement::TYPE_CHUNKED_DATA_PIPE: + case network::DataElement::TYPE_RAW_FILE: + case network::DataElement::TYPE_DATA_PIPE: + case network::DataElement::TYPE_UNKNOWN: + NOTREACHED(); + break; + } + params->body->elements.push_back(std::move(ptr)); + } + } else { + params->body->has_object = false; + } + // We preserve this information before sending the message since |params| is // moved on send. bool is_background_tab = diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.cc b/content/shell/browser/layout_test/layout_test_content_browser_client.cc index 7da9182635afa02226a0848d35d7ec372f4fc785..048e1126a31cf5bcaf9e0203af4a0c449db190f5 100644 --- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc +++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc @@ -279,6 +279,8 @@ bool LayoutTestContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, + const std::vector& additional_features, + const scoped_refptr& body, bool user_gesture, bool opener_suppressed, bool* no_javascript_access) { diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.h b/content/shell/browser/layout_test/layout_test_content_browser_client.h index c601d6e4b28dfb4216b2d7072ba1ac9dd7345f42..00bbd237ff8afd6567218363423538b9e38ae1b0 100644 --- a/content/shell/browser/layout_test/layout_test_content_browser_client.h +++ b/content/shell/browser/layout_test/layout_test_content_browser_client.h @@ -66,6 +66,8 @@ class LayoutTestContentBrowserClient : public ShellContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, + const std::vector& additional_features, + const scoped_refptr& body, bool user_gesture, bool opener_suppressed, bool* no_javascript_access) override;