can_create_window.patch 11 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224
  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 f0089dddae47d970a04acc0df2fb0e2bdffc4856..33088669c478d5b7f6bbaa7998e14479e539c5cc 100644
  10. --- a/content/browser/renderer_host/render_frame_host_impl.cc
  11. +++ b/content/browser/renderer_host/render_frame_host_impl.cc
  12. @@ -9601,6 +9601,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 f9f64fefddb0c7259877f7d39100fb9caee328b7..104e06b584e9321bc1da4c0913fd36e6cee909ee 100644
  21. --- a/content/browser/web_contents/web_contents_impl.cc
  22. +++ b/content/browser/web_contents/web_contents_impl.cc
  23. @@ -5003,6 +5003,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  24. SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params,
  25. opener);
  26. + if (delegate_) {
  27. + delegate_->WebContentsCreatedWithFullParams(this, render_process_id,
  28. + opener->GetRoutingID(),
  29. + params, new_contents_impl);
  30. + }
  31. +
  32. // If the new frame has a name, make sure any SiteInstances that can find
  33. // this named frame have proxies for it. Must be called after
  34. // SetSessionStorageNamespace, since this calls CreateRenderView, which uses
  35. @@ -5044,12 +5050,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  36. AddWebContentsDestructionObserver(new_contents_impl);
  37. }
  38. - if (delegate_) {
  39. - delegate_->WebContentsCreated(this, render_process_id,
  40. - opener->GetRoutingID(), params.frame_name,
  41. - params.target_url, new_contents_impl);
  42. - }
  43. -
  44. observers_.NotifyObservers(&WebContentsObserver::DidOpenRequestedURL,
  45. new_contents_impl, opener, params.target_url,
  46. params.referrer.To<Referrer>(), params.disposition,
  47. diff --git a/content/common/frame.mojom b/content/common/frame.mojom
  48. index 91dcf6c9c4a2d840fb50cb329fe3ef1bba9103c3..cbc887a3034605a93468e73a310e9ca6838b32d8 100644
  49. --- a/content/common/frame.mojom
  50. +++ b/content/common/frame.mojom
  51. @@ -621,6 +621,10 @@ struct CreateNewWindowParams {
  52. // The navigation initiator's user activation and ad status.
  53. blink.mojom.NavigationInitiatorActivationAndAdStatus
  54. initiator_activation_and_ad_status;
  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 f07621fc686236a9b009d425b96d2a847ffd07cf..6d7b34575a4831eafca792a5b8ed4720d4ad5957 100644
  63. --- a/content/public/browser/content_browser_client.cc
  64. +++ b/content/public/browser/content_browser_client.cc
  65. @@ -805,6 +805,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 373e9128eeefb3931059fc67099b00fdc071a52e..045689f947f45e7d4c50850ba760b0861af79798 100644
  76. --- a/content/public/browser/content_browser_client.h
  77. +++ b/content/public/browser/content_browser_client.h
  78. @@ -203,6 +203,7 @@ class NetworkService;
  79. class TrustedURLLoaderHeaderClient;
  80. } // namespace mojom
  81. struct ResourceRequest;
  82. +class ResourceRequestBody;
  83. } // namespace network
  84. namespace sandbox {
  85. @@ -1361,6 +1362,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 ece9688e5f0a06be4cb6fb2d85e60269d0f66463..a955b37b93ca0887f3fba1ebea4a3c89e62aa6bc 100644
  96. --- a/content/public/browser/web_contents_delegate.cc
  97. +++ b/content/public/browser/web_contents_delegate.cc
  98. @@ -32,6 +32,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(
  112. WebContents* source,
  113. const OpenURLParams& params,
  114. diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
  115. index fbd5d3275fb9dfb04bee078b5ef275926fdad926..3938045d8028abff5f44ad347b514e4f823748cd 100644
  116. --- a/content/public/browser/web_contents_delegate.h
  117. +++ b/content/public/browser/web_contents_delegate.h
  118. @@ -18,6 +18,7 @@
  119. #include "base/types/expected.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/fullscreen_types.h"
  125. #include "content/public/browser/invalidate_type.h"
  126. @@ -366,6 +367,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 5d9ad1b7d5dfce78ce411a7670d4b20f35747b88..51d32ef662315d4a9dcc544093dd1d5e93d39c6f 100644
  141. --- a/content/renderer/render_frame_impl.cc
  142. +++ b/content/renderer/render_frame_impl.cc
  143. @@ -6893,6 +6893,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
  144. request.HasUserGesture(), GetWebFrame()->IsAdFrame(),
  145. GetWebFrame()->IsAdScriptInStack());
  146. + params->raw_features = features.raw_features.Utf8(
  147. + WTF::Utf8ConversionMode::kStrictReplacingErrors);
  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 3735a52cfd6d4fcd19a59507eda7ed4349aa0b38..cc6bf491b88a404e489e445e50d3bbe33c602204 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. @@ -524,6 +524,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 e6212744a71fffa8aec3244e336eca0a38acab8b..537bde0bdd836183f90a8d44e911d508fb5f396d 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. @@ -93,6 +93,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 82e9d3dfb5f7da76d89fe15ae61d379fa46e177d..fd035512099a54dff6cc951a2226c23a252a90e2 100644
  181. --- a/third_party/blink/public/web/web_window_features.h
  182. +++ b/third_party/blink/public/web/web_window_features.h
  183. @@ -35,6 +35,7 @@
  184. #include <vector>
  185. #include "third_party/blink/public/platform/web_string.h"
  186. +#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
  187. namespace blink {
  188. @@ -74,6 +75,8 @@ struct WebWindowFeatures {
  189. // TODO(apaseltiner): Investigate moving this field to a non-public struct
  190. // since it is only needed within //third_party/blink.
  191. std::optional<std::vector<WebString>> attribution_srcs;
  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 3fa7cfabb084914d4fe9c65a17daacb6e274a40d..ca4bc6cd7060da4bdff70e896bb824a3d75f9dea 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. @@ -2269,6 +2269,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
  201. WebWindowFeatures window_features =
  202. GetWindowFeaturesFromString(features, entered_window);
  203. + window_features.raw_features = features;
  204. +
  205. if (window_features.is_partitioned_popin) {
  206. UseCounter::Count(*entered_window,
  207. WebFeature::kPartitionedPopin_OpenAttempt);