can_create_window.patch 11 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Cheng Zhao <[email protected]>
  3. Date: Thu, 20 Sep 2018 17:45:32 -0700
  4. Subject: can_create_window.patch
  5. This adds a hook to the window creation flow so that Electron can intercede and
  6. potentially prevent a window from being created.
  7. TODO(loc): this patch is currently broken.
  8. diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
  9. index 1c652afe8b002635b34d6718c8c69cdd86dd9f8b..21eb439646c16aa72e78e9436006a29cbd8c5bf4 100644
  10. --- a/content/browser/renderer_host/render_frame_host_impl.cc
  11. +++ b/content/browser/renderer_host/render_frame_host_impl.cc
  12. @@ -7344,6 +7344,7 @@ void RenderFrameHostImpl::CreateNewWindow(
  13. last_committed_origin_, params->window_container_type,
  14. params->target_url, params->referrer.To<Referrer>(),
  15. params->frame_name, params->disposition, *params->features,
  16. + params->raw_features, params->body,
  17. effective_transient_activation_state, params->opener_suppressed,
  18. &no_javascript_access);
  19. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
  20. index abb91fd00245fddf49ee8d28be081a041aa9fce9..707d9a116c8ea119977b54d3a3365d96fef05a5a 100644
  21. --- a/content/browser/web_contents/web_contents_impl.cc
  22. +++ b/content/browser/web_contents/web_contents_impl.cc
  23. @@ -4005,6 +4005,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  24. }
  25. auto* new_contents_impl = new_contents.get();
  26. + // Call this earlier than Chrome to associate the web preferences with the
  27. + // WebContents before the view gets created.
  28. + if (delegate_) {
  29. + delegate_->WebContentsCreatedWithFullParams(this, render_process_id,
  30. + opener->GetRoutingID(),
  31. + params, new_contents_impl);
  32. + }
  33. +
  34. new_contents_impl->GetController().SetSessionStorageNamespace(
  35. partition_config, session_storage_namespace);
  36. @@ -4049,12 +4057,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  37. AddWebContentsDestructionObserver(new_contents_impl);
  38. }
  39. - if (delegate_) {
  40. - delegate_->WebContentsCreated(this, render_process_id,
  41. - opener->GetRoutingID(), params.frame_name,
  42. - params.target_url, new_contents_impl);
  43. - }
  44. -
  45. observers_.NotifyObservers(&WebContentsObserver::DidOpenRequestedURL,
  46. new_contents_impl, opener, params.target_url,
  47. params.referrer.To<Referrer>(), params.disposition,
  48. diff --git a/content/common/frame.mojom b/content/common/frame.mojom
  49. index 4eee5f6c069c83039bf0acee71056d8ed4ea92eb..9212926fba9d06296c9c46a95519b6ed777569ee 100644
  50. --- a/content/common/frame.mojom
  51. +++ b/content/common/frame.mojom
  52. @@ -574,6 +574,10 @@ struct CreateNewWindowParams {
  53. // Additional parameters for creating picture-in-picture windows.
  54. blink.mojom.PictureInPictureWindowOptions? pip_options;
  55. +
  56. + // Extra fields added by Electron.
  57. + string raw_features;
  58. + network.mojom.URLRequestBody? body;
  59. };
  60. // Operation result when the renderer asks the browser to create a new window.
  61. diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
  62. index 1e6bbfd6e7d79d1d75bd590fd2040ce51d330f16..3154a7ea00daa120279c34bdb5799b278e73ac62 100644
  63. --- a/content/public/browser/content_browser_client.cc
  64. +++ b/content/public/browser/content_browser_client.cc
  65. @@ -617,6 +617,8 @@ bool ContentBrowserClient::CanCreateWindow(
  66. const std::string& frame_name,
  67. WindowOpenDisposition disposition,
  68. const blink::mojom::WindowFeatures& features,
  69. + const std::string& raw_features,
  70. + const scoped_refptr<network::ResourceRequestBody>& body,
  71. bool user_gesture,
  72. bool opener_suppressed,
  73. bool* no_javascript_access) {
  74. diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
  75. index b4d22a849e067bb942825449e649a4a00fc4947a..67a8cbf589693a0a347f6604a36ed2a39d4ef2da 100644
  76. --- a/content/public/browser/content_browser_client.h
  77. +++ b/content/public/browser/content_browser_client.h
  78. @@ -163,6 +163,7 @@ class NetworkService;
  79. class TrustedURLLoaderHeaderClient;
  80. } // namespace mojom
  81. struct ResourceRequest;
  82. +class ResourceRequestBody;
  83. } // namespace network
  84. namespace sandbox {
  85. @@ -1003,6 +1004,8 @@ class CONTENT_EXPORT ContentBrowserClient {
  86. const std::string& frame_name,
  87. WindowOpenDisposition disposition,
  88. const blink::mojom::WindowFeatures& features,
  89. + const std::string& raw_features,
  90. + const scoped_refptr<network::ResourceRequestBody>& body,
  91. bool user_gesture,
  92. bool opener_suppressed,
  93. bool* no_javascript_access);
  94. diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
  95. index 74847a4fbd4d0d897ce6aecd1b39e30bc226f8f4..3ddcc2d403a68fdc2b4b0246899cd9507ecc6195 100644
  96. --- a/content/public/browser/web_contents_delegate.cc
  97. +++ b/content/public/browser/web_contents_delegate.cc
  98. @@ -26,6 +26,17 @@ namespace content {
  99. WebContentsDelegate::WebContentsDelegate() = default;
  100. +void WebContentsDelegate::WebContentsCreatedWithFullParams(
  101. + WebContents* source_contents,
  102. + int opener_render_process_id,
  103. + int opener_render_frame_id,
  104. + const mojom::CreateNewWindowParams& params,
  105. + WebContents* new_contents) {
  106. + WebContentsCreated(source_contents, opener_render_process_id,
  107. + opener_render_frame_id, params.frame_name,
  108. + params.target_url, new_contents);
  109. +}
  110. +
  111. WebContents* WebContentsDelegate::OpenURLFromTab(WebContents* source,
  112. const OpenURLParams& params) {
  113. return nullptr;
  114. diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
  115. index 815bee280776026f477c695d31cff8e040e25a49..04eff05d01eb94e5020cdd6e1cc2555077692ba0 100644
  116. --- a/content/public/browser/web_contents_delegate.h
  117. +++ b/content/public/browser/web_contents_delegate.h
  118. @@ -16,6 +16,7 @@
  119. #include "base/memory/scoped_refptr.h"
  120. #include "build/build_config.h"
  121. #include "content/common/content_export.h"
  122. +#include "content/common/frame.mojom.h"
  123. #include "content/public/browser/eye_dropper.h"
  124. #include "content/public/browser/invalidate_type.h"
  125. #include "content/public/browser/media_stream_request.h"
  126. @@ -341,6 +342,13 @@ class CONTENT_EXPORT WebContentsDelegate {
  127. const StoragePartitionConfig& partition_config,
  128. SessionStorageNamespace* session_storage_namespace);
  129. + virtual void WebContentsCreatedWithFullParams(
  130. + WebContents* source_contents,
  131. + int opener_render_process_id,
  132. + int opener_render_frame_id,
  133. + const mojom::CreateNewWindowParams& params,
  134. + WebContents* new_contents);
  135. +
  136. // Notifies the delegate about the creation of a new WebContents. This
  137. // typically happens when popups are created.
  138. virtual void WebContentsCreated(WebContents* source_contents,
  139. diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
  140. index 34a64f22b7e6f834409e3afdb243943af370b21d..36b3f9d6d535e1fde2cf3496dabcac07c372b892 100644
  141. --- a/content/renderer/render_frame_impl.cc
  142. +++ b/content/renderer/render_frame_impl.cc
  143. @@ -6201,6 +6201,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
  144. /*openee_can_access_opener_origin=*/true,
  145. !GetWebFrame()->IsAllowedToDownload(), GetWebFrame()->IsAdFrame());
  146. + params->raw_features = features.raw_features.Utf8(
  147. + WTF::UTF8ConversionMode::kStrictUTF8ConversionReplacingUnpairedSurrogatesWithFFFD);
  148. + params->body = GetRequestBodyForWebURLRequest(request);
  149. +
  150. // We preserve this information before sending the message since |params| is
  151. // moved on send.
  152. bool is_background_tab =
  153. diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
  154. index 40b82385697d8721ef6da3d0c77544d6d0ca400c..3a2d5207fb2eeea4b016012b09c3668af8dc35b4 100644
  155. --- a/content/web_test/browser/web_test_content_browser_client.cc
  156. +++ b/content/web_test/browser/web_test_content_browser_client.cc
  157. @@ -482,6 +482,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
  158. const std::string& frame_name,
  159. WindowOpenDisposition disposition,
  160. const blink::mojom::WindowFeatures& features,
  161. + const std::string& raw_features,
  162. + const scoped_refptr<network::ResourceRequestBody>& body,
  163. bool user_gesture,
  164. bool opener_suppressed,
  165. bool* no_javascript_access) {
  166. diff --git a/content/web_test/browser/web_test_content_browser_client.h b/content/web_test/browser/web_test_content_browser_client.h
  167. index 4805dd035772fcaea60a1a91eb9911d5c0ce93a9..3b752ea509149f04fd6d10f6977bd29791f6a5d6 100644
  168. --- a/content/web_test/browser/web_test_content_browser_client.h
  169. +++ b/content/web_test/browser/web_test_content_browser_client.h
  170. @@ -81,6 +81,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
  171. const std::string& frame_name,
  172. WindowOpenDisposition disposition,
  173. const blink::mojom::WindowFeatures& features,
  174. + const std::string& raw_features,
  175. + const scoped_refptr<network::ResourceRequestBody>& body,
  176. bool user_gesture,
  177. bool opener_suppressed,
  178. bool* no_javascript_access) override;
  179. diff --git a/third_party/blink/public/web/web_window_features.h b/third_party/blink/public/web/web_window_features.h
  180. index 34570168ccb123f5102dcf8fa6bbf98e7c373ec6..192701e56d258da41b3724292853885e4daf3420 100644
  181. --- a/third_party/blink/public/web/web_window_features.h
  182. +++ b/third_party/blink/public/web/web_window_features.h
  183. @@ -34,6 +34,7 @@
  184. #include "third_party/abseil-cpp/absl/types/optional.h"
  185. #include "third_party/blink/public/common/navigation/impression.h"
  186. +#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
  187. namespace blink {
  188. @@ -68,6 +69,8 @@ struct WebWindowFeatures {
  189. // Represents the attribution source declared by Attribution Reporting related
  190. // window features, if any.
  191. absl::optional<Impression> impression;
  192. +
  193. + String raw_features;
  194. };
  195. } // namespace blink
  196. diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
  197. index 496610b02adf00eee937ffb42e5e6461df847441..ad9d8b199c32c189982fbed3ab6b9ae04c5ff968 100644
  198. --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
  199. +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
  200. @@ -2108,6 +2108,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
  201. WebWindowFeatures window_features =
  202. GetWindowFeaturesFromString(features, entered_window, completed_url);
  203. + window_features.raw_features = features;
  204. +
  205. // In fenced frames, we should always use `noopener`.
  206. if (GetFrame()->IsInFencedFrameTree()) {
  207. window_features.noopener = true;