can_create_window.patch 11 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233
  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 551e75bc26a88206e8af9868163cd5818ebc33e1..19d944da98817b253117c6436099ab4dc7250edb 100644
  10. --- a/content/browser/renderer_host/render_frame_host_impl.cc
  11. +++ b/content/browser/renderer_host/render_frame_host_impl.cc
  12. @@ -6505,6 +6505,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 818585d3aca6dce4daff03e68f23266ef1c85a9a..d3145c4dc21e6e47915a5b96224972f70b633fda 100644
  21. --- a/content/browser/web_contents/web_contents_impl.cc
  22. +++ b/content/browser/web_contents/web_contents_impl.cc
  23. @@ -3753,6 +3753,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_id, session_storage_namespace);
  36. @@ -3795,12 +3803,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 268a2395423ebcd1eded3d8ead5f7775cd5895be..c0cad20dc8273576dea2a9f3fe0c67be101a2193 100644
  50. --- a/content/common/frame.mojom
  51. +++ b/content/common/frame.mojom
  52. @@ -550,6 +550,10 @@ struct CreateNewWindowParams {
  53. // Governs how downloads are handled if `target_url` results in a download.
  54. blink.mojom.NavigationDownloadPolicy download_policy;
  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 248a90c7682001296d623eb80e925f03360a5510..bd15404a10db2f4641763da260a84bb76d3739ab 100644
  63. --- a/content/public/browser/content_browser_client.cc
  64. +++ b/content/public/browser/content_browser_client.cc
  65. @@ -569,6 +569,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 7dfc30f346a9420be631c466ffa2d8b8adabf556..f0e2a061bb35fd3db26c7d235e1196273036925f 100644
  76. --- a/content/public/browser/content_browser_client.h
  77. +++ b/content/public/browser/content_browser_client.h
  78. @@ -168,6 +168,7 @@ class NetworkService;
  79. class TrustedURLLoaderHeaderClient;
  80. } // namespace mojom
  81. struct ResourceRequest;
  82. +class ResourceRequestBody;
  83. } // namespace network
  84. namespace sandbox {
  85. @@ -936,6 +937,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 4a57554c9e540516af83567183a34384ac722ebf..31c73efb73bb69076abd6b9c4f139072a9f7f603 100644
  96. --- a/content/public/browser/web_contents_delegate.cc
  97. +++ b/content/public/browser/web_contents_delegate.cc
  98. @@ -28,6 +28,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 a0da74d5cbe4ab8be84d6f1a92f444e858320745..5936fa4bce09895595ccb294504f5b89c967d8c0 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. @@ -335,6 +336,13 @@ class CONTENT_EXPORT WebContentsDelegate {
  127. const StoragePartitionId& partition_id,
  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_view_impl.cc b/content/renderer/render_view_impl.cc
  140. index ea22a86dc1a6e5cdb3e3dfa31a929a3dd14b9e61..215b059bb2dfcead6c709c99b39578f8e2216d93 100644
  141. --- a/content/renderer/render_view_impl.cc
  142. +++ b/content/renderer/render_view_impl.cc
  143. @@ -31,6 +31,7 @@
  144. #include "third_party/blink/public/platform/impression_conversions.h"
  145. #include "third_party/blink/public/platform/modules/video_capture/web_video_capture_impl_manager.h"
  146. #include "third_party/blink/public/platform/url_conversion.h"
  147. +#include "third_party/blink/public/platform/web_url_request_util.h"
  148. #include "third_party/blink/public/web/modules/mediastream/web_media_stream_device_observer.h"
  149. #include "third_party/blink/public/web/web_frame_widget.h"
  150. #include "third_party/blink/public/web/web_local_frame.h"
  151. @@ -289,6 +290,10 @@ WebView* RenderViewImpl::CreateView(
  152. params->impression = blink::ConvertWebImpressionToImpression(*impression);
  153. }
  154. + params->raw_features = features.raw_features.Utf8(
  155. + WTF::UTF8ConversionMode::kStrictUTF8ConversionReplacingUnpairedSurrogatesWithFFFD);
  156. + params->body = GetRequestBodyForWebURLRequest(request);
  157. +
  158. params->download_policy.ApplyDownloadFramePolicy(
  159. /*is_opener_navigation=*/false, request.HasUserGesture(),
  160. // `openee_can_access_opener_origin` only matters for opener navigations,
  161. diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
  162. index 520b6f8146361cf8c00079c1cc0f5394f747d405..77f58cc157229eb01ce9a35aa5814f64d6e8f2f2 100644
  163. --- a/content/web_test/browser/web_test_content_browser_client.cc
  164. +++ b/content/web_test/browser/web_test_content_browser_client.cc
  165. @@ -438,6 +438,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
  166. const std::string& frame_name,
  167. WindowOpenDisposition disposition,
  168. const blink::mojom::WindowFeatures& features,
  169. + const std::string& raw_features,
  170. + const scoped_refptr<network::ResourceRequestBody>& body,
  171. bool user_gesture,
  172. bool opener_suppressed,
  173. bool* no_javascript_access) {
  174. diff --git a/content/web_test/browser/web_test_content_browser_client.h b/content/web_test/browser/web_test_content_browser_client.h
  175. index 1580bd13ea123740dc7a8813680a8d2448d49969..5c0809733b366ecff02c5a4b77dac9530eb15fbf 100644
  176. --- a/content/web_test/browser/web_test_content_browser_client.h
  177. +++ b/content/web_test/browser/web_test_content_browser_client.h
  178. @@ -80,6 +80,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
  179. const std::string& frame_name,
  180. WindowOpenDisposition disposition,
  181. const blink::mojom::WindowFeatures& features,
  182. + const std::string& raw_features,
  183. + const scoped_refptr<network::ResourceRequestBody>& body,
  184. bool user_gesture,
  185. bool opener_suppressed,
  186. bool* no_javascript_access) override;
  187. diff --git a/third_party/blink/public/web/web_window_features.h b/third_party/blink/public/web/web_window_features.h
  188. index 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc0bbfa4a9 100644
  189. --- a/third_party/blink/public/web/web_window_features.h
  190. +++ b/third_party/blink/public/web/web_window_features.h
  191. @@ -34,6 +34,7 @@
  192. #include "third_party/abseil-cpp/absl/types/optional.h"
  193. #include "third_party/blink/public/platform/web_impression.h"
  194. +#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
  195. namespace blink {
  196. @@ -68,6 +69,8 @@ struct WebWindowFeatures {
  197. // Represents the attribution source declared by Attribution Reporting related
  198. // window features, if any.
  199. absl::optional<WebImpression> impression;
  200. +
  201. + String raw_features;
  202. };
  203. } // namespace blink
  204. diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
  205. index 1cab0b95a9f828791188ca6ad3adb416f864e008..f8ec60fae8eabda4019dd9f6903bfcbf00d423ce 100644
  206. --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
  207. +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
  208. @@ -2030,6 +2030,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
  209. WebWindowFeatures window_features =
  210. GetWindowFeaturesFromString(features, incumbent_window);
  211. + window_features.raw_features = features;
  212. FrameLoadRequest frame_request(incumbent_window,
  213. ResourceRequest(completed_url));