2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-21 00:30:26 +00:00
|
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
|
|
Date: Thu, 20 Sep 2018 17:45:32 -0700
|
|
|
|
Subject: can_create_window.patch
|
|
|
|
|
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
|
2019-01-12 01:00:43 +00:00
|
|
|
index a17ae7ca0c070aeb1e741f3db80f3bc71f36308d..86560af1b9e3861dbe4455403cf3af0f183fd6c7 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/content/browser/frame_host/render_frame_host_impl.cc
|
|
|
|
+++ b/content/browser/frame_host/render_frame_host_impl.cc
|
2019-01-12 01:00:43 +00:00
|
|
|
@@ -3333,6 +3333,38 @@ void RenderFrameHostImpl::CreateNewWindow(
|
2018-09-14 05:02:16 +00:00
|
|
|
"frame_tree_node", frame_tree_node_->frame_tree_node_id(), "url",
|
|
|
|
params->target_url.possibly_invalid_spec());
|
|
|
|
|
|
|
|
+ scoped_refptr<network::ResourceRequestBody> body;
|
|
|
|
+ if (params->body->has_object) {
|
|
|
|
+ body = new network::ResourceRequestBody;
|
|
|
|
+ std::vector<network::DataElement> 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.
|
2019-01-12 01:00:43 +00:00
|
|
|
@@ -3361,6 +3393,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
2018-09-14 05:02:16 +00:00
|
|
|
last_committed_origin_.GetURL(), params->window_container_type,
|
|
|
|
params->target_url, params->referrer, params->frame_name,
|
2018-09-21 00:30:26 +00:00
|
|
|
params->disposition, *params->features,
|
|
|
|
+ params->additional_features, body,
|
|
|
|
effective_transient_activation_state, params->opener_suppressed,
|
|
|
|
&no_javascript_access);
|
2018-09-14 05:02:16 +00:00
|
|
|
|
2018-09-14 18:03:43 +00:00
|
|
|
diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc
|
2019-01-12 01:00:43 +00:00
|
|
|
index 82af60872317fdaf16561c9f9adecb79ce82f610..bf72f1adf22e71ebcae50dd9fb1b88e8178a7767 100644
|
2018-09-14 18:03:43 +00:00
|
|
|
--- a/content/browser/security_exploit_browsertest.cc
|
|
|
|
+++ b/content/browser/security_exploit_browsertest.cc
|
2019-01-12 01:00:43 +00:00
|
|
|
@@ -357,6 +357,7 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
|
2018-09-14 18:03:43 +00:00
|
|
|
|
|
|
|
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) {}));
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
|
2019-01-12 01:00:43 +00:00
|
|
|
index 25346dc852e799a2562386a6207d2de31077695f..908a8676daeb753c1580f98e8babf203cfa5b719 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/content/common/frame.mojom
|
|
|
|
+++ b/content/common/frame.mojom
|
2018-09-21 00:30:26 +00:00
|
|
|
@@ -12,6 +12,8 @@ import "content/public/common/resource_type.mojom";
|
2018-09-14 05:02:16 +00:00
|
|
|
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";
|
2019-01-12 01:00:43 +00:00
|
|
|
@@ -178,6 +180,24 @@ interface FrameFactory {
|
2018-09-14 05:02:16 +00:00
|
|
|
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<DataElement> elements;
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
struct CreateNewWindowParams {
|
|
|
|
// True if this open request came in the context of a user gesture.
|
2018-09-21 00:30:26 +00:00
|
|
|
//
|
2019-01-12 01:00:43 +00:00
|
|
|
@@ -217,6 +237,10 @@ struct CreateNewWindowParams {
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
// The window features to use for the new window.
|
|
|
|
blink.mojom.WindowFeatures features;
|
|
|
|
+
|
|
|
|
+ // Extra fields added by Electron.
|
|
|
|
+ array<string> 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
|
2019-01-12 01:00:43 +00:00
|
|
|
index 6ed69effde7e7b269191788bedd4f98e3d778d67..abfb6afec00a691ea2ff27e7797921e3eb25d8ea 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/content/public/browser/content_browser_client.cc
|
|
|
|
+++ b/content/public/browser/content_browser_client.cc
|
2019-01-12 01:00:43 +00:00
|
|
|
@@ -460,6 +460,8 @@ bool ContentBrowserClient::CanCreateWindow(
|
2018-09-14 05:02:16 +00:00
|
|
|
const std::string& frame_name,
|
|
|
|
WindowOpenDisposition disposition,
|
|
|
|
const blink::mojom::WindowFeatures& features,
|
|
|
|
+ const std::vector<std::string>& additional_features,
|
|
|
|
+ const scoped_refptr<network::ResourceRequestBody>& 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
|
2019-01-12 01:00:43 +00:00
|
|
|
index b33545b865e4677ee2e9a909d259df171c12d985..eb2f9a8f240f8805e4bcbde0465ec445dd7539e7 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/content/public/browser/content_browser_client.h
|
|
|
|
+++ b/content/public/browser/content_browser_client.h
|
2018-10-24 23:25:48 +00:00
|
|
|
@@ -169,6 +169,7 @@ class RenderFrameHost;
|
2018-09-14 05:02:16 +00:00
|
|
|
class RenderProcessHost;
|
|
|
|
class RenderViewHost;
|
|
|
|
class ResourceContext;
|
|
|
|
+class ResourceRequestBody;
|
2018-09-14 18:03:43 +00:00
|
|
|
class ServiceManagerConnection;
|
2018-09-14 05:02:16 +00:00
|
|
|
class SiteInstance;
|
|
|
|
class SpeechRecognitionManagerDelegate;
|
2019-01-12 01:00:43 +00:00
|
|
|
@@ -757,6 +758,8 @@ class CONTENT_EXPORT ContentBrowserClient {
|
2018-09-14 05:02:16 +00:00
|
|
|
const std::string& frame_name,
|
|
|
|
WindowOpenDisposition disposition,
|
|
|
|
const blink::mojom::WindowFeatures& features,
|
|
|
|
+ const std::vector<std::string>& additional_features,
|
|
|
|
+ const scoped_refptr<network::ResourceRequestBody>& 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
|
2019-01-12 01:00:43 +00:00
|
|
|
index bc72fadb307f801d9f1b6c90189596c36d7203e7..a95a89178cf80dc1f6efb15e0ea7ce92d1fd26ed 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/content/renderer/render_view_impl.cc
|
|
|
|
+++ b/content/renderer/render_view_impl.cc
|
2019-01-12 01:00:43 +00:00
|
|
|
@@ -76,6 +76,7 @@
|
2018-09-14 18:03:43 +00:00
|
|
|
#include "content/renderer/ime_event_guard.h"
|
2018-09-14 05:02:16 +00:00
|
|
|
#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"
|
2018-09-21 00:30:26 +00:00
|
|
|
#include "content/renderer/media/audio/audio_device_factory.h"
|
2018-09-14 05:02:16 +00:00
|
|
|
#include "content/renderer/media/stream/media_stream_device_observer.h"
|
|
|
|
#include "content/renderer/media/video_capture_impl_manager.h"
|
2019-01-12 01:00:43 +00:00
|
|
|
@@ -1379,6 +1380,46 @@ WebView* RenderViewImpl::CreateView(WebLocalFrame* creator,
|
2018-09-14 05:02:16 +00:00
|
|
|
}
|
|
|
|
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
|
2019-01-12 01:00:43 +00:00
|
|
|
index 1c7ae733b09ed16183d9772c1954f6f190866d26..c7e4faf01f5f2d4dc110588c16bb67417c51bbf9 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc
|
|
|
|
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
|
2019-01-12 01:00:43 +00:00
|
|
|
@@ -282,6 +282,8 @@ bool LayoutTestContentBrowserClient::CanCreateWindow(
|
2018-09-14 05:02:16 +00:00
|
|
|
const std::string& frame_name,
|
|
|
|
WindowOpenDisposition disposition,
|
|
|
|
const blink::mojom::WindowFeatures& features,
|
|
|
|
+ const std::vector<std::string>& additional_features,
|
|
|
|
+ const scoped_refptr<network::ResourceRequestBody>& 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
|
2019-01-12 01:00:43 +00:00
|
|
|
index 76d53623ff698bec66dba4342e9384685ffb753e..d8b8e17dc22b96f083336cd3dcd888f89173eea1 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.h
|
|
|
|
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.h
|
2018-09-21 00:30:26 +00:00
|
|
|
@@ -66,6 +66,8 @@ class LayoutTestContentBrowserClient : public ShellContentBrowserClient {
|
2018-09-14 05:02:16 +00:00
|
|
|
const std::string& frame_name,
|
|
|
|
WindowOpenDisposition disposition,
|
|
|
|
const blink::mojom::WindowFeatures& features,
|
|
|
|
+ const std::vector<std::string>& additional_features,
|
|
|
|
+ const scoped_refptr<network::ResourceRequestBody>& body,
|
|
|
|
bool user_gesture,
|
|
|
|
bool opener_suppressed,
|
|
|
|
bool* no_javascript_access) override;
|