[OutOfBlinkSandbox] Move SandboxFlags into service/network.
Rename {blink->network}::mojom::WebSandboxFlags.
This patch is a step in the following direction:
~~~
Stop parsing the HTTP CSP sandbox header in blink. Parse it in the
network service CSP parser. This allows the browser process to compute
the Origin of the new document before loading it.
~~~
https://docs.google.com/document/d/1PechV73KKMF8leh7uTlyGkR32kD5qILvu3ZeG8TYGfk/edit?usp=sharing
This CL touch many files (Sorry). To easy review, here is the list of
changes to look at:
1) Interesting files:
- *.DEP
- services/network/public/cpp/sandbox_flags.h
- services/network/public/mojom/sandbox_flags.mojom
- third_party/blink/renderer/core/frame/sandbox_flags.h
- third_party/blink/public/mojom/feature_policy/feature_policy.mojom
2) The enum blink::kPresentationReceiverSandboxFlags was defined in:
third_party/blink/...
.../public/common/presentation/presentation_receiver_flags.h but it
was not used in blink. It has been moved to the content/browser. See
content/public/browser/presentation_receiver_flags.h
3) The operator<<(ostream, Sandbox) is removed. It was defined both in
sandbox_flags.h and in the generated mojo files. The bot
"win_chromium_compoile_dbg_ng" was not able to inline the calls and
ends up with a linker errors. See the trybot for:
https://chromium-review.googlesource.com/c/chromium/src/+/2062336/4.
TBR=thakis@chromium.org
Bug: 1041376
Change-Id: I9f6cbb3b04ac07ecee22b3fca43cf19a260269cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2062336
Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
Reviewed-by: Lucas Gadani <lfg@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Mike West <mkwst@chromium.org>
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Reviewed-by: Ian Clelland <iclelland@chromium.org>
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757059}
diff --git a/chrome/browser/accessibility/accessibility_permission_context.cc b/chrome/browser/accessibility/accessibility_permission_context.cc
index 6c3a121..ce2689e 100644
--- a/chrome/browser/accessibility/accessibility_permission_context.cc
+++ b/chrome/browser/accessibility/accessibility_permission_context.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "chrome/browser/accessibility/accessibility_permission_context.h"
+#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom.h"
AccessibilityPermissionContext::AccessibilityPermissionContext(
content::BrowserContext* browser_context)
diff --git a/chrome/browser/background_sync/background_sync_permission_context.cc b/chrome/browser/background_sync/background_sync_permission_context.cc
index 305488c..a2ae76d 100644
--- a/chrome/browser/background_sync/background_sync_permission_context.cc
+++ b/chrome/browser/background_sync/background_sync_permission_context.cc
@@ -6,6 +6,7 @@
#include "base/logging.h"
#include "components/content_settings/core/common/content_settings_types.h"
+#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom.h"
BackgroundSyncPermissionContext::BackgroundSyncPermissionContext(
content::BrowserContext* browser_context)
diff --git a/chrome/browser/background_sync/periodic_background_sync_permission_context.cc b/chrome/browser/background_sync/periodic_background_sync_permission_context.cc
index 80d15f9c..749fc653 100644
--- a/chrome/browser/background_sync/periodic_background_sync_permission_context.cc
+++ b/chrome/browser/background_sync/periodic_background_sync_permission_context.cc
@@ -10,6 +10,7 @@
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
+#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom.h"
#if defined(OS_ANDROID)
#include "base/android/jni_string.h"
diff --git a/chrome/browser/media/midi_permission_context.cc b/chrome/browser/media/midi_permission_context.cc
index 128f801..937e4a9 100644
--- a/chrome/browser/media/midi_permission_context.cc
+++ b/chrome/browser/media/midi_permission_context.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "chrome/browser/media/midi_permission_context.h"
+#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom.h"
MidiPermissionContext::MidiPermissionContext(
content::BrowserContext* browser_context)
diff --git a/chrome/browser/media/offscreen_tab.cc b/chrome/browser/media/offscreen_tab.cc
index 8213e72..c7fc64fa 100644
--- a/chrome/browser/media/offscreen_tab.cc
+++ b/chrome/browser/media/offscreen_tab.cc
@@ -15,9 +15,9 @@
#include "chrome/browser/ui/web_contents_sizer.h"
#include "content/public/browser/keyboard_event_processing_result.h"
#include "content/public/browser/navigation_handle.h"
+#include "content/public/browser/presentation_receiver_flags.h"
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents.h"
-#include "third_party/blink/public/common/presentation/presentation_receiver_flags.h"
#if defined(USE_AURA)
#include "base/threading/thread_task_runner_handle.h"
@@ -151,7 +151,7 @@
// Create the WebContents to contain the off-screen tab's page.
WebContents::CreateParams params(otr_profile_registration_->profile());
if (!optional_presentation_id.empty())
- params.starting_sandbox_flags = blink::kPresentationReceiverSandboxFlags;
+ params.starting_sandbox_flags = content::kPresentationReceiverSandboxFlags;
offscreen_tab_web_contents_ = WebContents::Create(params);
offscreen_tab_web_contents_->SetDelegate(this);
diff --git a/chrome/browser/media/webrtc/media_stream_device_permission_context.cc b/chrome/browser/media/webrtc/media_stream_device_permission_context.cc
index b0cb4719..97bcc9e 100644
--- a/chrome/browser/media/webrtc/media_stream_device_permission_context.cc
+++ b/chrome/browser/media/webrtc/media_stream_device_permission_context.cc
@@ -11,6 +11,7 @@
#include "content/public/common/content_features.h"
#include "content/public/common/url_constants.h"
#include "extensions/common/constants.h"
+#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom.h"
namespace {
diff --git a/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc b/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc
index 98fa082..c01bf6f 100644
--- a/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc
+++ b/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc
@@ -15,8 +15,8 @@
#include "chrome/browser/ui/media_router/presentation_receiver_window.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/presentation_receiver_flags.h"
#include "content/public/browser/web_contents.h"
-#include "third_party/blink/public/common/presentation/presentation_receiver_flags.h"
#include "ui/views/widget/widget.h"
using content::WebContents;
@@ -25,7 +25,7 @@
WebContents::CreateParams CreateWebContentsParams(Profile* profile) {
WebContents::CreateParams params(profile);
- params.starting_sandbox_flags = blink::kPresentationReceiverSandboxFlags;
+ params.starting_sandbox_flags = content::kPresentationReceiverSandboxFlags;
return params;
}
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
index 3eb237c..4b6ffad0 100644
--- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -43,7 +43,6 @@
#include "printing/units.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
#include "third_party/blink/public/common/frame/frame_owner_element_type.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/platform/platform.h"
#include "third_party/blink/public/platform/web_data.h"
#include "third_party/blink/public/platform/web_double_size.h"
diff --git a/content/browser/cross_origin_opener_policy_browsertest.cc b/content/browser/cross_origin_opener_policy_browsertest.cc
index 5d6139ce..3deaa9d70 100644
--- a/content/browser/cross_origin_opener_policy_browsertest.cc
+++ b/content/browser/cross_origin_opener_policy_browsertest.cc
@@ -212,7 +212,7 @@
"a.com", "/cross-origin-opener-policy_csp_sandboxed.html"));
EXPECT_TRUE(NavigateToURL(shell(), starting_page));
EXPECT_NE(current_frame_host()->active_sandbox_flags(),
- blink::mojom::WebSandboxFlags::kNone)
+ network::mojom::WebSandboxFlags::kNone)
<< "Document should be sandboxed.";
GURL next_page(https_server()->GetURL(
diff --git a/content/browser/frame_host/frame_tree_browsertest.cc b/content/browser/frame_host/frame_tree_browsertest.cc
index 925df36..091441d 100644
--- a/content/browser/frame_host/frame_tree_browsertest.cc
+++ b/content/browser/frame_host/frame_tree_browsertest.cc
@@ -29,7 +29,8 @@
#include "content/test/content_browser_test_utils_internal.h"
#include "net/dns/mock_host_resolver.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
#include "third_party/blink/public/mojom/frame/user_activation_update_types.mojom.h"
#include "url/url_constants.h"
@@ -567,11 +568,11 @@
// Verify that sandbox flags are set properly for the root FrameTreeNode and
// RenderFrameHost. Root frame is sandboxed with "allow-scripts".
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->active_sandbox_flags());
EXPECT_EQ(root->active_sandbox_flags(),
root->current_frame_host()->active_sandbox_flags());
@@ -579,19 +580,19 @@
// Verify that child frames inherit sandbox flags from the root. First frame
// has no explicitly set flags of its own, and should inherit those from the
// root. Second frame is completely sandboxed.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(0)->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(0)->active_sandbox_flags());
EXPECT_EQ(root->child_at(0)->active_sandbox_flags(),
root->child_at(0)->current_frame_host()->active_sandbox_flags());
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll,
root->child_at(1)->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll,
root->child_at(1)->active_sandbox_flags());
EXPECT_EQ(root->child_at(1)->active_sandbox_flags(),
root->child_at(1)->current_frame_host()->active_sandbox_flags());
@@ -602,10 +603,11 @@
// Verify that sandbox flags are cleared properly for the root FrameTreeNode
// and RenderFrameHost.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone, root->active_sandbox_flags());
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
+ root->active_sandbox_flags());
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->current_frame_host()->active_sandbox_flags());
}
@@ -624,18 +626,18 @@
// which resets both SandboxFlags::Scripts and
// SandboxFlags::AutomaticFeatures bits per blink::parseSandboxPolicy(), and
// third frame has "allow-scripts allow-same-origin".
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll,
root->child_at(0)->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(1)->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures &
- ~blink::mojom::WebSandboxFlags::kOrigin,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures &
+ ~network::mojom::WebSandboxFlags::kOrigin,
root->child_at(2)->effective_frame_policy().sandbox_flags);
// Sandboxed frames should set a unique origin unless they have the
@@ -648,7 +650,7 @@
// Navigating to a different URL should not clear sandbox flags.
GURL frame_url(embedded_test_server()->GetURL("/title1.html"));
NavigateFrameToURL(root->child_at(0), frame_url);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll,
root->child_at(0)->effective_frame_policy().sandbox_flags);
}
@@ -673,31 +675,32 @@
// "allow-orientation-lock", and the framed document is also served with a CSP
// header which uses "allow-popups" and "allow-pointer-lock". The resulting
// sandbox for the frame should only have "allow-pointer-lock".
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone, root->active_sandbox_flags());
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
+ root->active_sandbox_flags());
EXPECT_EQ(root->active_sandbox_flags(),
root->current_frame_host()->active_sandbox_flags());
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(0)->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures &
- ~blink::mojom::WebSandboxFlags::kPopups &
- ~blink::mojom::WebSandboxFlags::kPointerLock,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures &
+ ~network::mojom::WebSandboxFlags::kPopups &
+ ~network::mojom::WebSandboxFlags::kPointerLock,
root->child_at(0)->active_sandbox_flags());
EXPECT_EQ(root->child_at(0)->active_sandbox_flags(),
root->child_at(0)->current_frame_host()->active_sandbox_flags());
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures &
- ~blink::mojom::WebSandboxFlags::kPointerLock &
- ~blink::mojom::WebSandboxFlags::kOrientationLock,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures &
+ ~network::mojom::WebSandboxFlags::kPointerLock &
+ ~network::mojom::WebSandboxFlags::kOrientationLock,
root->child_at(1)->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures &
- ~blink::mojom::WebSandboxFlags::kPointerLock,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures &
+ ~network::mojom::WebSandboxFlags::kPointerLock,
root->child_at(1)->active_sandbox_flags());
EXPECT_EQ(root->child_at(1)->active_sandbox_flags(),
root->child_at(1)->current_frame_host()->active_sandbox_flags());
@@ -707,25 +710,25 @@
GURL frame_url(embedded_test_server()->GetURL("/title1.html"));
NavigateFrameToURL(root->child_at(0), frame_url);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(0)->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(0)->active_sandbox_flags());
EXPECT_EQ(root->child_at(0)->active_sandbox_flags(),
root->child_at(0)->current_frame_host()->active_sandbox_flags());
NavigateFrameToURL(root->child_at(1), frame_url);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures &
- ~blink::mojom::WebSandboxFlags::kPointerLock &
- ~blink::mojom::WebSandboxFlags::kOrientationLock,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures &
+ ~network::mojom::WebSandboxFlags::kPointerLock &
+ ~network::mojom::WebSandboxFlags::kOrientationLock,
root->child_at(1)->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures &
- ~blink::mojom::WebSandboxFlags::kPointerLock &
- ~blink::mojom::WebSandboxFlags::kOrientationLock,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures &
+ ~network::mojom::WebSandboxFlags::kPointerLock &
+ ~network::mojom::WebSandboxFlags::kOrientationLock,
root->child_at(1)->active_sandbox_flags());
EXPECT_EQ(root->child_at(1)->active_sandbox_flags(),
root->child_at(1)->current_frame_host()->active_sandbox_flags());
@@ -1178,13 +1181,13 @@
// flags. Main frame sets allow-popups, allow-pointer-lock and allow-scripts.
FrameTreeNode* popup_root =
static_cast<WebContentsImpl*>(new_contents)->GetFrameTree()->root();
- blink::mojom::WebSandboxFlags main_frame_sandbox_flags =
+ network::mojom::WebSandboxFlags main_frame_sandbox_flags =
root->current_frame_host()->active_sandbox_flags();
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kPopups &
- ~blink::mojom::WebSandboxFlags::kPointerLock &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kPopups &
+ ~network::mojom::WebSandboxFlags::kPointerLock &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
main_frame_sandbox_flags);
EXPECT_EQ(main_frame_sandbox_flags,
diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc
index 2e2e142..5adc109 100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -29,7 +29,8 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_features.h"
#include "content/public/common/navigation_policy.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
#include "third_party/blink/public/mojom/frame/user_activation_update_types.mojom.h"
#include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom.h"
@@ -231,7 +232,7 @@
// Clear any CSP-set sandbox flags, and the declared feature policy for the
// frame.
- UpdateFramePolicyHeaders(blink::mojom::WebSandboxFlags::kNone, {});
+ UpdateFramePolicyHeaders(network::mojom::WebSandboxFlags::kNone, {});
// This frame has had its user activation bits cleared in the renderer
// before arriving here. We just need to clear them here and in the other
@@ -687,7 +688,7 @@
}
void FrameTreeNode::UpdateFramePolicyHeaders(
- blink::mojom::WebSandboxFlags sandbox_flags,
+ network::mojom::WebSandboxFlags sandbox_flags,
const blink::ParsedFeaturePolicy& parsed_header) {
bool changed = false;
if (replication_state_.feature_policy_header != parsed_header) {
@@ -696,7 +697,7 @@
}
// TODO(iclelland): Kill the renderer if sandbox flags is not a subset of the
// currently effective sandbox flags from the frame. https://crbug.com/740556
- blink::mojom::WebSandboxFlags updated_flags =
+ network::mojom::WebSandboxFlags updated_flags =
sandbox_flags | effective_frame_policy().sandbox_flags;
if (replication_state_.active_sandbox_flags != updated_flags) {
replication_state_.active_sandbox_flags = updated_flags;
diff --git a/content/browser/frame_host/frame_tree_node.h b/content/browser/frame_host/frame_tree_node.h
index 89ba68e8..5b85f3b 100644
--- a/content/browser/frame_host/frame_tree_node.h
+++ b/content/browser/frame_host/frame_tree_node.h
@@ -343,7 +343,7 @@
// pending_frame_policy() for those. To see the flags which will take effect
// on navigation (which does not include the CSP-set flags), use
// effective_frame_policy().
- blink::mojom::WebSandboxFlags active_sandbox_flags() const {
+ network::mojom::WebSandboxFlags active_sandbox_flags() const {
return replication_state_.active_sandbox_flags;
}
@@ -354,7 +354,7 @@
// will be cleared, and the flags in the pending frame policy will be applied
// to the frame.
void UpdateFramePolicyHeaders(
- blink::mojom::WebSandboxFlags sandbox_flags,
+ network::mojom::WebSandboxFlags sandbox_flags,
const blink::ParsedFeaturePolicy& parsed_header);
// Returns whether the frame received a user gesture.
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index a878b8a..aecc3af 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -99,10 +99,11 @@
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/resource_request_body.h"
#include "services/network/public/cpp/url_loader_completion_status.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
#include "services/network/public/mojom/fetch_api.mojom.h"
#include "services/network/public/mojom/url_response_head.mojom.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom.h"
#include "third_party/blink/public/common/blob/blob_utils.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/mojom/appcache/appcache.mojom.h"
#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom.h"
#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
@@ -1894,7 +1895,7 @@
if (response_head_->cross_origin_opener_policy !=
network::mojom::CrossOriginOpenerPolicy::kUnsafeNone &&
(frame_tree_node_->pending_frame_policy().sandbox_flags !=
- blink::mojom::WebSandboxFlags::kNone)) {
+ network::mojom::WebSandboxFlags::kNone)) {
OnRequestFailedInternal(
network::URLLoaderCompletionStatus(
network::BlockedByResponseReason::
@@ -2283,8 +2284,8 @@
// for this frame.
bool can_create_service_worker =
(frame_tree_node_->pending_frame_policy().sandbox_flags &
- blink::mojom::WebSandboxFlags::kOrigin) !=
- blink::mojom::WebSandboxFlags::kOrigin;
+ network::mojom::WebSandboxFlags::kOrigin) !=
+ network::mojom::WebSandboxFlags::kOrigin;
if (can_create_service_worker) {
ServiceWorkerContextWrapper* service_worker_context =
static_cast<ServiceWorkerContextWrapper*>(
diff --git a/content/browser/frame_host/render_frame_host_feature_policy_unittest.cc b/content/browser/frame_host/render_frame_host_feature_policy_unittest.cc
index 2fdfc52..a0bf1759 100644
--- a/content/browser/frame_host/render_frame_host_feature_policy_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_feature_policy_unittest.cc
@@ -11,7 +11,6 @@
#include "content/test/test_render_frame_host.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/public/common/frame/frame_policy.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -64,7 +63,7 @@
RenderFrameHost* current = *rfh;
SimulateNavigation(¤t, current->GetLastCommittedURL());
static_cast<TestRenderFrameHost*>(current)->DidSetFramePolicyHeaders(
- blink::mojom::WebSandboxFlags::kNone, CreateFPHeader(feature, values),
+ network::mojom::WebSandboxFlags::kNone, CreateFPHeader(feature, values),
{} /* document_policy_header */);
*rfh = current;
}
@@ -75,7 +74,7 @@
blink::mojom::FeaturePolicyFeature feature,
const std::map<std::string, blink::PolicyValue>& values) {
static_cast<TestRenderFrameHost*>(parent)->OnDidChangeFramePolicy(
- child->GetRoutingID(), {blink::mojom::WebSandboxFlags::kNone,
+ child->GetRoutingID(), {network::mojom::WebSandboxFlags::kNone,
CreateFPHeader(feature, values),
{} /* required_document_policy */});
}
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index ebcba9f..9956178 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -188,8 +188,10 @@
#include "services/device/public/mojom/wake_lock.mojom.h"
#include "services/device/public/mojom/wake_lock_context.mojom.h"
#include "services/network/public/cpp/features.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
#include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
#include "services/network/public/mojom/network_service.mojom.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "storage/browser/blob/blob_storage_context.h"
@@ -754,7 +756,7 @@
nullptr,
base::OnTaskRunnerDeleter(base::CreateSequencedTaskRunner(
{ServiceWorkerContext::GetCoreThreadId()}))),
- active_sandbox_flags_(blink::mojom::WebSandboxFlags::kNone),
+ active_sandbox_flags_(network::mojom::WebSandboxFlags::kNone),
keep_alive_timeout_(base::TimeDelta::FromSeconds(30)),
subframe_unload_timeout_(base::TimeDelta::FromMilliseconds(
RenderViewHostImpl::kUnloadTimeoutMS)),
@@ -1358,7 +1360,7 @@
}
}
-bool RenderFrameHostImpl::IsSandboxed(blink::mojom::WebSandboxFlags flags) {
+bool RenderFrameHostImpl::IsSandboxed(network::mojom::WebSandboxFlags flags) {
if (base::FeatureList::IsEnabled(features::kFeaturePolicyForSandbox)) {
blink::mojom::FeaturePolicyFeature feature =
blink::FeaturePolicy::FeatureForSandboxFlag(flags);
@@ -2311,9 +2313,9 @@
// Calculate and set |new_frame_origin|.
bool new_frame_should_be_sandboxed =
- blink::mojom::WebSandboxFlags::kOrigin ==
+ network::mojom::WebSandboxFlags::kOrigin ==
(frame_tree_node()->active_sandbox_flags() &
- blink::mojom::WebSandboxFlags::kOrigin);
+ network::mojom::WebSandboxFlags::kOrigin);
url::Origin new_frame_origin = new_frame_should_be_sandboxed
? new_frame_creator.DeriveNewOpaqueOrigin()
: new_frame_creator;
@@ -3453,7 +3455,7 @@
}
void RenderFrameHostImpl::DidSetFramePolicyHeaders(
- blink::mojom::WebSandboxFlags sandbox_flags,
+ network::mojom::WebSandboxFlags sandbox_flags,
const blink::ParsedFeaturePolicy& feature_policy_header,
const blink::DocumentPolicy::FeatureState& document_policy_header) {
if (!is_active())
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index cdc8ca1..0c7f9842 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -343,7 +343,7 @@
void MarkIsolatedWorldsAsRequiringSeparateURLLoaderFactory(
base::flat_set<url::Origin> isolated_world_origins,
bool push_to_renderer_now) override;
- bool IsSandboxed(blink::mojom::WebSandboxFlags flags) override;
+ bool IsSandboxed(network::mojom::WebSandboxFlags flags) override;
void FlushNetworkAndNavigationInterfacesForTesting() override;
void PrepareForInnerWebContentsAttach(
PrepareForInnerWebContentsAttachCallback callback) override;
@@ -958,7 +958,7 @@
}
void SetKeepAliveTimeoutForTesting(base::TimeDelta timeout);
- blink::mojom::WebSandboxFlags active_sandbox_flags() {
+ network::mojom::WebSandboxFlags active_sandbox_flags() {
return active_sandbox_flags_;
}
@@ -1684,7 +1684,7 @@
void DidChangeName(const std::string& name,
const std::string& unique_name) override;
void DidSetFramePolicyHeaders(
- blink::mojom::WebSandboxFlags sandbox_flags,
+ network::mojom::WebSandboxFlags sandbox_flags,
const blink::ParsedFeaturePolicy& feature_policy_header,
const blink::DocumentPolicy::FeatureState& document_policy_header)
override;
@@ -2496,7 +2496,7 @@
// copy of the active sandbox flags which are stored in the FrameTreeNode for
// this RenderFrameHost, but may diverge if this RenderFrameHost is pending
// deletion.
- blink::mojom::WebSandboxFlags active_sandbox_flags_;
+ network::mojom::WebSandboxFlags active_sandbox_flags_;
// Tracks the document policy which has been set on this frame.
std::unique_ptr<blink::DocumentPolicy> document_policy_;
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc
index abdda41..77cf9fe 100644
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -3239,7 +3239,7 @@
TestRenderFrameHost* initial_rfh = main_test_rfh();
// The RFH should start out with an empty frame policy.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
initial_rfh->frame_tree_node()->active_sandbox_flags());
// Navigate cross-site but don't commit the navigation.
@@ -3248,16 +3248,16 @@
navigation_to_kUrl2->ReadyToCommit();
// Now send the frame policy for the initial page.
- initial_rfh->SendFramePolicy(blink::mojom::WebSandboxFlags::kAll,
+ initial_rfh->SendFramePolicy(network::mojom::WebSandboxFlags::kAll,
{} /* feature_policy_header */,
{} /* document_policy_header */);
// Verify that the policy landed in the frame tree.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll,
initial_rfh->frame_tree_node()->active_sandbox_flags());
// Commit the naviagation; the new frame should have a clear frame policy.
navigation_to_kUrl2->Commit();
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
main_test_rfh()->frame_tree_node()->active_sandbox_flags());
}
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
index c6bdaf87..649183954 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -32,6 +32,7 @@
#include "content/public/common/content_features.h"
#include "ipc/ipc_message.h"
#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/blink/public/mojom/frame/frame_owner_properties.mojom.h"
#include "third_party/blink/public/mojom/scroll/scroll_into_view_params.mojom.h"
@@ -423,8 +424,8 @@
current_rfh, params.user_gesture, &download_policy);
if ((frame_tree_node_->pending_frame_policy().sandbox_flags &
- blink::mojom::WebSandboxFlags::kDownloads) !=
- blink::mojom::WebSandboxFlags::kNone) {
+ network::mojom::WebSandboxFlags::kDownloads) !=
+ network::mojom::WebSandboxFlags::kNone) {
if (download_policy.blocking_downloads_in_sandbox_enabled) {
download_policy.SetDisallowed(content::NavigationDownloadType::kSandbox);
} else {
diff --git a/content/browser/frame_host/sandbox_flags.md b/content/browser/frame_host/sandbox_flags.md
new file mode 100644
index 0000000..e65f317e
--- /dev/null
+++ b/content/browser/frame_host/sandbox_flags.md
@@ -0,0 +1,29 @@
+The sandbox policy
+------------------
+
+The sandbox policy determines a set of capabilities a document will have.
+It is defined in two types of objects:
+- The frame.
+- The document.
+
+The frame policy is parsed from the <iframe>’s sandbox attribute.
+Example: <iframe sandbox="allow-script allow-origin">
+
+The document policy is parsed from the HTTP Content-Security-Policy header.
+Example: Content-Security-Policy: sandbox allow-script allow-origin
+
+On top of that, the sandbox policy is inherited from:
+- The frame to its document.
+- The document to its children frames.
+- The document to its opened windows’s main frame.
+
+The distinction between a frame and a document is important. The document is
+replaced after navigations, but the frame stays.
+
+The sandbox policy is bit field. The sandbox flags are defined by:
+/services/network/public/mojom/web_sandbox_flags.mojom
+Multiple sandbox policy are combined using a bitwise AND in the bitfield. This
+way, the policy can only be further restricted.
+
+Specification:
+- http://www.whatwg.org/specs/web-apps/current-work/#attr-iframe-sandbox
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index 40485a6..cc00046 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -117,12 +117,13 @@
#include "net/test/embedded_test_server/http_response.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "services/network/public/cpp/features.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/public/common/feature_policy/policy_value.h"
#include "third_party/blink/public/common/features.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/common/input/web_input_event.h"
#include "third_party/blink/public/mojom/frame/frame.mojom-test-utils.h"
#include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom.h"
@@ -4321,13 +4322,13 @@
EXPECT_EQ(baz_url, observer.last_navigation_url());
// Both frames should not be sandboxed to start with.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(0)->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(0)->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(1)->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(1)->effective_frame_policy().sandbox_flags);
// Dynamically update sandbox flags for the first frame.
@@ -4340,13 +4341,13 @@
// flags, because sandbox flag updates take place only after navigations.
// "allow-scripts" resets both SandboxFlags::Scripts and
// SandboxFlags::AutomaticFeatures bits per blink::parseSandboxPolicy().
- blink::mojom::WebSandboxFlags expected_flags =
- blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures;
+ network::mojom::WebSandboxFlags expected_flags =
+ network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures;
EXPECT_EQ(expected_flags,
root->child_at(0)->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(0)->effective_frame_policy().sandbox_flags);
// Navigate the first frame to a page on the same site. The new sandbox
@@ -4438,13 +4439,13 @@
// Check that the current sandbox flags are updated but the effective
// sandbox flags are not.
- blink::mojom::WebSandboxFlags expected_flags =
- blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures;
+ network::mojom::WebSandboxFlags expected_flags =
+ network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures;
EXPECT_EQ(expected_flags,
root->child_at(1)->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(1)->effective_frame_policy().sandbox_flags);
// Navigate the second subframe to a page on bar.com. This will trigger a
@@ -4491,9 +4492,9 @@
root->child_at(0)->current_url());
// The frame should not be sandboxed to start with.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(0)->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(0)->effective_frame_policy().sandbox_flags);
// Dynamically update the frame's sandbox flags.
@@ -4506,13 +4507,13 @@
// because sandbox flag updates take place only after navigations.
// "allow-scripts" resets both SandboxFlags::Scripts and
// SandboxFlags::AutomaticFeatures bits per blink::parseSandboxPolicy().
- blink::mojom::WebSandboxFlags expected_flags =
- blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures;
+ network::mojom::WebSandboxFlags expected_flags =
+ network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures;
EXPECT_EQ(expected_flags,
root->child_at(0)->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(0)->effective_frame_policy().sandbox_flags);
// Perform a renderer-initiated same-site navigation in the first frame. The
@@ -4599,13 +4600,14 @@
EvalJs(bottom_child, "Array.from(location.ancestorOrigins);"));
// Check that the sandbox flags in the browser process are correct.
- // "allow-scripts" resets both WebSandboxFlags::Scripts and
- // WebSandboxFlags::AutomaticFeatures bits per blink::parseSandboxPolicy().
- blink::mojom::WebSandboxFlags expected_flags =
- blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures &
- ~blink::mojom::WebSandboxFlags::kOrigin;
+ // "allow-scripts" resets both network::mojom::WebSandboxFlags::Scripts and
+ // network::mojom::WebSandboxFlags::AutomaticFeatures bits per
+ // blink::parseSandboxPolicy().
+ network::mojom::WebSandboxFlags expected_flags =
+ network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures &
+ ~network::mojom::WebSandboxFlags::kOrigin;
EXPECT_EQ(expected_flags,
root->child_at(1)->effective_frame_policy().sandbox_flags);
@@ -6642,15 +6644,16 @@
root, "document.querySelector('iframe').sandbox = 'allow-scripts';"));
// Calculate expected flags. Note that "allow-scripts" resets both
- // WebSandboxFlags::Scripts and WebSandboxFlags::AutomaticFeatures bits per
+ // network::mojom::WebSandboxFlags::Scripts and
+ // network::mojom::WebSandboxFlags::AutomaticFeatures bits per
// blink::parseSandboxPolicy().
- blink::mojom::WebSandboxFlags expected_flags =
- blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures;
+ network::mojom::WebSandboxFlags expected_flags =
+ network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures;
EXPECT_EQ(expected_flags,
root->child_at(0)->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(0)->effective_frame_policy().sandbox_flags);
// Navigate child frame so that the sandbox flags take effect. Use a page
@@ -6697,13 +6700,13 @@
// These flags should be pending but not take effect, since there's been no
// navigation.
- blink::mojom::WebSandboxFlags expected_flags =
- blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures;
+ network::mojom::WebSandboxFlags expected_flags =
+ network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures;
FrameTreeNode* child = root->child_at(0);
EXPECT_EQ(expected_flags, child->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
child->effective_frame_policy().sandbox_flags);
// Add a new grandchild frame and navigate it cross-site.
@@ -6720,9 +6723,9 @@
// Since the update flags haven't yet taken effect in its parent, this
// grandchild frame should not be sandboxed.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
grandchild->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
grandchild->effective_frame_policy().sandbox_flags);
// Check that the grandchild frame isn't sandboxed on the renderer side. If
@@ -6749,13 +6752,14 @@
" 'allow-scripts allow-popups';"));
// Calculate expected flags. Note that "allow-scripts" resets both
- // WebSandboxFlags::Scripts and WebSandboxFlags::AutomaticFeatures bits per
+ // network::mojom::WebSandboxFlags::Scripts and
+ // network::mojom::WebSandboxFlags::AutomaticFeatures bits per
// blink::parseSandboxPolicy().
- blink::mojom::WebSandboxFlags expected_flags =
- blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures &
- ~blink::mojom::WebSandboxFlags::kPopups;
+ network::mojom::WebSandboxFlags expected_flags =
+ network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures &
+ ~network::mojom::WebSandboxFlags::kPopups;
EXPECT_EQ(expected_flags,
root->child_at(0)->pending_frame_policy().sandbox_flags);
@@ -6859,14 +6863,15 @@
" 'allow-scripts allow-popups allow-popups-to-escape-sandbox';"));
// Set expected flags for the child frame. Note that "allow-scripts" resets
- // both WebSandboxFlags::Scripts and WebSandboxFlags::AutomaticFeatures bits
- // per blink::parseSandboxPolicy().
- blink::mojom::WebSandboxFlags expected_flags =
- blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures &
- ~blink::mojom::WebSandboxFlags::kPopups &
- ~blink::mojom::WebSandboxFlags::kPropagatesToAuxiliaryBrowsingContexts;
+ // both network::mojom::WebSandboxFlags::Scripts and
+ // network::mojom::WebSandboxFlags::AutomaticFeatures bits per
+ // blink::parseSandboxPolicy().
+ network::mojom::WebSandboxFlags expected_flags =
+ network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures &
+ ~network::mojom::WebSandboxFlags::kPopups &
+ ~network::mojom::WebSandboxFlags::kPropagatesToAuxiliaryBrowsingContexts;
EXPECT_EQ(expected_flags,
root->child_at(0)->pending_frame_policy().sandbox_flags);
@@ -6890,7 +6895,7 @@
// Check that the sandbox flags for new popup are correct in the browser
// process. They should not have been inherited.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
foo_root->effective_frame_policy().sandbox_flags);
// The popup's origin should match |b_url|, since it's not sandboxed.
@@ -7204,7 +7209,7 @@
// navigation.
EXPECT_EQ(c_url.GetOrigin().spec(),
root->child_at(0)->current_origin().Serialize() + "/");
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(0)->effective_frame_policy().sandbox_flags);
}
}
@@ -11251,38 +11256,38 @@
// Main page is served with a CSP header applying sandbox flags allow-popups,
// allow-pointer-lock and allow-scripts.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kPopups &
- ~blink::mojom::WebSandboxFlags::kPointerLock &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kPopups &
+ ~network::mojom::WebSandboxFlags::kPointerLock &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->active_sandbox_flags());
// Child frame has iframe sandbox flags allow-popups, allow-scripts, and
// allow-orientation-lock. It should receive the intersection of those with
// the parent sandbox flags: allow-popups and allow-scripts.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kPopups &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kPopups &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(0)->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kPopups &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kPopups &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(0)->effective_frame_policy().sandbox_flags);
// Document in child frame is served with a CSP header giving sandbox flags
// allow-scripts, allow-popups and allow-pointer-lock. The final effective
// flags should only include allow-scripts and allow-popups.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kPopups &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kPopups &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(0)->active_sandbox_flags());
// Navigate the child frame to a new page. This should clear any CSP-applied
@@ -11295,20 +11300,20 @@
// Navigating should reset the sandbox flags to the frame owner flags:
// allow-popups and allow-scripts.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kPopups &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kPopups &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(0)->active_sandbox_flags());
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kPopups &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kPopups &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(0)->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kPopups &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kPopups &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(0)->effective_frame_policy().sandbox_flags);
}
@@ -11328,11 +11333,11 @@
static_cast<WebContentsImpl*>(shell()->web_contents())->GetMainFrame();
// Check sandbox flags on RFH before navigating away.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kPopups &
- ~blink::mojom::WebSandboxFlags::kPointerLock &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kPopups &
+ ~network::mojom::WebSandboxFlags::kPointerLock &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
rfh->active_sandbox_flags());
// Set up a slow unload handler to force the RFH to linger in the unloaded but
@@ -11357,15 +11362,15 @@
ASSERT_FALSE(rfh_observer.deleted());
// Check sandbox flags on old RFH -- they should be unchanged.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kPopups &
- ~blink::mojom::WebSandboxFlags::kPointerLock &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kPopups &
+ ~network::mojom::WebSandboxFlags::kPointerLock &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
rfh->active_sandbox_flags());
// The FrameTreeNode should have flags which represent the new state.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->effective_frame_policy().sandbox_flags);
}
@@ -11432,9 +11437,9 @@
// The child of the sandboxed frame should've inherited sandbox flags, so it
// should not be able to create popups.
EXPECT_EQ(
- blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(0)->child_at(0)->effective_frame_policy().sandbox_flags);
EXPECT_EQ(
root->child_at(0)->child_at(0)->active_sandbox_flags(),
@@ -11467,9 +11472,9 @@
// The child of the sandboxed frame should've inherited sandbox flags, so it
// should not be able to create popups.
EXPECT_EQ(
- blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(0)->child_at(0)->effective_frame_policy().sandbox_flags);
EXPECT_EQ(
root->child_at(0)->child_at(0)->active_sandbox_flags(),
@@ -11520,9 +11525,9 @@
// The child of the sandboxed frame should've inherited sandbox flags, so it
// should not be able to create popups.
EXPECT_EQ(
- blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(0)->child_at(0)->effective_frame_policy().sandbox_flags);
EXPECT_EQ(
root->child_at(0)->child_at(0)->active_sandbox_flags(),
@@ -11548,9 +11553,9 @@
NavigateFrameToURL(root->child_at(0)->child_at(0),
embedded_test_server()->GetURL("foo.com", "/title2.html"));
EXPECT_EQ(
- blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(0)->child_at(0)->effective_frame_policy().sandbox_flags);
EXPECT_EQ(
root->child_at(0)->child_at(0)->active_sandbox_flags(),
@@ -11581,31 +11586,31 @@
// The second child has both iframe-attribute sandbox flags and CSP-set flags.
// Verify that it the flags are combined correctly in the frame tree.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kPointerLock &
- ~blink::mojom::WebSandboxFlags::kOrientationLock &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kPointerLock &
+ ~network::mojom::WebSandboxFlags::kOrientationLock &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(1)->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kPointerLock &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kPointerLock &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(1)->active_sandbox_flags());
NavigateFrameToURL(
root->child_at(1),
embedded_test_server()->GetURL("bar.com", "/sandboxed_child_frame.html"));
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kPointerLock &
- ~blink::mojom::WebSandboxFlags::kOrientationLock &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kPointerLock &
+ ~network::mojom::WebSandboxFlags::kOrientationLock &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(1)->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kPointerLock &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kPointerLock &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures,
root->child_at(1)->active_sandbox_flags());
// Remove the sandbox attribute from the child frame.
@@ -11624,14 +11629,14 @@
"bar.com", "/cross_site_iframe_factory.html?bar(foo)"));
// Check the sandbox flags on the child frame in the browser process.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(1)->effective_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
root->child_at(1)->active_sandbox_flags());
// Check the sandbox flags on the grandchid frame in the browser process.
EXPECT_EQ(
- blink::mojom::WebSandboxFlags::kNone,
+ network::mojom::WebSandboxFlags::kNone,
root->child_at(1)->child_at(0)->effective_frame_policy().sandbox_flags);
EXPECT_EQ(
root->child_at(1)->child_at(0)->active_sandbox_flags(),
@@ -13928,9 +13933,9 @@
FrameTreeNode* subframe = root->child_at(0);
// The subframe should not be sandboxed.
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
subframe->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
subframe->effective_frame_policy().sandbox_flags);
// Set the "sandbox" attribute on the subframe; pending policy should update.
@@ -13938,12 +13943,12 @@
root, "document.querySelector('iframe').sandbox = 'allow-scripts';"));
// "allow-scripts" resets both SandboxFlags::Scripts and
// SandboxFlags::AutomaticFeatures bits per blink::ParseSandboxPolicy().
- blink::mojom::WebSandboxFlags expected_flags =
- blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures;
+ network::mojom::WebSandboxFlags expected_flags =
+ network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures;
EXPECT_EQ(expected_flags, subframe->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
subframe->effective_frame_policy().sandbox_flags);
// Commit a same-document navigation with replaceState. The new sandbox
@@ -13954,7 +13959,7 @@
replace_state_observer.Wait();
EXPECT_EQ(expected_flags, subframe->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
subframe->effective_frame_policy().sandbox_flags);
// Also try a same-document navigation to a fragment, which also shouldn't
@@ -13969,7 +13974,7 @@
}
EXPECT_EQ(expected_flags, subframe->pending_frame_policy().sandbox_flags);
- EXPECT_EQ(blink::mojom::WebSandboxFlags::kNone,
+ EXPECT_EQ(network::mojom::WebSandboxFlags::kNone,
subframe->effective_frame_policy().sandbox_flags);
}
@@ -15177,18 +15182,18 @@
"a.com",
"/cross_site_iframe_factory.html?a(b{sandbox-allow-scripts})")));
FrameTreeNode* root = web_contents()->GetFrameTree()->root();
- blink::mojom::WebSandboxFlags expected_flags =
- blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures;
+ network::mojom::WebSandboxFlags expected_flags =
+ network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures;
// Validate sandbox flags bit-by-bit. This is equivalent to an equality check
// when FeaturePolicyForSandbox is disabled, but when that feature is enabled,
// this will check the appropriate policy-controlled feature for each expected
// sandbox flag.
- for (unsigned bit = 0; bit < sizeof(blink::mojom::WebSandboxFlags) * 8;
+ for (unsigned bit = 0; bit < sizeof(network::mojom::WebSandboxFlags) * 8;
bit++) {
- blink::mojom::WebSandboxFlags flag =
- static_cast<blink::mojom::WebSandboxFlags>(1 << bit);
+ network::mojom::WebSandboxFlags flag =
+ static_cast<network::mojom::WebSandboxFlags>(1 << bit);
if (static_cast<unsigned>(expected_flags) & (1 << bit)) {
EXPECT_TRUE(root->child_at(0)->current_frame_host()->IsSandboxed(flag));
} else {
@@ -15205,17 +15210,17 @@
"a.com",
"/cross_site_iframe_factory.html?a(b{sandbox,allow-scripts})")));
FrameTreeNode* root = web_contents()->GetFrameTree()->root();
- blink::mojom::WebSandboxFlags expected_flags =
- blink::mojom::WebSandboxFlags::kAll &
- ~blink::mojom::WebSandboxFlags::kScripts &
- ~blink::mojom::WebSandboxFlags::kAutomaticFeatures;
+ network::mojom::WebSandboxFlags expected_flags =
+ network::mojom::WebSandboxFlags::kAll &
+ ~network::mojom::WebSandboxFlags::kScripts &
+ ~network::mojom::WebSandboxFlags::kAutomaticFeatures;
// Validate sandbox flags bit-by-bit. This is equivalent to an equality check
// when FeaturePolicyForSandbox is disabled, but when that feature is enabled,
// this will check the appropriate policy-controlled feature for each expected
// sandbox flag.
for (int bit = 0; bit < 32; bit++) {
- blink::mojom::WebSandboxFlags flag =
- static_cast<blink::mojom::WebSandboxFlags>(1 << bit);
+ network::mojom::WebSandboxFlags flag =
+ static_cast<network::mojom::WebSandboxFlags>(1 << bit);
if (static_cast<unsigned>(expected_flags) & (1 << bit)) {
EXPECT_TRUE(root->child_at(0)->current_frame_host()->IsSandboxed(flag));
} else {
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 9f596277..866f219 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -149,9 +149,10 @@
#include "ppapi/buildflags/buildflags.h"
#include "services/metrics/public/cpp/ukm_recorder.h"
#include "services/network/public/cpp/features.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/common/mime_util/mime_util.h"
#include "third_party/blink/public/common/page/page_zoom.h"
#include "third_party/blink/public/common/security/security_style.h"
@@ -766,17 +767,17 @@
// See https://html.spec.whatwg.org/#attr-iframe-sandbox.
FrameTreeNode* new_root = new_contents->GetFrameTree()->root();
if (opener) {
- blink::mojom::WebSandboxFlags opener_flags =
+ network::mojom::WebSandboxFlags opener_flags =
opener_rfh->active_sandbox_flags();
- const blink::mojom::WebSandboxFlags inherit_flag =
- blink::mojom::WebSandboxFlags::kPropagatesToAuxiliaryBrowsingContexts;
+ const network::mojom::WebSandboxFlags inherit_flag =
+ network::mojom::WebSandboxFlags::kPropagatesToAuxiliaryBrowsingContexts;
bool sandbox_propagates_to_auxilary_context =
(opener_flags & inherit_flag) == inherit_flag;
if (sandbox_propagates_to_auxilary_context)
new_root->SetPendingFramePolicy({opener_flags,
{} /* container_policy */,
{} /* required_document_policy */});
- if (opener_flags == blink::mojom::WebSandboxFlags::kNone ||
+ if (opener_flags == network::mojom::WebSandboxFlags::kNone ||
sandbox_propagates_to_auxilary_context) {
// TODO(ekaramad, iclelland): Do not propagate feature policies from non-
// sandboxed disowned openers (rel=noopener).
@@ -4982,7 +4983,7 @@
// All frames are allowed to navigate the global history.
if (!delegate_ || delegate_->OnGoToEntryOffset(offset)) {
- if (source->IsSandboxed(blink::mojom::WebSandboxFlags::kTopNavigation)) {
+ if (source->IsSandboxed(network::mojom::WebSandboxFlags::kTopNavigation)) {
// Keep track of whether this is a session history from a sandboxed iframe
// with top level navigation disallowed.
controller_.GoToOffsetInSandboxedFrame(offset,
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
index cb2f1d1..a1e9a2b 100644
--- a/content/browser/web_contents/web_contents_impl_unittest.cc
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -66,9 +66,9 @@
#include "content/test/test_web_contents.h"
#include "net/test/cert_test_util.h"
#include "net/test/test_data_directory.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/mojom/favicon/favicon_url.mojom.h"
#include "third_party/blink/public/mojom/frame/fullscreen.mojom.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -3524,18 +3524,18 @@
TEST_F(WebContentsImplTest, StartingSandboxFlags) {
WebContents::CreateParams params(browser_context());
- const blink::mojom::WebSandboxFlags expected_flags =
- blink::mojom::WebSandboxFlags::kPopups |
- blink::mojom::WebSandboxFlags::kModals |
- blink::mojom::WebSandboxFlags::kTopNavigation;
+ network::mojom::WebSandboxFlags expected_flags =
+ network::mojom::WebSandboxFlags::kPopups |
+ network::mojom::WebSandboxFlags::kModals |
+ network::mojom::WebSandboxFlags::kTopNavigation;
params.starting_sandbox_flags = expected_flags;
std::unique_ptr<WebContentsImpl> new_contents(
WebContentsImpl::CreateWithOpener(params, nullptr));
FrameTreeNode* root = new_contents->GetFrameTree()->root();
- blink::mojom::WebSandboxFlags pending_flags =
+ network::mojom::WebSandboxFlags pending_flags =
root->pending_frame_policy().sandbox_flags;
EXPECT_EQ(pending_flags, expected_flags);
- blink::mojom::WebSandboxFlags effective_flags =
+ network::mojom::WebSandboxFlags effective_flags =
root->effective_frame_policy().sandbox_flags;
EXPECT_EQ(effective_flags, expected_flags);
}
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
index edf716bc..ce836b66 100644
--- a/content/common/frame.mojom
+++ b/content/common/frame.mojom
@@ -18,6 +18,7 @@
import "mojo/public/mojom/base/unguessable_token.mojom";
import "mojo/public/mojom/base/values.mojom";
import "services/network/public/mojom/content_security_policy.mojom";
+import "services/network/public/mojom/web_sandbox_flags.mojom";
import "services/network/public/mojom/url_loader.mojom";
import "services/network/public/mojom/url_loader_factory.mojom";
import "services/network/public/mojom/url_response_head.mojom";
@@ -473,7 +474,7 @@
// |feature_policy_header| is a list of an origin whitelist for each feature
// in the policy.
DidSetFramePolicyHeaders(
- blink.mojom.WebSandboxFlags sandbox_flags,
+ network.mojom.WebSandboxFlags sandbox_flags,
array<blink.mojom.ParsedFeaturePolicyDeclaration> feature_policy_header,
map<blink.mojom.DocumentPolicyFeature, blink.mojom.PolicyValue>
document_policy_header);
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
index 118765f..aad9bfc 100644
--- a/content/common/frame_messages.h
+++ b/content/common/frame_messages.h
@@ -56,6 +56,7 @@
#include "third_party/blink/public/mojom/devtools/console_message.mojom.h"
#include "third_party/blink/public/mojom/favicon/favicon_url.mojom.h"
#include "third_party/blink/public/mojom/feature_policy/document_policy_feature.mojom.h"
+#include "third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom-shared.h"
#include "third_party/blink/public/mojom/feature_policy/policy_disposition.mojom.h"
#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom.h"
#include "third_party/blink/public/mojom/frame/blocked_navigation_types.mojom.h"
@@ -114,7 +115,7 @@
blink::mojom::ScrollbarMode::kMaxValue)
IPC_ENUM_TRAITS_MAX_VALUE(content::StopFindAction,
content::STOP_FIND_ACTION_LAST)
-IPC_ENUM_TRAITS(blink::mojom::WebSandboxFlags) // Bitmask
+IPC_ENUM_TRAITS(network::mojom::WebSandboxFlags) // Bitmask.
IPC_ENUM_TRAITS_MAX_VALUE(blink::WebTreeScopeType,
blink::WebTreeScopeType::kMaxValue)
IPC_ENUM_TRAITS_MAX_VALUE(ui::MenuSourceType, ui::MENU_SOURCE_TYPE_LAST)
diff --git a/content/common/frame_replication_state.cc b/content/common/frame_replication_state.cc
index abae9b0b..ac6b2497 100644
--- a/content/common/frame_replication_state.cc
+++ b/content/common/frame_replication_state.cc
@@ -4,14 +4,14 @@
#include "content/common/frame_replication_state.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
#include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom.h"
#include "third_party/blink/public/web/web_tree_scope_type.h"
namespace content {
FrameReplicationState::FrameReplicationState()
- : active_sandbox_flags(blink::mojom::WebSandboxFlags::kNone),
+ : active_sandbox_flags(network::mojom::WebSandboxFlags::kNone),
scope(blink::WebTreeScopeType::kDocument),
insecure_request_policy(
blink::mojom::InsecureRequestPolicy::kLeaveInsecureRequestsAlone),
@@ -29,10 +29,9 @@
bool has_received_user_gesture,
bool has_received_user_gesture_before_nav,
blink::FrameOwnerElementType owner_type)
- : origin(),
- name(name),
+ : name(name),
unique_name(unique_name),
- active_sandbox_flags(blink::mojom::WebSandboxFlags::kNone),
+ active_sandbox_flags(network::mojom::WebSandboxFlags::kNone),
scope(scope),
insecure_request_policy(insecure_request_policy),
insecure_navigations_set(insecure_navigations_set),
diff --git a/content/common/frame_replication_state.h b/content/common/frame_replication_state.h
index 98226da..08e4c557 100644
--- a/content/common/frame_replication_state.h
+++ b/content/common/frame_replication_state.h
@@ -19,7 +19,6 @@
namespace blink {
enum class WebTreeScopeType;
-enum class WebSandboxFlags;
}
namespace content {
@@ -86,7 +85,7 @@
// inherited from parent frames, the currently active flags from the <iframe>
// element hosting this frame, as well as any flags set from a
// Content-Security-Policy HTTP header.
- blink::mojom::WebSandboxFlags active_sandbox_flags;
+ network::mojom::WebSandboxFlags active_sandbox_flags;
// Iframe sandbox flags and container policy currently in effect for the
// frame. Container policy may be empty if this is the top-level frame.
diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn
index 702a5c6..87dedd0 100644
--- a/content/public/browser/BUILD.gn
+++ b/content/public/browser/BUILD.gn
@@ -267,6 +267,7 @@
"picture_in_picture_window_controller.h",
"platform_notification_context.h",
"platform_notification_service.h",
+ "presentation_receiver_flags.h",
"presentation_request.cc",
"presentation_request.h",
"presentation_screen_availability_listener.h",
diff --git a/content/public/browser/presentation_receiver_flags.h b/content/public/browser/presentation_receiver_flags.h
new file mode 100644
index 0000000..bfb058a
--- /dev/null
+++ b/content/public/browser/presentation_receiver_flags.h
@@ -0,0 +1,22 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_PUBLIC_BROWSER_PRESENTATION_RECEIVER_FLAGS_H_
+#define CONTENT_PUBLIC_BROWSER_PRESENTATION_RECEIVER_FLAGS_H_
+
+#include "services/network/public/cpp/web_sandbox_flags.h"
+
+namespace content {
+
+// Disable popups, modals, and top-level navigation for presentation receivers.
+// See:
+// https://w3c.github.io/presentation-api/#creating-a-receiving-browsing-context
+constexpr network::mojom::WebSandboxFlags kPresentationReceiverSandboxFlags =
+ network::mojom::WebSandboxFlags::kModals |
+ network::mojom::WebSandboxFlags::kPopups |
+ network::mojom::WebSandboxFlags::kTopNavigation;
+
+} // namespace content
+
+#endif // CONTENT_PUBLIC_BROWSER_PRESENTATION_RECEIVER_FLAGS_H_
diff --git a/content/public/browser/render_frame_host.h b/content/public/browser/render_frame_host.h
index 742adab1..2bd5cd2 100644
--- a/content/public/browser/render_frame_host.h
+++ b/content/public/browser/render_frame_host.h
@@ -26,7 +26,6 @@
#include "third_party/blink/public/common/feature_policy/document_policy.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/public/common/frame/frame_owner_element_type.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/common/scheduler/web_scheduler_tracked_feature.h"
#include "third_party/blink/public/mojom/ad_tagging/ad_frame.mojom-forward.h"
#include "third_party/blink/public/mojom/devtools/console_message.mojom.h"
@@ -444,7 +443,7 @@
// The effective flags include those which have been set by a
// Content-Security-Policy header, in addition to those which are set by the
// embedding frame.
- virtual bool IsSandboxed(blink::mojom::WebSandboxFlags flags) = 0;
+ virtual bool IsSandboxed(network::mojom::WebSandboxFlags flags) = 0;
// Calls |FlushForTesting()| on Network Service and FrameNavigationControl
// related interfaces to make sure all in-flight mojo messages have been
diff --git a/content/public/browser/web_contents.cc b/content/public/browser/web_contents.cc
index d1d8ff8..f1dcf53e 100644
--- a/content/public/browser/web_contents.cc
+++ b/content/public/browser/web_contents.cc
@@ -8,6 +8,7 @@
#include "content/public/common/child_process_host.h"
#include "ipc/ipc_message.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
namespace content {
@@ -27,7 +28,7 @@
context(nullptr),
renderer_initiated_creation(false),
desired_renderer_state(kOkayToHaveRendererProcess),
- starting_sandbox_flags(blink::mojom::WebSandboxFlags::kNone),
+ starting_sandbox_flags(network::mojom::WebSandboxFlags::kNone),
is_never_visible(false) {}
WebContents::CreateParams::CreateParams(const CreateParams& other) = default;
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index deafffd..4133778 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -36,7 +36,6 @@
#include "mojo/public/cpp/bindings/remote.h"
#include "services/data_decoder/public/mojom/web_bundler.mojom.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/mojom/frame/find_in_page.mojom-forward.h"
#include "third_party/blink/public/mojom/input/pointer_lock_result.mojom.h"
#include "third_party/blink/public/mojom/loader/pause_subresource_loading_handle.mojom-forward.h"
@@ -212,7 +211,7 @@
} desired_renderer_state;
// Sandboxing flags set on the new WebContents.
- blink::mojom::WebSandboxFlags starting_sandbox_flags;
+ network::mojom::WebSandboxFlags starting_sandbox_flags;
// Value used to set the last time the WebContents was made active, this is
// the value that'll be returned by GetLastActiveTime(). If this is left
diff --git a/content/public/common/navigation_policy.h b/content/public/common/navigation_policy.h
index d5068bc..22f65741 100644
--- a/content/public/common/navigation_policy.h
+++ b/content/public/common/navigation_policy.h
@@ -39,7 +39,7 @@
kAdFrame = 10,
// The navigation was initiated from or occurred in an iframe with
- // |WebSandboxFlags::kDownloads| flag set.
+ // |network::mojom::WebSandboxFlags::kDownloads| flag set.
kSandbox = 11,
// The navigation was initiated without user activation.
diff --git a/content/public/test/fake_remote_frame.h b/content/public/test/fake_remote_frame.h
index b2525b6d..44b0cdf 100644
--- a/content/public/test/fake_remote_frame.h
+++ b/content/public/test/fake_remote_frame.h
@@ -77,7 +77,7 @@
void IntrinsicSizingInfoOfChildChanged(
blink::mojom::IntrinsicSizingInfoPtr sizing_info) override;
void DidSetFramePolicyHeaders(
- blink::mojom::WebSandboxFlags sandbox_flags,
+ network::mojom::WebSandboxFlags sandbox_flags,
const std::vector<blink::ParsedFeaturePolicyDeclaration>&
parsed_feature_policy) override {}
void DidUpdateFramePolicy(const blink::FramePolicy& frame_policy) override {}
diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h
index 8b7bcab9..971c945b 100644
--- a/content/public/test/mock_render_thread.h
+++ b/content/public/test/mock_render_thread.h
@@ -29,7 +29,6 @@
}
namespace blink {
-enum class WebSandboxFlags;
enum class WebTreeScopeType;
}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 4bdce53..c1e23c5 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -160,7 +160,6 @@
#include "services/viz/public/cpp/gpu/context_provider_command_buffer.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/blink/public/common/features.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/common/input/web_keyboard_event.h"
#include "third_party/blink/public/common/loader/url_loader_throttle.h"
#include "third_party/blink/public/common/logging/logging_utils.h"
@@ -4142,13 +4141,13 @@
}
void RenderFrameImpl::DidSetFramePolicyHeaders(
- blink::mojom::WebSandboxFlags flags,
+ network::mojom::WebSandboxFlags flags,
const blink::ParsedFeaturePolicy& fp_header,
const blink::DocumentPolicy::FeatureState& dp_header) {
// If any of Feature Policy or Sandbox Flags or Document Policy are different
// from the default (empty) values, then send them to the browser.
if (!dp_header.empty() || !fp_header.empty() ||
- flags != blink::mojom::WebSandboxFlags::kNone) {
+ flags != network::mojom::WebSandboxFlags::kNone) {
GetFrameHost()->DidSetFramePolicyHeaders(flags, fp_header, dp_header);
}
}
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 9c82e330..dcf00d8 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -684,7 +684,7 @@
void DidChangeFramePolicy(blink::WebFrame* child_frame,
const blink::FramePolicy& frame_policy) override;
void DidSetFramePolicyHeaders(
- blink::mojom::WebSandboxFlags flags,
+ network::mojom::WebSandboxFlags flags,
const blink::ParsedFeaturePolicy& fp_header,
const blink::DocumentPolicy::FeatureState& dp_header) override;
void DidChangeFrameOwnerProperties(
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 490db5a..fd28a18 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -1041,7 +1041,7 @@
blink::WebView* new_web_view = view()->CreateView(
GetMainFrame(), popup_request, blink::WebWindowFeatures(), "foo",
blink::kWebNavigationPolicyNewForegroundTab,
- blink::mojom::WebSandboxFlags::kNone,
+ network::mojom::WebSandboxFlags::kNone,
blink::FeaturePolicy::FeatureState(),
blink::AllocateSessionStorageNamespaceId());
RenderViewImpl* new_view = RenderViewImpl::FromWebView(new_web_view);
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index f0cb483..0c4c4cb 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1219,7 +1219,7 @@
const WebWindowFeatures& features,
const WebString& frame_name,
WebNavigationPolicy policy,
- blink::mojom::WebSandboxFlags sandbox_flags,
+ network::mojom::WebSandboxFlags sandbox_flags,
const blink::FeaturePolicy::FeatureState& opener_feature_state,
const blink::SessionStorageNamespaceId& session_storage_namespace_id) {
RenderFrameImpl* creator_frame = RenderFrameImpl::FromWebFrame(creator);
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 701aac4..ff73f1c2 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -216,7 +216,7 @@
const blink::WebWindowFeatures& features,
const blink::WebString& frame_name,
blink::WebNavigationPolicy policy,
- blink::mojom::WebSandboxFlags sandbox_flags,
+ network::mojom::WebSandboxFlags sandbox_flags,
const blink::FeaturePolicy::FeatureState& opener_feature_state,
const blink::SessionStorageNamespaceId& session_storage_namespace_id)
override;
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc
index e9c1fd9..dc1e3b2 100644
--- a/content/shell/browser/shell.cc
+++ b/content/shell/browser/shell.cc
@@ -26,6 +26,7 @@
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/picture_in_picture_window_controller.h"
+#include "content/public/browser/presentation_receiver_flags.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host.h"
@@ -45,7 +46,6 @@
#include "content/shell/common/web_test/web_test_switches.h"
#include "media/media_buildflags.h"
#include "third_party/blink/public/common/peerconnection/webrtc_ip_handling_policy.h"
-#include "third_party/blink/public/common/presentation/presentation_receiver_flags.h"
#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
namespace content {
@@ -223,7 +223,7 @@
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kForcePresentationReceiverForTesting)) {
create_params.starting_sandbox_flags =
- blink::kPresentationReceiverSandboxFlags;
+ content::kPresentationReceiverSandboxFlags;
}
std::unique_ptr<WebContents> web_contents =
WebContents::Create(create_params);
@@ -245,7 +245,7 @@
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kForcePresentationReceiverForTesting)) {
create_params.starting_sandbox_flags =
- blink::kPresentationReceiverSandboxFlags;
+ content::kPresentationReceiverSandboxFlags;
}
std::map<std::string, scoped_refptr<SessionStorageNamespace>>
session_storages;
diff --git a/content/shell/test_runner/web_view_test_proxy.cc b/content/shell/test_runner/web_view_test_proxy.cc
index de5a51b2..56cd5e9f 100644
--- a/content/shell/test_runner/web_view_test_proxy.cc
+++ b/content/shell/test_runner/web_view_test_proxy.cc
@@ -34,7 +34,7 @@
const blink::WebWindowFeatures& features,
const blink::WebString& frame_name,
blink::WebNavigationPolicy policy,
- blink::mojom::WebSandboxFlags sandbox_flags,
+ network::mojom::WebSandboxFlags sandbox_flags,
const blink::FeaturePolicy::FeatureState& opener_feature_state,
const blink::SessionStorageNamespaceId& session_storage_namespace_id) {
if (GetTestRunner()->ShouldDumpNavigationPolicy()) {
diff --git a/content/shell/test_runner/web_view_test_proxy.h b/content/shell/test_runner/web_view_test_proxy.h
index 6d1f4104..a6173a4 100644
--- a/content/shell/test_runner/web_view_test_proxy.h
+++ b/content/shell/test_runner/web_view_test_proxy.h
@@ -73,7 +73,7 @@
const blink::WebWindowFeatures& features,
const blink::WebString& frame_name,
blink::WebNavigationPolicy policy,
- blink::mojom::WebSandboxFlags sandbox_flags,
+ network::mojom::WebSandboxFlags sandbox_flags,
const blink::FeaturePolicy::FeatureState&,
const blink::SessionStorageNamespaceId&
session_storage_namespace_id) override;
diff --git a/content/test/test_render_frame.cc b/content/test/test_render_frame.cc
index 4fc1fd5..6c7bb370 100644
--- a/content/test/test_render_frame.cc
+++ b/content/test/test_render_frame.cc
@@ -203,7 +203,7 @@
const std::string& unique_name) override {}
void DidSetFramePolicyHeaders(
- blink::mojom::WebSandboxFlags sandbox_flags,
+ network::mojom::WebSandboxFlags sandbox_flags,
const blink::ParsedFeaturePolicy& feature_policy_header,
const blink::DocumentPolicy::FeatureState& document_policy_header)
override {}
diff --git a/content/test/test_render_frame_host.cc b/content/test/test_render_frame_host.cc
index 78fc504..72645fa 100644
--- a/content/test/test_render_frame_host.cc
+++ b/content/test/test_render_frame_host.cc
@@ -229,7 +229,7 @@
header[0].values.insert(std::pair<url::Origin, blink::PolicyValue>(
origin, blink::PolicyValue(true)));
}
- DidSetFramePolicyHeaders(blink::mojom::WebSandboxFlags::kNone, header,
+ DidSetFramePolicyHeaders(network::mojom::WebSandboxFlags::kNone, header,
{} /* dp_header */);
}
@@ -490,7 +490,7 @@
}
void TestRenderFrameHost::SendFramePolicy(
- blink::mojom::WebSandboxFlags sandbox_flags,
+ network::mojom::WebSandboxFlags sandbox_flags,
const blink::ParsedFeaturePolicy& fp_header,
const blink::DocumentPolicy::FeatureState& dp_header) {
DidSetFramePolicyHeaders(sandbox_flags, fp_header, dp_header);
diff --git a/content/test/test_render_frame_host.h b/content/test/test_render_frame_host.h
index b9d7bab..7a4b1fe4 100644
--- a/content/test/test_render_frame_host.h
+++ b/content/test/test_render_frame_host.h
@@ -160,7 +160,7 @@
bool same_document);
// Send a message with the sandbox flags and feature policy
- void SendFramePolicy(blink::mojom::WebSandboxFlags sandbox_flags,
+ void SendFramePolicy(network::mojom::WebSandboxFlags sandbox_flags,
const blink::ParsedFeaturePolicy& fp_header,
const blink::DocumentPolicy::FeatureState& dp_header);
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_embedder.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_embedder.cc
index 626a85bc..6ee5205d 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_embedder.cc
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_embedder.cc
@@ -18,9 +18,9 @@
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_constants.h"
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
#include "extensions/common/mojom/guest_view.mojom.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/blink/public/common/frame/frame_owner_element_type.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
namespace extensions {
@@ -229,7 +229,7 @@
// NavigationRequest, DidFinishNavigation is called before FrameDeleted (see
// https://crbug.com/969840).
if (render_frame_host_ && !render_frame_host_->IsSandboxed(
- blink::mojom::WebSandboxFlags::kPlugins)) {
+ network::mojom::WebSandboxFlags::kPlugins)) {
return;
}
if (render_frame_host_) {
diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn
index deb7d6d..ac13d60 100644
--- a/services/network/public/cpp/BUILD.gn
+++ b/services/network/public/cpp/BUILD.gn
@@ -80,6 +80,7 @@
"source_stream_to_data_pipe.h",
"weak_wrapper_shared_url_loader_factory.cc",
"weak_wrapper_shared_url_loader_factory.h",
+ "web_sandbox_flags.h",
"wrapper_shared_url_loader_factory.cc",
"wrapper_shared_url_loader_factory.h",
]
diff --git a/services/network/public/cpp/web_sandbox_flags.h b/services/network/public/cpp/web_sandbox_flags.h
new file mode 100644
index 0000000..a1ed4bd
--- /dev/null
+++ b/services/network/public/cpp/web_sandbox_flags.h
@@ -0,0 +1,38 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef SERVICES_NETWORK_PUBLIC_CPP_WEB_SANDBOX_FLAGS_H_
+#define SERVICES_NETWORK_PUBLIC_CPP_WEB_SANDBOX_FLAGS_H_
+
+#include <cstdint>
+
+namespace network {
+namespace mojom {
+
+enum class WebSandboxFlags : int32_t;
+
+inline constexpr WebSandboxFlags operator&(WebSandboxFlags a,
+ WebSandboxFlags b) {
+ return static_cast<WebSandboxFlags>(static_cast<int>(a) &
+ static_cast<int>(b));
+}
+
+inline constexpr WebSandboxFlags operator|(WebSandboxFlags a,
+ WebSandboxFlags b) {
+ return static_cast<WebSandboxFlags>(static_cast<int>(a) |
+ static_cast<int>(b));
+}
+
+inline WebSandboxFlags& operator|=(WebSandboxFlags& a, WebSandboxFlags b) {
+ return a = a | b;
+}
+
+inline constexpr WebSandboxFlags operator~(WebSandboxFlags flags) {
+ return static_cast<WebSandboxFlags>(~static_cast<int>(flags));
+}
+
+} // namespace mojom
+} // namespace network
+
+#endif // SERVICES_NETWORK_PUBLIC_CPP_SANDBOX_FLAGS_H_
diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn
index 9a0b0f20..b68018af 100644
--- a/services/network/public/mojom/BUILD.gn
+++ b/services/network/public/mojom/BUILD.gn
@@ -320,6 +320,7 @@
"url_loader_factory.mojom",
"url_response_head.mojom",
"web_client_hints_types.mojom",
+ "web_sandbox_flags.mojom",
]
public_deps = [
diff --git a/services/network/public/mojom/web_sandbox_flags.mojom b/services/network/public/mojom/web_sandbox_flags.mojom
new file mode 100644
index 0000000..04d3d5b
--- /dev/null
+++ b/services/network/public/mojom/web_sandbox_flags.mojom
@@ -0,0 +1,49 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+module network.mojom;
+// Enum types for the sandbox attributes of the main resource.
+// TODO(https://crbug.com/1041376): Parse the flags in the network service.
+//
+// See content/browser/frame_host/sandbox_flags.md for more details about how
+// the web-layer components (i.e. //content and Blink) consume and apply these
+// flags.
+
+[Extensible]
+enum WebSandboxFlags {
+ kNone = 0,
+
+ kNavigation = 1, // 1 << 0
+ kPlugins = 2, // 1 << 1
+ kOrigin = 4, // 1 << 2
+ kForms = 8, // 1 << 3
+ kScripts = 16, // 1 << 4
+ kTopNavigation = 32, // 1 << 5
+
+ // See https://www.w3.org/Bugs/Public/show_bug.cgi?id=12393
+ kPopups = 64, // 1 << 6
+
+ kAutomaticFeatures = 128, // 1 << 7
+ kPointerLock = 256, // 1 << 8
+ kDocumentDomain = 512, // 1 << 9
+
+ // See https://w3c.github.io/screen-orientation/#dfn-sandboxed-orientation-lock-browsing-context-flag.
+ kOrientationLock = 1024, // 1 << 10
+
+ kPropagatesToAuxiliaryBrowsingContexts = 2048, // 1 << 11
+ kModals = 4096, // 1 << 12
+
+ // See https://w3c.github.io/presentation-api/#sandboxing-and-the-allow-presentation-keyword
+ kPresentationController = 8192, // 1 << 13
+
+ // See https://github.com/WICG/interventions/issues/42.
+ kTopNavigationByUserActivation = 16384, // 1 << 14
+
+ // See https://crbug.com/539938
+ kDownloads = 32768, // 1 << 15
+
+ kStorageAccessByUserActivation = 65536, // 1 << 16
+
+ kAll = -1, // Mask with all bits set.
+};
diff --git a/third_party/blink/common/DEPS b/third_party/blink/common/DEPS
index da11faf..7ac0be7 100644
--- a/third_party/blink/common/DEPS
+++ b/third_party/blink/common/DEPS
@@ -13,6 +13,7 @@
"+mojo",
"+services/metrics/public/cpp",
"+services/network/public/cpp",
+ "+services/network/public/mojom/web_sandbox_flags.mojom-blink.h",
"+services/network/public/mojom/url_loader.mojom.h",
"+services/network/public/mojom/url_loader_factory.mojom.h",
"+services/network/public/mojom/url_response_head.mojom.h",
diff --git a/third_party/blink/common/feature_policy/feature_policy.cc b/third_party/blink/common/feature_policy/feature_policy.cc
index 0eb5e615..ac6e3fc 100644
--- a/third_party/blink/common/feature_policy/feature_policy.cc
+++ b/third_party/blink/common/feature_policy/feature_policy.cc
@@ -8,7 +8,7 @@
#include "base/memory/ptr_util.h"
#include "base/no_destructor.h"
#include "base/stl_util.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom.h"
namespace blink {
@@ -381,41 +381,42 @@
// static
mojom::FeaturePolicyFeature FeaturePolicy::FeatureForSandboxFlag(
- mojom::WebSandboxFlags flag) {
+ network::mojom::blink::WebSandboxFlags flag) {
switch (flag) {
- case mojom::WebSandboxFlags::kAll:
+ case network::mojom::blink::WebSandboxFlags::kAll:
NOTREACHED();
break;
- case mojom::WebSandboxFlags::kTopNavigation:
+ case network::mojom::blink::WebSandboxFlags::kTopNavigation:
return mojom::FeaturePolicyFeature::kTopNavigation;
- case mojom::WebSandboxFlags::kForms:
+ case network::mojom::blink::WebSandboxFlags::kForms:
return mojom::FeaturePolicyFeature::kFormSubmission;
- case mojom::WebSandboxFlags::kAutomaticFeatures:
- case mojom::WebSandboxFlags::kScripts:
+ case network::mojom::blink::WebSandboxFlags::kAutomaticFeatures:
+ case network::mojom::blink::WebSandboxFlags::kScripts:
return mojom::FeaturePolicyFeature::kScript;
- case mojom::WebSandboxFlags::kPopups:
+ case network::mojom::blink::WebSandboxFlags::kPopups:
return mojom::FeaturePolicyFeature::kPopups;
- case mojom::WebSandboxFlags::kPointerLock:
+ case network::mojom::blink::WebSandboxFlags::kPointerLock:
return mojom::FeaturePolicyFeature::kPointerLock;
- case mojom::WebSandboxFlags::kOrientationLock:
+ case network::mojom::blink::WebSandboxFlags::kOrientationLock:
return mojom::FeaturePolicyFeature::kOrientationLock;
- case mojom::WebSandboxFlags::kModals:
+ case network::mojom::blink::WebSandboxFlags::kModals:
return mojom::FeaturePolicyFeature::kModals;
- case mojom::WebSandboxFlags::kPresentationController:
+ case network::mojom::blink::WebSandboxFlags::kPresentationController:
return mojom::FeaturePolicyFeature::kPresentation;
- case mojom::WebSandboxFlags::kDownloads:
+ case network::mojom::blink::WebSandboxFlags::kDownloads:
return mojom::FeaturePolicyFeature::kDownloads;
// Other flags fall through to the bitmask test below. They are named
// specifically here so that authors introducing new flags must consider
// this method when adding them.
- case mojom::WebSandboxFlags::kDocumentDomain:
- case mojom::WebSandboxFlags::kNavigation:
- case mojom::WebSandboxFlags::kNone:
- case mojom::WebSandboxFlags::kOrigin:
- case mojom::WebSandboxFlags::kPlugins:
- case mojom::WebSandboxFlags::kPropagatesToAuxiliaryBrowsingContexts:
- case mojom::WebSandboxFlags::kTopNavigationByUserActivation:
- case mojom::WebSandboxFlags::kStorageAccessByUserActivation:
+ case network::mojom::blink::WebSandboxFlags::kDocumentDomain:
+ case network::mojom::blink::WebSandboxFlags::kNavigation:
+ case network::mojom::blink::WebSandboxFlags::kNone:
+ case network::mojom::blink::WebSandboxFlags::kOrigin:
+ case network::mojom::blink::WebSandboxFlags::kPlugins:
+ case network::mojom::blink::WebSandboxFlags::
+ kPropagatesToAuxiliaryBrowsingContexts:
+ case network::mojom::blink::WebSandboxFlags::kTopNavigationByUserActivation:
+ case network::mojom::blink::WebSandboxFlags::kStorageAccessByUserActivation:
break;
}
return mojom::FeaturePolicyFeature::kNotFound;
diff --git a/third_party/blink/common/feature_policy/feature_policy.typemap b/third_party/blink/common/feature_policy/feature_policy.typemap
index 46ec995..f3c1a87 100644
--- a/third_party/blink/common/feature_policy/feature_policy.typemap
+++ b/third_party/blink/common/feature_policy/feature_policy.typemap
@@ -6,11 +6,8 @@
public_headers = [
"//third_party/blink/public/common/feature_policy/feature_policy.h",
"//third_party/blink/public/common/feature_policy/policy_value.h",
- "//third_party/blink/public/common/frame/sandbox_flags.h",
]
traits_headers = [
"//third_party/blink/common/feature_policy/feature_policy_mojom_traits.h",
]
-type_mappings = [
- "blink.mojom.ParsedFeaturePolicyDeclaration=::blink::ParsedFeaturePolicyDeclaration",
-]
+type_mappings = [ "blink.mojom.ParsedFeaturePolicyDeclaration=::blink::ParsedFeaturePolicyDeclaration" ]
diff --git a/third_party/blink/common/feature_policy/feature_policy_mojom_traits.h b/third_party/blink/common/feature_policy/feature_policy_mojom_traits.h
index 50a9f97..d3d2507 100644
--- a/third_party/blink/common/feature_policy/feature_policy_mojom_traits.h
+++ b/third_party/blink/common/feature_policy/feature_policy_mojom_traits.h
@@ -12,7 +12,6 @@
#include "third_party/blink/common/feature_policy/policy_value_mojom_traits.h"
#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom-shared.h"
#include "url/mojom/origin_mojom_traits.h"
diff --git a/third_party/blink/common/frame/frame_policy.cc b/third_party/blink/common/frame/frame_policy.cc
index 0165cfc..98b5ef4 100644
--- a/third_party/blink/common/frame/frame_policy.cc
+++ b/third_party/blink/common/frame/frame_policy.cc
@@ -3,18 +3,19 @@
// found in the LICENSE file.
#include "third_party/blink/public/common/frame/frame_policy.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
namespace blink {
FramePolicy::FramePolicy()
- : sandbox_flags(mojom::WebSandboxFlags::kNone),
+ : sandbox_flags(network::mojom::blink::WebSandboxFlags::kNone),
container_policy({}),
required_document_policy({}),
allowed_to_download(true),
disallow_document_access(false) {}
FramePolicy::FramePolicy(
- mojom::WebSandboxFlags sandbox_flags,
+ network::mojom::blink::WebSandboxFlags sandbox_flags,
const ParsedFeaturePolicy& container_policy,
const DocumentPolicy::FeatureState& required_document_policy,
bool allowed_to_download,
diff --git a/third_party/blink/common/frame/frame_policy.typemap b/third_party/blink/common/frame/frame_policy.typemap
index e6b5681..ef74948 100644
--- a/third_party/blink/common/frame/frame_policy.typemap
+++ b/third_party/blink/common/frame/frame_policy.typemap
@@ -6,7 +6,6 @@
public_headers = [
"//third_party/blink/public/common/frame/frame_policy.h",
"//third_party/blink/public/common/feature_policy/policy_value.h",
- "//third_party/blink/public/common/frame/sandbox_flags.h",
]
traits_headers =
[ "//third_party/blink/common/frame/frame_policy_mojom_traits.h" ]
diff --git a/third_party/blink/common/frame/frame_policy_mojom_traits.h b/third_party/blink/common/frame/frame_policy_mojom_traits.h
index b585f00b..ca01f91b 100644
--- a/third_party/blink/common/frame/frame_policy_mojom_traits.h
+++ b/third_party/blink/common/frame/frame_policy_mojom_traits.h
@@ -5,6 +5,7 @@
#ifndef THIRD_PARTY_BLINK_COMMON_FRAME_FRAME_POLICY_MOJOM_TRAITS_H_
#define THIRD_PARTY_BLINK_COMMON_FRAME_FRAME_POLICY_MOJOM_TRAITS_H_
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/common/feature_policy/feature_policy_mojom_traits.h"
#include "third_party/blink/public/common/frame/frame_policy.h"
#include "third_party/blink/public/mojom/frame/frame_policy.mojom-shared.h"
@@ -28,7 +29,7 @@
return frame_policy.container_policy;
}
- static blink::mojom::WebSandboxFlags sandbox_flags(
+ static network::mojom::blink::WebSandboxFlags sandbox_flags(
const blink::FramePolicy& frame_policy) {
return frame_policy.sandbox_flags;
}
diff --git a/third_party/blink/public/common/BUILD.gn b/third_party/blink/public/common/BUILD.gn
index f5dcc05..ab1ca42 100644
--- a/third_party/blink/public/common/BUILD.gn
+++ b/third_party/blink/public/common/BUILD.gn
@@ -74,7 +74,6 @@
"frame/frame_owner_element_type.h",
"frame/frame_policy.h",
"frame/from_ad_state.h",
- "frame/sandbox_flags.h",
"frame/user_activation_state.h",
"frame/user_activation_update_source.h",
"indexeddb/indexed_db_default_mojom_traits.h",
@@ -140,7 +139,6 @@
"peerconnection/webrtc_ip_handling_policy.h",
"permissions/permission_utils.h",
"prerender/prerender_rel_type.h",
- "presentation/presentation_receiver_flags.h",
"privacy_budget/identifiability_metric_builder.h",
"privacy_budget/identifiability_metrics.h",
"privacy_budget/identifiable_surface.h",
diff --git a/third_party/blink/public/common/feature_policy/feature_policy.h b/third_party/blink/public/common/feature_policy/feature_policy.h
index 12bb4018..f47828b 100644
--- a/third_party/blink/public/common/feature_policy/feature_policy.h
+++ b/third_party/blink/public/common/feature_policy/feature_policy.h
@@ -13,6 +13,7 @@
#include "base/containers/flat_set.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/common/feature_policy/policy_value.h"
#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom-forward.h"
@@ -21,10 +22,6 @@
namespace blink {
-namespace mojom {
-enum class WebSandboxFlags;
-}
-
// Feature Policy is a mechanism for controlling the availability of web
// platform features in a frame, including all embedded frames. It can be used
// to remove features, automatically refuse API permission requests, or modify
@@ -258,7 +255,7 @@
static const FeatureList& GetDefaultFeatureList();
static mojom::FeaturePolicyFeature FeatureForSandboxFlag(
- mojom::WebSandboxFlags flag);
+ network::mojom::WebSandboxFlags flag);
private:
friend class FeaturePolicyTest;
diff --git a/third_party/blink/public/common/frame/frame_policy.h b/third_party/blink/public/common/frame/frame_policy.h
index ccb7254..9b88064 100644
--- a/third_party/blink/public/common/frame/frame_policy.h
+++ b/third_party/blink/public/common/frame/frame_policy.h
@@ -5,9 +5,9 @@
#ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_FRAME_FRAME_POLICY_H_
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_FRAME_FRAME_POLICY_H_
+#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
#include "third_party/blink/public/common/feature_policy/document_policy.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
namespace blink {
@@ -25,7 +25,7 @@
// navigated.
struct BLINK_COMMON_EXPORT FramePolicy {
FramePolicy();
- FramePolicy(mojom::WebSandboxFlags sandbox_flags,
+ FramePolicy(network::mojom::WebSandboxFlags sandbox_flags,
const ParsedFeaturePolicy& container_policy,
const DocumentPolicy::FeatureState& required_document_policy,
bool allowed_to_download = true,
@@ -33,7 +33,7 @@
FramePolicy(const FramePolicy& lhs);
~FramePolicy();
- mojom::WebSandboxFlags sandbox_flags;
+ network::mojom::WebSandboxFlags sandbox_flags;
ParsedFeaturePolicy container_policy;
// |required_document_policy| is the combination of the following:
// - iframe 'policy' attribute
diff --git a/third_party/blink/public/common/presentation/presentation_receiver_flags.h b/third_party/blink/public/common/presentation/presentation_receiver_flags.h
deleted file mode 100644
index b8b4f95..0000000
--- a/third_party/blink/public/common/presentation/presentation_receiver_flags.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2017 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_PRESENTATION_PRESENTATION_RECEIVER_FLAGS_H_
-#define THIRD_PARTY_BLINK_PUBLIC_COMMON_PRESENTATION_PRESENTATION_RECEIVER_FLAGS_H_
-
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
-
-namespace blink {
-
-// Disable popups, modals, and top-level navigation for presentation receivers.
-// See:
-// https://w3c.github.io/presentation-api/#creating-a-receiving-browsing-context
-constexpr mojom::WebSandboxFlags kPresentationReceiverSandboxFlags =
- mojom::WebSandboxFlags::kPopups | mojom::WebSandboxFlags::kModals |
- mojom::WebSandboxFlags::kTopNavigation;
-
-} // namespace blink
-
-#endif // THIRD_PARTY_BLINK_PUBLIC_COMMON_PRESENTATION_PRESENTATION_RECEIVER_FLAGS_H_
diff --git a/third_party/blink/public/mojom/feature_policy/feature_policy.mojom b/third_party/blink/public/mojom/feature_policy/feature_policy.mojom
index 576639a0..4d51e1e8 100644
--- a/third_party/blink/public/mojom/feature_policy/feature_policy.mojom
+++ b/third_party/blink/public/mojom/feature_policy/feature_policy.mojom
@@ -8,38 +8,6 @@
import "third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom";
import "third_party/blink/public/mojom/feature_policy/policy_value.mojom";
-// See http://www.whatwg.org/specs/web-apps/current-work/#attr-iframe-sandbox
-// for a list of the sandbox flags.
-[Extensible]
-enum WebSandboxFlags {
- kNone = 0,
- kNavigation = 1, // 1 << 0
- kPlugins = 2, // 1 << 1
- kOrigin = 4, // 1 << 2
- kForms = 8, // 1 << 3
- kScripts = 16, // 1 << 4
- kTopNavigation = 32, // 1 << 5
- // See https://www.w3.org/Bugs/Public/show_bug.cgi?id=12393
- kPopups = 64, // 1 << 6
- kAutomaticFeatures = 128, // 1 << 7
- kPointerLock = 256, // 1 << 8
- // See
- // https://w3c.github.io/screen-orientation/#dfn-sandboxed-orientation-lock-browsing-context-flag.
- kDocumentDomain = 512, // 1 << 9
- kOrientationLock = 1024, // 1 << 10
- kPropagatesToAuxiliaryBrowsingContexts = 2048, // 1 << 11
- kModals = 4096, // 1 << 12
- // See
- // https://w3c.github.io/presentation-api/#sandboxing-and-the-allow-presentation-keyword
- kPresentationController = 8192, // 1 << 13
- // See https://github.com/WICG/interventions/issues/42.
- kTopNavigationByUserActivation = 16384, // 1 << 14
- // See https://crbug.com/539938
- kDownloads = 32768, // 1 << 15
- kStorageAccessByUserActivation = 65536, // 1 << 16
- kAll = -1, // Masks all bits set to 1.
-};
-
// This struct holds feature policy allowlist data that needs to be replicated
// between a RenderFrame and any of its associated RenderFrameProxies. A list of
// these form a ParsedFeaturePolicy.
diff --git a/third_party/blink/public/mojom/frame/frame.mojom b/third_party/blink/public/mojom/frame/frame.mojom
index 4419927..483ffbd 100644
--- a/third_party/blink/public/mojom/frame/frame.mojom
+++ b/third_party/blink/public/mojom/frame/frame.mojom
@@ -12,6 +12,7 @@
import "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom";
import "services/network/public/mojom/content_security_policy.mojom";
import "services/network/public/mojom/fetch_api.mojom";
+import "services/network/public/mojom/web_sandbox_flags.mojom";
import "skia/public/mojom/skcolor.mojom";
import "third_party/blink/public/mojom/ad_tagging/ad_frame.mojom";
import "third_party/blink/public/mojom/devtools/console_message.mojom";
@@ -607,7 +608,7 @@
// Used to replicate the updated sandbox flags and feature policy headers to
// all corresponding remote frames of a local frame when a navigation commits.
- DidSetFramePolicyHeaders(blink.mojom.WebSandboxFlags sandbox_flags,
+ DidSetFramePolicyHeaders(network.mojom.WebSandboxFlags sandbox_flags,
array<blink.mojom.ParsedFeaturePolicyDeclaration> parsed_feature_policy);
// Notifies the frame that its parent has changed the frame's sandbox flags or
diff --git a/third_party/blink/public/mojom/frame/frame_policy.mojom b/third_party/blink/public/mojom/frame/frame_policy.mojom
index 1f510af6..9894c56 100644
--- a/third_party/blink/public/mojom/frame/frame_policy.mojom
+++ b/third_party/blink/public/mojom/frame/frame_policy.mojom
@@ -4,6 +4,7 @@
module blink.mojom;
+import "services/network/public/mojom/web_sandbox_flags.mojom";
import "third_party/blink/public/mojom/feature_policy/feature_policy.mojom";
import "third_party/blink/public/mojom/feature_policy/document_policy_feature.mojom";
import "third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom";
@@ -14,7 +15,7 @@
// member of CommitNavigationParams. For details, please refer to
// navigation_params.mojom.
struct FramePolicy {
- blink.mojom.WebSandboxFlags sandbox_flags;
+ network.mojom.WebSandboxFlags sandbox_flags;
array<blink.mojom.ParsedFeaturePolicyDeclaration> container_policy;
map<blink.mojom.DocumentPolicyFeature, blink.mojom.PolicyValue> required_document_policy;
bool allowed_to_download = true;
diff --git a/third_party/blink/public/web/DEPS b/third_party/blink/public/web/DEPS
index 99d893d2..37dde92 100644
--- a/third_party/blink/public/web/DEPS
+++ b/third_party/blink/public/web/DEPS
@@ -27,6 +27,9 @@
"+mojo/public",
"+net/cookies/site_for_cookies.h",
"+services/metrics/public/cpp/ukm_source_id.h",
+ "+services/network/public/cpp/web_sandbox_flags.h",
+ "+services/network/public/mojom/web_sandbox_flags.mojom-shared.h",
+ "+services/network/public/mojom/web_sandbox_flags.mojom-blink-forward.h",
"+services/network/public/mojom/content_security_policy.mojom-shared.h",
"+services/network/public/mojom/cors.mojom-shared.h",
"+services/network/public/mojom/cors_origin_pattern.mojom-shared.h",
diff --git a/third_party/blink/public/web/web_frame.h b/third_party/blink/public/web/web_frame.h
index 14a2f0b..405796fe 100644
--- a/third_party/blink/public/web/web_frame.h
+++ b/third_party/blink/public/web/web_frame.h
@@ -49,9 +49,6 @@
class WebRemoteFrame;
class WebSecurityOrigin;
class WebView;
-namespace mojom {
-enum class WebSandboxFlags;
-}
// Frames may be rendered in process ('local') or out of process ('remote').
// A remote frame is always cross-site; a local frame may be either same-site or
diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
index 0b15441..8a545fca 100644
--- a/third_party/blink/public/web/web_local_frame.h
+++ b/third_party/blink/public/web/web_local_frame.h
@@ -13,9 +13,9 @@
#include "base/optional.h"
#include "base/unguessable_token.h"
#include "services/network/public/mojom/fetch_api.mojom-shared.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
#include "third_party/blink/public/common/css/page_size_type.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/common/frame/user_activation_update_source.h"
#include "third_party/blink/public/common/messaging/transferable_message.h"
#include "third_party/blink/public/mojom/ad_tagging/ad_frame.mojom-shared.h"
@@ -95,7 +95,7 @@
blink::InterfaceRegistry*,
WebFrame* opener = nullptr,
const WebString& name = WebString(),
- mojom::WebSandboxFlags = mojom::WebSandboxFlags::kNone,
+ network::mojom::WebSandboxFlags = network::mojom::WebSandboxFlags::kNone,
const FeaturePolicy::FeatureState& opener_feature_state =
FeaturePolicy::FeatureState());
@@ -527,7 +527,8 @@
// where the notion of FrameReplicationState is relevant to.
// Returns the effective sandbox flags which are inherited from their parent
// frame.
- virtual mojom::WebSandboxFlags EffectiveSandboxFlagsForTesting() const = 0;
+ virtual network::mojom::WebSandboxFlags EffectiveSandboxFlagsForTesting()
+ const = 0;
// Returns false if this frame, or any parent frame is sandboxed and does not
// have the flag "allow-downloads" set.
diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
index d11faf48..4bb3e8c 100644
--- a/third_party/blink/public/web/web_local_frame_client.h
+++ b/third_party/blink/public/web/web_local_frame_client.h
@@ -37,9 +37,9 @@
#include "base/optional.h"
#include "base/unguessable_token.h"
#include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/public/common/frame/frame_owner_element_type.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/common/loader/loading_behavior_flag.h"
#include "third_party/blink/public/common/loader/url_loader_factory_bundle.h"
#include "third_party/blink/public/common/navigation/triggering_event_info.h"
@@ -260,7 +260,7 @@
// HTTP header (for sandbox flags) is encountered while loading the frame's
// document.
virtual void DidSetFramePolicyHeaders(
- mojom::WebSandboxFlags flags,
+ network::mojom::WebSandboxFlags flags,
const ParsedFeaturePolicy& feature_policy_header,
const DocumentPolicy::FeatureState& document_policy_header) {}
diff --git a/third_party/blink/public/web/web_navigation_params.h b/third_party/blink/public/web/web_navigation_params.h
index 85ca493..cadf348 100644
--- a/third_party/blink/public/web/web_navigation_params.h
+++ b/third_party/blink/public/web/web_navigation_params.h
@@ -87,8 +87,8 @@
bool is_client_redirect = false;
// Whether the navigation initiator frame has the
- // |mojom::blink::WebSandboxFlags::kDownloads| bit set in its sandbox flags
- // set.
+ // |network::mojom::blink::WebSandboxFlags::kDownloads| bit set in its sandbox
+ // flags set.
bool initiator_frame_has_download_sandbox_flag = false;
// Whether the navigation initiator frame is an ad frame.
diff --git a/third_party/blink/public/web/web_remote_frame.h b/third_party/blink/public/web/web_remote_frame.h
index c684e48..b54ec89f1 100644
--- a/third_party/blink/public/web/web_remote_frame.h
+++ b/third_party/blink/public/web/web_remote_frame.h
@@ -8,7 +8,6 @@
#include "services/network/public/mojom/content_security_policy.mojom-shared.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/public/common/frame/frame_owner_element_type.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/mojom/ad_tagging/ad_frame.mojom-shared.h"
#include "third_party/blink/public/mojom/frame/user_activation_update_types.mojom-shared.h"
#include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom-shared.h"
@@ -96,7 +95,7 @@
bool is_potentially_trustworthy_opaque_origin) = 0;
// Set sandbox flags replicated from another process.
- virtual void SetReplicatedSandboxFlags(mojom::WebSandboxFlags) = 0;
+ virtual void SetReplicatedSandboxFlags(network::mojom::WebSandboxFlags) = 0;
// Set frame |name| replicated from another process.
virtual void SetReplicatedName(const WebString&) = 0;
diff --git a/third_party/blink/public/web/web_view_client.h b/third_party/blink/public/web/web_view_client.h
index 2e572f27..7fbb17df 100644
--- a/third_party/blink/public/web/web_view_client.h
+++ b/third_party/blink/public/web/web_view_client.h
@@ -32,6 +32,7 @@
#define THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_VIEW_CLIENT_H_
#include "base/strings/string_piece.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
#include "third_party/blink/public/common/dom_storage/session_storage_namespace_id.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/public/platform/web_string.h"
@@ -45,9 +46,6 @@
class WebURL;
class WebURLRequest;
class WebView;
-namespace mojom {
-enum class WebSandboxFlags;
-}
struct WebRect;
struct WebSize;
struct WebTextAutosizerPageInfo;
@@ -71,7 +69,7 @@
const WebWindowFeatures& features,
const WebString& name,
WebNavigationPolicy policy,
- mojom::WebSandboxFlags,
+ network::mojom::WebSandboxFlags,
const FeaturePolicy::FeatureState&,
const SessionStorageNamespaceId& session_storage_namespace_id) {
return nullptr;
diff --git a/third_party/blink/renderer/bindings/core/v8/isolated_world_csp.cc b/third_party/blink/renderer/bindings/core/v8/isolated_world_csp.cc
index 0948f87a..1c7307b 100644
--- a/third_party/blink/renderer/bindings/core/v8/isolated_world_csp.cc
+++ b/third_party/blink/renderer/bindings/core/v8/isolated_world_csp.cc
@@ -70,7 +70,7 @@
// These directives depend on ExecutionContext for their implementation and
// since isolated worlds don't have their own ExecutionContext, these are not
// supported.
- void SetSandboxFlags(SandboxFlags) override {}
+ void SetSandboxFlags(network::mojom::blink::WebSandboxFlags) override {}
void SetRequireTrustedTypes() override {}
void AddInsecureRequestPolicy(mojom::blink::InsecureRequestPolicy) override {}
diff --git a/third_party/blink/renderer/core/DEPS b/third_party/blink/renderer/core/DEPS
index 391a212..fa466e5 100644
--- a/third_party/blink/renderer/core/DEPS
+++ b/third_party/blink/renderer/core/DEPS
@@ -70,8 +70,9 @@
"+services/metrics/public",
"+services/network/public/cpp/cors/cors_error_status.h",
"+services/network/public/cpp/features.h",
- "+services/network/public/cpp/request_mode.h",
"+services/network/public/cpp/request_destination.h",
+ "+services/network/public/cpp/request_mode.h",
+ "+services/network/public/cpp/web_sandbox_flags.h",
"+services/network/public/cpp/shared_url_loader_factory.h",
"+services/resource_coordinator/public/mojom/coordination_unit.mojom-blink.h",
"+services/service_manager/public",
diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
index 09f4c78..a9b2964 100644
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -48,6 +48,7 @@
#include "services/metrics/public/cpp/ukm_source_id.h"
#include "services/metrics/public/mojom/ukm_interface.mojom-blink.h"
#include "services/network/public/mojom/ip_address_space.mojom-blink.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/blink/public/common/browser_interface_broker_proxy.h"
#include "third_party/blink/public/common/feature_policy/document_policy_features.h"
@@ -1035,11 +1036,11 @@
return GetSecurityContext().GetContentSecurityPolicy();
}
-mojom::blink::WebSandboxFlags Document::GetSandboxFlags() const {
+network::mojom::blink::WebSandboxFlags Document::GetSandboxFlags() const {
return GetSecurityContext().GetSandboxFlags();
}
-bool Document::IsSandboxed(mojom::blink::WebSandboxFlags mask) const {
+bool Document::IsSandboxed(network::mojom::blink::WebSandboxFlags mask) const {
return GetSecurityContext().IsSandboxed(mask);
}
@@ -4774,7 +4775,7 @@
}
if (http_refresh_type == kHttpRefreshFromMetaTag &&
- IsSandboxed(mojom::blink::WebSandboxFlags::kAutomaticFeatures)) {
+ IsSandboxed(network::mojom::blink::WebSandboxFlags::kAutomaticFeatures)) {
String message =
"Refused to execute the redirect specified via '<meta "
"http-equiv='refresh' content='...'>'. The document is sandboxed, and "
@@ -5894,7 +5895,7 @@
CountUse(WebFeature::kCookieGet);
if (!GetSecurityOrigin()->CanAccessCookies()) {
- if (IsSandboxed(mojom::blink::WebSandboxFlags::kOrigin))
+ if (IsSandboxed(network::mojom::blink::WebSandboxFlags::kOrigin))
exception_state.ThrowSecurityError(
"The document is sandboxed and lacks the 'allow-same-origin' flag.");
else if (Url().ProtocolIsData())
@@ -5920,7 +5921,7 @@
UseCounter::Count(*this, WebFeature::kCookieSet);
if (!GetSecurityOrigin()->CanAccessCookies()) {
- if (IsSandboxed(mojom::blink::WebSandboxFlags::kOrigin))
+ if (IsSandboxed(network::mojom::blink::WebSandboxFlags::kOrigin))
exception_state.ThrowSecurityError(
"The document is sandboxed and lacks the 'allow-same-origin' flag.");
else if (Url().ProtocolIsData())
@@ -5979,7 +5980,7 @@
return;
}
- if (IsSandboxed(mojom::blink::WebSandboxFlags::kDocumentDomain)) {
+ if (IsSandboxed(network::mojom::blink::WebSandboxFlags::kDocumentDomain)) {
exception_state.ThrowSecurityError(
"Assignment is forbidden for sandboxed iframes.");
return;
@@ -7081,7 +7082,7 @@
// However, there is an exception for cases when the script should bypass the
// main world's CSP (such as for privileged isolated worlds). See
// https://crbug.com/811528.
- if (IsSandboxed(mojom::blink::WebSandboxFlags::kScripts) &&
+ if (IsSandboxed(network::mojom::blink::WebSandboxFlags::kScripts) &&
!ContentSecurityPolicy::ShouldBypassMainWorld(domWindow())) {
// FIXME: This message should be moved off the console once a solution to
// https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
@@ -8304,7 +8305,8 @@
}
WebFeature uma_type;
- bool sandboxed = IsSandboxed(mojom::blink::WebSandboxFlags::kNavigation);
+ bool sandboxed =
+ IsSandboxed(network::mojom::blink::WebSandboxFlags::kNavigation);
bool ad = frame_->IsAdSubframe();
if (sandboxed) {
uma_type = ad ? WebFeature::kFocusWithoutUserActivationSandboxedAdFrame
diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
index 08671a4..445dd08 100644
--- a/third_party/blink/renderer/core/dom/document.h
+++ b/third_party/blink/renderer/core/dom/document.h
@@ -38,6 +38,7 @@
#include "base/timer/elapsed_timer.h"
#include "net/cookies/site_for_cookies.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink-forward.h"
#include "third_party/blink/public/common/metrics/document_update_reason.h"
#include "third_party/blink/public/mojom/input/focus_type.mojom-blink-forward.h"
#include "third_party/blink/public/mojom/permissions/permission.mojom-blink.h"
@@ -384,8 +385,8 @@
const SecurityOrigin* GetSecurityOrigin() const;
SecurityOrigin* GetMutableSecurityOrigin();
ContentSecurityPolicy* GetContentSecurityPolicy() const;
- mojom::blink::WebSandboxFlags GetSandboxFlags() const;
- bool IsSandboxed(mojom::blink::WebSandboxFlags mask) const;
+ network::mojom::blink::WebSandboxFlags GetSandboxFlags() const;
+ bool IsSandboxed(network::mojom::blink::WebSandboxFlags mask) const;
PublicURLManager& GetPublicURLManager();
bool IsContextPaused() const;
bool IsContextDestroyed() const;
diff --git a/third_party/blink/renderer/core/dom/document_init.cc b/third_party/blink/renderer/core/dom/document_init.cc
index c9c761d..d602dfe 100644
--- a/third_party/blink/renderer/core/dom/document_init.cc
+++ b/third_party/blink/renderer/core/dom/document_init.cc
@@ -29,6 +29,8 @@
#include "third_party/blink/renderer/core/dom/document_init.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom-blink.h"
#include "third_party/blink/renderer/core/dom/document.h"
#include "third_party/blink/renderer/core/dom/dom_implementation.h"
@@ -105,8 +107,8 @@
return nullptr;
}
-mojom::blink::WebSandboxFlags DocumentInit::GetSandboxFlags() const {
- mojom::blink::WebSandboxFlags flags = sandbox_flags_;
+network::mojom::blink::WebSandboxFlags DocumentInit::GetSandboxFlags() const {
+ network::mojom::blink::WebSandboxFlags flags = sandbox_flags_;
if (DocumentLoader* loader = MasterDocumentLoader())
flags |= loader->GetFrame()->Loader().EffectiveSandboxFlags();
// If the load was blocked by CSP, force the Document's origin to be unique,
@@ -114,7 +116,7 @@
// document's load per CSP spec:
// https://www.w3.org/TR/CSP3/#directive-frame-ancestors.
if (blocked_by_csp_)
- flags |= mojom::blink::WebSandboxFlags::kOrigin;
+ flags |= network::mojom::blink::WebSandboxFlags::kOrigin;
return flags;
}
@@ -365,7 +367,7 @@
}
DocumentInit& DocumentInit::WithSandboxFlags(
- mojom::blink::WebSandboxFlags flags) {
+ network::mojom::blink::WebSandboxFlags flags) {
// Only allow adding more sandbox flags.
sandbox_flags_ |= flags;
return *this;
diff --git a/third_party/blink/renderer/core/dom/document_init.h b/third_party/blink/renderer/core/dom/document_init.h
index 7a7da46..619a282 100644
--- a/third_party/blink/renderer/core/dom/document_init.h
+++ b/third_party/blink/renderer/core/dom/document_init.h
@@ -31,12 +31,12 @@
#define THIRD_PARTY_BLINK_RENDERER_CORE_DOM_DOCUMENT_INIT_H_
#include "services/network/public/mojom/ip_address_space.mojom-shared.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/common/frame/frame_policy.h"
#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom-blink.h"
#include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom-blink-forward.h"
#include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/core/execution_context/security_context.h"
-#include "third_party/blink/renderer/core/frame/sandbox_flags.h"
#include "third_party/blink/renderer/core/html/custom/v0_custom_element_registration_context.h"
#include "third_party/blink/renderer/platform/graphics/color.h"
#include "third_party/blink/renderer/platform/heap/handle.h"
@@ -94,7 +94,7 @@
bool HasSecurityContext() const { return MasterDocumentLoader(); }
bool IsSrcdocDocument() const;
bool ShouldSetURL() const;
- mojom::blink::WebSandboxFlags GetSandboxFlags() const;
+ network::mojom::blink::WebSandboxFlags GetSandboxFlags() const;
mojom::blink::InsecureRequestPolicy GetInsecureRequestPolicy() const;
const SecurityContext::InsecureNavigationsSet* InsecureNavigationsToUpgrade()
const;
@@ -162,7 +162,7 @@
DocumentInit& WithOriginTrialsHeader(const String& header);
const String& OriginTrialsHeader() const { return origin_trials_header_; }
- DocumentInit& WithSandboxFlags(mojom::blink::WebSandboxFlags flags);
+ DocumentInit& WithSandboxFlags(network::mojom::blink::WebSandboxFlags flags);
DocumentInit& WithContentSecurityPolicy(ContentSecurityPolicy* policy);
DocumentInit& WithContentSecurityPolicyFromContextDoc();
@@ -254,8 +254,8 @@
String origin_trials_header_;
// Additional sandbox flags
- mojom::blink::WebSandboxFlags sandbox_flags_ =
- mojom::blink::WebSandboxFlags::kNone;
+ network::mojom::blink::WebSandboxFlags sandbox_flags_ =
+ network::mojom::blink::WebSandboxFlags::kNone;
// Loader's CSP
ContentSecurityPolicy* content_security_policy_ = nullptr;
diff --git a/third_party/blink/renderer/core/dom/dom_implementation.cc b/third_party/blink/renderer/core/dom/dom_implementation.cc
index 7c1a0d0..141dc77 100644
--- a/third_party/blink/renderer/core/dom/dom_implementation.cc
+++ b/third_party/blink/renderer/core/dom/dom_implementation.cc
@@ -219,7 +219,8 @@
// replace it with a SinkDocument when plugins are sanboxed. If we move
// final sandbox flag calcuation earlier, we could construct the
// SinkDocument directly.
- if (document->IsSandboxed(mojom::blink::WebSandboxFlags::kPlugins))
+ if (document->IsSandboxed(
+ network::mojom::blink::WebSandboxFlags::kPlugins))
document = MakeGarbageCollected<SinkDocument>(init);
return document;
}
diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
index 8e0e2dd..be57af5 100644
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
@@ -480,7 +480,8 @@
// 4. If target's active sandboxing flag set has the sandboxed automatic
// features browsing context flag, then return.
- if (doc.IsSandboxed(mojom::blink::WebSandboxFlags::kAutomaticFeatures)) {
+ if (doc.IsSandboxed(
+ network::mojom::blink::WebSandboxFlags::kAutomaticFeatures)) {
doc.AddConsoleMessage(MakeGarbageCollected<ConsoleMessage>(
mojom::ConsoleMessageSource::kSecurity,
mojom::ConsoleMessageLevel::kError,
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
index eaa55b55..338d58e 100644
--- a/third_party/blink/renderer/core/execution_context/execution_context.cc
+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
@@ -239,11 +239,13 @@
return GetSecurityContext().GetContentSecurityPolicy();
}
-mojom::blink::WebSandboxFlags ExecutionContext::GetSandboxFlags() const {
+network::mojom::blink::WebSandboxFlags ExecutionContext::GetSandboxFlags()
+ const {
return GetSecurityContext().GetSandboxFlags();
}
-bool ExecutionContext::IsSandboxed(mojom::blink::WebSandboxFlags mask) const {
+bool ExecutionContext::IsSandboxed(
+ network::mojom::blink::WebSandboxFlags mask) const {
return GetSecurityContext().IsSandboxed(mask);
}
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
index b92345f..b80198f9 100644
--- a/third_party/blink/renderer/core/execution_context/execution_context.h
+++ b/third_party/blink/renderer/core/execution_context/execution_context.h
@@ -155,8 +155,8 @@
ContentSecurityPolicy* GetContentSecurityPolicy() const;
- mojom::blink::WebSandboxFlags GetSandboxFlags() const;
- bool IsSandboxed(mojom::blink::WebSandboxFlags mask) const;
+ network::mojom::blink::WebSandboxFlags GetSandboxFlags() const;
+ bool IsSandboxed(network::mojom::blink::WebSandboxFlags mask) const;
// Returns the content security policy to be used based on the current
// JavaScript world we are in.
diff --git a/third_party/blink/renderer/core/execution_context/remote_security_context.cc b/third_party/blink/renderer/core/execution_context/remote_security_context.cc
index e97fffe..6210891 100644
--- a/third_party/blink/renderer/core/execution_context/remote_security_context.cc
+++ b/third_party/blink/renderer/core/execution_context/remote_security_context.cc
@@ -4,6 +4,7 @@
#include "third_party/blink/renderer/core/execution_context/remote_security_context.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/renderer/core/execution_context/security_context_init.h"
#include "third_party/blink/renderer/core/frame/csp/content_security_policy.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
@@ -40,10 +41,10 @@
}
void RemoteSecurityContext::ResetAndEnforceSandboxFlags(
- mojom::blink::WebSandboxFlags flags) {
+ network::mojom::blink::WebSandboxFlags flags) {
sandbox_flags_ = flags;
- if (IsSandboxed(mojom::blink::WebSandboxFlags::kOrigin) &&
+ if (IsSandboxed(network::mojom::blink::WebSandboxFlags::kOrigin) &&
GetSecurityOrigin() && !GetSecurityOrigin()->IsOpaque()) {
SetSecurityOrigin(GetSecurityOrigin()->DeriveNewOpaqueOrigin());
}
diff --git a/third_party/blink/renderer/core/execution_context/remote_security_context.h b/third_party/blink/renderer/core/execution_context/remote_security_context.h
index 00042b46..b8005ee 100644
--- a/third_party/blink/renderer/core/execution_context/remote_security_context.h
+++ b/third_party/blink/renderer/core/execution_context/remote_security_context.h
@@ -5,6 +5,7 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_EXECUTION_CONTEXT_REMOTE_SECURITY_CONTEXT_H_
#define THIRD_PARTY_BLINK_RENDERER_CORE_EXECUTION_CONTEXT_REMOTE_SECURITY_CONTEXT_H_
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink-forward.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/core/execution_context/security_context.h"
@@ -18,7 +19,8 @@
void SetReplicatedOrigin(scoped_refptr<SecurityOrigin>);
void ResetReplicatedContentSecurityPolicy();
- void ResetAndEnforceSandboxFlags(mojom::blink::WebSandboxFlags flags);
+ void ResetAndEnforceSandboxFlags(
+ network::mojom::blink::WebSandboxFlags flags);
// Constructs the enforcement FeaturePolicy struct for this security context.
// The resulting FeaturePolicy is a combination of:
diff --git a/third_party/blink/renderer/core/execution_context/security_context.cc b/third_party/blink/renderer/core/execution_context/security_context.cc
index 0d20182..52930775 100644
--- a/third_party/blink/renderer/core/execution_context/security_context.cc
+++ b/third_party/blink/renderer/core/execution_context/security_context.cc
@@ -27,7 +27,9 @@
#include "third_party/blink/renderer/core/execution_context/security_context.h"
#include "base/metrics/histogram_macros.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
#include "services/network/public/mojom/ip_address_space.mojom-blink.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/common/feature_policy/document_policy_features.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom-blink.h"
@@ -108,14 +110,21 @@
content_security_policy_ = content_security_policy;
}
-bool SecurityContext::IsSandboxed(mojom::blink::WebSandboxFlags mask) const {
+bool SecurityContext::IsSandboxed(
+ network::mojom::blink::WebSandboxFlags mask) const {
if (RuntimeEnabledFeatures::FeaturePolicyForSandboxEnabled()) {
mojom::blink::FeaturePolicyFeature feature =
FeaturePolicy::FeatureForSandboxFlag(mask);
if (feature != mojom::blink::FeaturePolicyFeature::kNotFound)
return !feature_policy_->IsFeatureEnabled(feature);
}
- return (sandbox_flags_ & mask) != mojom::blink::WebSandboxFlags::kNone;
+ return (sandbox_flags_ & mask) !=
+ network::mojom::blink::WebSandboxFlags::kNone;
+}
+
+void SecurityContext::ApplySandboxFlags(
+ network::mojom::blink::WebSandboxFlags flags) {
+ sandbox_flags_ |= flags;
}
void SecurityContext::SetRequireTrustedTypes() {
diff --git a/third_party/blink/renderer/core/execution_context/security_context.h b/third_party/blink/renderer/core/execution_context/security_context.h
index 1f7d760a0..cf92c0a 100644
--- a/third_party/blink/renderer/core/execution_context/security_context.h
+++ b/third_party/blink/renderer/core/execution_context/security_context.h
@@ -32,8 +32,8 @@
#include "base/macros.h"
#include "base/memory/scoped_refptr.h"
#include "services/network/public/mojom/ip_address_space.mojom-blink-forward.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink-forward.h"
#include "third_party/blink/public/common/feature_policy/document_policy.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/mojom/feature_policy/document_policy_feature.mojom-blink-forward.h"
#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom-blink-forward.h"
#include "third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom-blink-forward.h"
@@ -104,13 +104,11 @@
// Like SetSecurityOrigin(), but no security CHECKs.
void SetSecurityOriginForTesting(scoped_refptr<SecurityOrigin>);
- mojom::blink::WebSandboxFlags GetSandboxFlags() const {
+ network::mojom::blink::WebSandboxFlags GetSandboxFlags() const {
return sandbox_flags_;
}
- bool IsSandboxed(mojom::blink::WebSandboxFlags mask) const;
- void ApplySandboxFlags(mojom::blink::WebSandboxFlags flags) {
- sandbox_flags_ |= flags;
- }
+ bool IsSandboxed(network::mojom::blink::WebSandboxFlags mask) const;
+ void ApplySandboxFlags(network::mojom::blink::WebSandboxFlags flags);
void SetAddressSpace(network::mojom::IPAddressSpace space) {
address_space_ = space;
@@ -197,7 +195,7 @@
bool BindCSPImmediately() const { return bind_csp_immediately_; }
protected:
- mojom::blink::WebSandboxFlags sandbox_flags_;
+ network::mojom::blink::WebSandboxFlags sandbox_flags_;
scoped_refptr<SecurityOrigin> security_origin_;
std::unique_ptr<FeaturePolicy> feature_policy_;
std::unique_ptr<FeaturePolicy> report_only_feature_policy_;
diff --git a/third_party/blink/renderer/core/execution_context/security_context_init.cc b/third_party/blink/renderer/core/execution_context/security_context_init.cc
index b667fa5..e28c1ebb 100644
--- a/third_party/blink/renderer/core/execution_context/security_context_init.cc
+++ b/third_party/blink/renderer/core/execution_context/security_context_init.cc
@@ -4,6 +4,7 @@
#include "third_party/blink/renderer/core/execution_context/security_context_init.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
#include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h"
#include "third_party/blink/renderer/core/dom/document_init.h"
#include "third_party/blink/renderer/core/dom/element.h"
@@ -14,6 +15,7 @@
#include "third_party/blink/renderer/core/frame/csp/content_security_policy.h"
#include "third_party/blink/renderer/core/frame/local_frame.h"
#include "third_party/blink/renderer/core/frame/local_frame_client.h"
+#include "third_party/blink/renderer/core/frame/sandbox_flags.h"
#include "third_party/blink/renderer/core/frame/settings.h"
#include "third_party/blink/renderer/core/html/imports/html_imports_controller.h"
#include "third_party/blink/renderer/core/inspector/console_message.h"
@@ -218,9 +220,9 @@
// Document's URL and origin. Instead, force a Document loaded from a
// MHTML archive to be sandboxed, providing exceptions only for creating
// new windows.
- sandbox_flags_ |= (mojom::blink::WebSandboxFlags::kAll &
- ~(mojom::blink::WebSandboxFlags::kPopups |
- mojom::blink::WebSandboxFlags::
+ sandbox_flags_ |= (network::mojom::blink::WebSandboxFlags::kAll &
+ ~(network::mojom::blink::WebSandboxFlags::kPopups |
+ network::mojom::blink::WebSandboxFlags::
kPropagatesToAuxiliaryBrowsingContexts));
}
}
@@ -228,8 +230,8 @@
void SecurityContextInit::InitializeOrigin(const DocumentInit& initializer) {
scoped_refptr<SecurityOrigin> document_origin =
initializer.GetDocumentOrigin();
- if ((sandbox_flags_ & mojom::blink::WebSandboxFlags::kOrigin) !=
- mojom::blink::WebSandboxFlags::kNone) {
+ if ((sandbox_flags_ & network::mojom::blink::WebSandboxFlags::kOrigin) !=
+ network::mojom::blink::WebSandboxFlags::kNone) {
scoped_refptr<SecurityOrigin> sandboxed_origin =
initializer.OriginToCommit() ? initializer.OriginToCommit()
: document_origin->DeriveNewOpaqueOrigin();
@@ -337,7 +339,7 @@
initializer.ReportOnlyFeaturePolicyHeader(), security_origin_,
&report_only_feature_policy_parse_messages_, this);
- if (sandbox_flags_ != mojom::blink::WebSandboxFlags::kNone &&
+ if (sandbox_flags_ != network::mojom::blink::WebSandboxFlags::kNone &&
RuntimeEnabledFeatures::FeaturePolicyForSandboxEnabled()) {
// The sandbox flags might have come from CSP header or the browser; in
// such cases the sandbox is not part of the container policy. They are
@@ -356,8 +358,8 @@
// feature policy is initialized.
if (RuntimeEnabledFeatures::BlockingFocusWithoutUserActivationEnabled() &&
frame && frame->Tree().Parent() &&
- (sandbox_flags_ & mojom::blink::WebSandboxFlags::kNavigation) !=
- mojom::blink::WebSandboxFlags::kNone) {
+ (sandbox_flags_ & network::mojom::blink::WebSandboxFlags::kNavigation) !=
+ network::mojom::blink::WebSandboxFlags::kNone) {
// Enforcing the policy for sandbox frames (for context see
// https://crbug.com/954349).
DisallowFeatureIfNotPresent(
@@ -464,7 +466,7 @@
secure_context_mode_ = SecureContextMode::kInsecureContext;
}
bool is_secure = secure_context_mode_ == SecureContextMode::kSecureContext;
- if (GetSandboxFlags() != mojom::blink::WebSandboxFlags::kNone) {
+ if (GetSandboxFlags() != network::mojom::blink::WebSandboxFlags::kNone) {
feature_count_.insert(
is_secure ? WebFeature::kSecureContextCheckForSandboxedOriginPassed
: WebFeature::kSecureContextCheckForSandboxedOriginFailed);
diff --git a/third_party/blink/renderer/core/execution_context/security_context_init.h b/third_party/blink/renderer/core/execution_context/security_context_init.h
index 5546eaf..e615743 100644
--- a/third_party/blink/renderer/core/execution_context/security_context_init.h
+++ b/third_party/blink/renderer/core/execution_context/security_context_init.h
@@ -5,6 +5,7 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_EXECUTION_CONTEXT_SECURITY_CONTEXT_INIT_H_
#define THIRD_PARTY_BLINK_RENDERER_CORE_EXECUTION_CONTEXT_SECURITY_CONTEXT_INIT_H_
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom-blink.h"
#include "third_party/blink/renderer/core/execution_context/execution_context.h"
@@ -38,7 +39,7 @@
return security_origin_;
}
- mojom::blink::WebSandboxFlags GetSandboxFlags() const {
+ network::mojom::blink::WebSandboxFlags GetSandboxFlags() const {
return sandbox_flags_;
}
@@ -91,8 +92,8 @@
void InitializeAgent(const DocumentInit&);
scoped_refptr<SecurityOrigin> security_origin_;
- mojom::blink::WebSandboxFlags sandbox_flags_ =
- mojom::blink::WebSandboxFlags::kNone;
+ network::mojom::blink::WebSandboxFlags sandbox_flags_ =
+ network::mojom::blink::WebSandboxFlags::kNone;
DocumentPolicy::ParsedDocumentPolicy document_policy_;
DocumentPolicy::ParsedDocumentPolicy report_only_document_policy_;
bool initialized_feature_policy_state_ = false;
diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
index cb7aa76a..c021cf4 100644
--- a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
+++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
@@ -604,7 +604,7 @@
navigation_info->initiator_frame_has_download_sandbox_flag =
frame->GetSecurityContext() &&
frame->GetSecurityContext()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kDownloads);
+ network::mojom::blink::WebSandboxFlags::kDownloads);
navigation_info->initiator_frame_is_ad = frame->IsAdSubframe();
}
@@ -931,12 +931,12 @@
}
void LocalFrameClientImpl::DidSetFramePolicyHeaders(
- mojom::blink::WebSandboxFlags sandbox_flags,
+ network::mojom::blink::WebSandboxFlags sandbox_flags,
const ParsedFeaturePolicy& feature_policy_header,
const DocumentPolicy::FeatureState& document_policy_header) {
if (web_frame_->Client()) {
web_frame_->Client()->DidSetFramePolicyHeaders(
- static_cast<mojom::blink::WebSandboxFlags>(sandbox_flags),
+ static_cast<network::mojom::blink::WebSandboxFlags>(sandbox_flags),
feature_policy_header, document_policy_header);
}
}
diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.h b/third_party/blink/renderer/core/exported/local_frame_client_impl.h
index 74f08e0..6563d3d 100644
--- a/third_party/blink/renderer/core/exported/local_frame_client_impl.h
+++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.h
@@ -199,7 +199,7 @@
void DidChangeName(const String&) override;
void DidChangeFramePolicy(Frame* child_frame, const FramePolicy&) override;
void DidSetFramePolicyHeaders(
- mojom::blink::WebSandboxFlags,
+ network::mojom::blink::WebSandboxFlags,
const ParsedFeaturePolicy& fp_header,
const blink::DocumentPolicy::FeatureState& dp_header) override;
void DidChangeFrameOwnerProperties(HTMLFrameOwnerElement*) override;
diff --git a/third_party/blink/renderer/core/exported/web_frame.cc b/third_party/blink/renderer/core/exported/web_frame.cc
index 91353f08..489289a 100644
--- a/third_party/blink/renderer/core/exported/web_frame.cc
+++ b/third_party/blink/renderer/core/exported/web_frame.cc
@@ -5,7 +5,6 @@
#include "third_party/blink/public/web/web_frame.h"
#include <algorithm>
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/mojom/scroll/scrollbar_mode.mojom-blink.h"
#include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom-blink.h"
#include "third_party/blink/public/web/web_element.h"
diff --git a/third_party/blink/renderer/core/exported/web_frame_test.cc b/third_party/blink/renderer/core/exported/web_frame_test.cc
index a27b383..60f49e1 100644
--- a/third_party/blink/renderer/core/exported/web_frame_test.cc
+++ b/third_party/blink/renderer/core/exported/web_frame_test.cc
@@ -7084,7 +7084,7 @@
const WebWindowFeatures&,
const WebString&,
WebNavigationPolicy,
- mojom::blink::WebSandboxFlags,
+ network::mojom::blink::WebSandboxFlags,
const FeaturePolicy::FeatureState&,
const SessionStorageNamespaceId&) override {
EXPECT_TRUE(false);
diff --git a/third_party/blink/renderer/core/exported/web_remote_frame_impl.cc b/third_party/blink/renderer/core/exported/web_remote_frame_impl.cc
index 56ec1b3..e894691 100644
--- a/third_party/blink/renderer/core/exported/web_remote_frame_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_remote_frame_impl.cc
@@ -261,7 +261,7 @@
}
void WebRemoteFrameImpl::SetReplicatedSandboxFlags(
- mojom::blink::WebSandboxFlags flags) {
+ network::mojom::blink::WebSandboxFlags flags) {
DCHECK(GetFrame());
GetFrame()->SetReplicatedSandboxFlags(flags);
}
diff --git a/third_party/blink/renderer/core/exported/web_remote_frame_impl.h b/third_party/blink/renderer/core/exported/web_remote_frame_impl.h
index defdadc8..ff43957 100644
--- a/third_party/blink/renderer/core/exported/web_remote_frame_impl.h
+++ b/third_party/blink/renderer/core/exported/web_remote_frame_impl.h
@@ -78,7 +78,8 @@
void SetReplicatedOrigin(
const WebSecurityOrigin&,
bool is_potentially_trustworthy_opaque_origin) override;
- void SetReplicatedSandboxFlags(mojom::blink::WebSandboxFlags) override;
+ void SetReplicatedSandboxFlags(
+ network::mojom::blink::WebSandboxFlags) override;
void SetReplicatedName(const WebString&) override;
void SetReplicatedFeaturePolicyHeaderAndOpenerPolicies(
const ParsedFeaturePolicy& parsed_header,
diff --git a/third_party/blink/renderer/core/exported/web_view_test.cc b/third_party/blink/renderer/core/exported/web_view_test.cc
index 59433d10..9bc66ad 100644
--- a/third_party/blink/renderer/core/exported/web_view_test.cc
+++ b/third_party/blink/renderer/core/exported/web_view_test.cc
@@ -3673,7 +3673,7 @@
const WebWindowFeatures&,
const WebString& name,
WebNavigationPolicy,
- mojom::blink::WebSandboxFlags,
+ network::mojom::blink::WebSandboxFlags,
const FeaturePolicy::FeatureState&,
const SessionStorageNamespaceId&) override {
return web_view_helper_.InitializeWithOpener(opener);
@@ -3757,7 +3757,7 @@
const WebWindowFeatures&,
const WebString& name,
WebNavigationPolicy,
- mojom::blink::WebSandboxFlags,
+ network::mojom::blink::WebSandboxFlags,
const FeaturePolicy::FeatureState&,
const SessionStorageNamespaceId&) override {
return web_view_;
diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.cc b/third_party/blink/renderer/core/frame/csp/content_security_policy.cc
index 80d4832..39c0443 100644
--- a/third_party/blink/renderer/core/frame/csp/content_security_policy.cc
+++ b/third_party/blink/renderer/core/frame/csp/content_security_policy.cc
@@ -29,6 +29,8 @@
#include <utility>
#include "base/debug/dump_without_crashing.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom-blink.h"
#include "third_party/blink/public/platform/platform.h"
#include "third_party/blink/public/platform/task_type.h"
@@ -50,7 +52,6 @@
#include "third_party/blink/renderer/core/frame/local_frame.h"
#include "third_party/blink/renderer/core/frame/local_frame_client.h"
#include "third_party/blink/renderer/core/frame/location.h"
-#include "third_party/blink/renderer/core/frame/sandbox_flags.h"
#include "third_party/blink/renderer/core/html/html_script_element.h"
#include "third_party/blink/renderer/core/inspector/console_message.h"
#include "third_party/blink/renderer/platform/bindings/dom_wrapper_world.h"
@@ -156,7 +157,7 @@
override_inline_style_allowed_(false),
script_hash_algorithms_used_(kContentSecurityPolicyHashAlgorithmNone),
style_hash_algorithms_used_(kContentSecurityPolicyHashAlgorithmNone),
- sandbox_mask_(mojom::blink::WebSandboxFlags::kNone),
+ sandbox_mask_(network::mojom::blink::WebSandboxFlags::kNone),
require_trusted_types_(false),
insecure_request_policy_(
mojom::blink::InsecureRequestPolicy::kLeaveInsecureRequestsAlone) {}
@@ -200,7 +201,7 @@
// Set mixed content checking and sandbox flags, then dump all the parsing
// error messages, then poke at histograms.
- if (sandbox_mask_ != mojom::blink::WebSandboxFlags::kNone) {
+ if (sandbox_mask_ != network::mojom::blink::WebSandboxFlags::kNone) {
Count(WebFeature::kSandboxViaCSP);
delegate_->SetSandboxFlags(sandbox_mask_);
}
@@ -928,7 +929,8 @@
return delegate_ ? delegate_->Url() : KURL();
}
-void ContentSecurityPolicy::EnforceSandboxFlags(SandboxFlags mask) {
+void ContentSecurityPolicy::EnforceSandboxFlags(
+ network::mojom::blink::WebSandboxFlags mask) {
sandbox_mask_ |= mask;
}
diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.h b/third_party/blink/renderer/core/frame/csp/content_security_policy.h
index 54d3b7c..deb8f0d 100644
--- a/third_party/blink/renderer/core/frame/csp/content_security_policy.h
+++ b/third_party/blink/renderer/core/frame/csp/content_security_policy.h
@@ -30,6 +30,7 @@
#include <utility>
#include "services/network/public/mojom/content_security_policy.mojom-blink.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink-forward.h"
#include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h"
#include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom-blink-forward.h"
#include "third_party/blink/public/platform/web_content_security_policy_struct.h"
@@ -73,7 +74,6 @@
class SourceLocation;
enum class ResourceType : uint8_t;
-using SandboxFlags = mojom::blink::WebSandboxFlags;
typedef HeapVector<Member<CSPDirectiveList>> CSPDirectiveListVector;
typedef HeapVector<Member<ConsoleMessage>> ConsoleMessageVector;
typedef std::pair<String, network::mojom::ContentSecurityPolicyType>
@@ -101,7 +101,7 @@
virtual const KURL& Url() const = 0;
// Directives support.
- virtual void SetSandboxFlags(SandboxFlags) = 0;
+ virtual void SetSandboxFlags(network::mojom::blink::WebSandboxFlags) = 0;
virtual void SetRequireTrustedTypes() = 0;
virtual void AddInsecureRequestPolicy(
mojom::blink::InsecureRequestPolicy) = 0;
@@ -425,7 +425,7 @@
// Used as <object>'s URL when there is no `src` attribute.
const KURL FallbackUrlForPlugin() const;
- void EnforceSandboxFlags(SandboxFlags);
+ void EnforceSandboxFlags(network::mojom::blink::WebSandboxFlags);
void RequireTrustedTypes();
bool IsRequireTrustedTypes() const { return require_trusted_types_; }
String EvalDisabledErrorMessage() const;
@@ -486,7 +486,9 @@
// context will be used for all sandbox checks but there are situations
// (before installing the document that this CSP will bind to) when
// there is no execution context to enforce the sandbox flags.
- SandboxFlags GetSandboxMask() const { return sandbox_mask_; }
+ network::mojom::blink::WebSandboxFlags GetSandboxMask() const {
+ return sandbox_mask_;
+ }
bool HasPolicyFromSource(network::mojom::ContentSecurityPolicySource) const;
@@ -577,7 +579,7 @@
uint8_t style_hash_algorithms_used_;
// State flags used to configure the environment after parsing a policy.
- SandboxFlags sandbox_mask_;
+ network::mojom::blink::WebSandboxFlags sandbox_mask_;
bool require_trusted_types_;
String disable_eval_error_message_;
mojom::blink::InsecureRequestPolicy insecure_request_policy_;
diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy_fuzzer.cc b/third_party/blink/renderer/core/frame/csp/content_security_policy_fuzzer.cc
index b6d50a9e..00bef2f 100644
--- a/third_party/blink/renderer/core/frame/csp/content_security_policy_fuzzer.cc
+++ b/third_party/blink/renderer/core/frame/csp/content_security_policy_fuzzer.cc
@@ -30,7 +30,7 @@
// CSP is bound.
scoped_refptr<SharedBuffer> empty_document_data = SharedBuffer::Create();
g_page_holder->GetFrame().Loader().ForceSandboxFlags(
- mojom::blink::WebSandboxFlags::kAll);
+ network::mojom::blink::WebSandboxFlags::kAll);
g_page_holder->GetFrame().ForceSynchronousDocumentInstall(
"text/html", empty_document_data);
return 0;
diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy_test.cc b/third_party/blink/renderer/core/frame/csp/content_security_policy_test.cc
index e6206ef3..218b6559 100644
--- a/third_party/blink/renderer/core/frame/csp/content_security_policy_test.cc
+++ b/third_party/blink/renderer/core/frame/csp/content_security_policy_test.cc
@@ -235,15 +235,18 @@
// delivered in <meta> elements.
TEST_F(ContentSecurityPolicyTest, SandboxInMeta) {
csp->BindToDelegate(execution_context->GetContentSecurityPolicyDelegate());
- EXPECT_EQ(mojom::blink::WebSandboxFlags::kNone, csp->GetSandboxMask());
+ EXPECT_EQ(network::mojom::blink::WebSandboxFlags::kNone,
+ csp->GetSandboxMask());
csp->DidReceiveHeader("sandbox;", ContentSecurityPolicyType::kEnforce,
ContentSecurityPolicySource::kMeta);
- EXPECT_EQ(mojom::blink::WebSandboxFlags::kNone, csp->GetSandboxMask());
+ EXPECT_EQ(network::mojom::blink::WebSandboxFlags::kNone,
+ csp->GetSandboxMask());
execution_context->GetSecurityContext().ApplySandboxFlags(
- mojom::blink::WebSandboxFlags::kAll);
+ network::mojom::blink::WebSandboxFlags::kAll);
csp->DidReceiveHeader("sandbox;", ContentSecurityPolicyType::kEnforce,
ContentSecurityPolicySource::kHTTP);
- EXPECT_EQ(mojom::blink::WebSandboxFlags::kAll, csp->GetSandboxMask());
+ EXPECT_EQ(network::mojom::blink::WebSandboxFlags::kAll,
+ csp->GetSandboxMask());
}
// Tests that report-uri directives are discarded from policies
@@ -1657,7 +1660,8 @@
csp->GetInsecureRequestPolicy());
EXPECT_FALSE(csp->HasHeaderDeliveredPolicy());
EXPECT_FALSE(csp->SupportsWasmEval());
- EXPECT_EQ(mojom::blink::WebSandboxFlags::kNone, csp->GetSandboxMask());
+ EXPECT_EQ(network::mojom::blink::WebSandboxFlags::kNone,
+ csp->GetSandboxMask());
EXPECT_FALSE(csp->HasPolicyFromSource(ContentSecurityPolicySource::kHTTP));
}
diff --git a/third_party/blink/renderer/core/frame/csp/csp_directive_list.cc b/third_party/blink/renderer/core/frame/csp/csp_directive_list.cc
index faa7557..f6307f0 100644
--- a/third_party/blink/renderer/core/frame/csp/csp_directive_list.cc
+++ b/third_party/blink/renderer/core/frame/csp/csp_directive_list.cc
@@ -15,6 +15,7 @@
#include "third_party/blink/renderer/core/execution_context/security_context.h"
#include "third_party/blink/renderer/core/frame/deprecation.h"
#include "third_party/blink/renderer/core/frame/local_frame.h"
+#include "third_party/blink/renderer/core/frame/sandbox_flags.h"
#include "third_party/blink/renderer/core/html/html_script_element.h"
#include "third_party/blink/renderer/core/inspector/console_message.h"
#include "third_party/blink/renderer/platform/crypto.h"
diff --git a/third_party/blink/renderer/core/frame/csp/execution_context_csp_delegate.cc b/third_party/blink/renderer/core/frame/csp/execution_context_csp_delegate.cc
index 151bb26..00cb8b3 100644
--- a/third_party/blink/renderer/core/frame/csp/execution_context_csp_delegate.cc
+++ b/third_party/blink/renderer/core/frame/csp/execution_context_csp_delegate.cc
@@ -4,6 +4,8 @@
#include "third_party/blink/renderer/core/frame/csp/execution_context_csp_delegate.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/common/security_context/insecure_request_policy.h"
#include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom-blink.h"
#include "third_party/blink/renderer/bindings/core/v8/source_location.h"
@@ -49,7 +51,8 @@
return execution_context_->Url();
}
-void ExecutionContextCSPDelegate::SetSandboxFlags(SandboxFlags mask) {
+void ExecutionContextCSPDelegate::SetSandboxFlags(
+ network::mojom::blink::WebSandboxFlags mask) {
// Ideally sandbox flags are determined at construction time since
// sandbox flags influence the security origin and that influences
// the Agent that is assigned for the ExecutionContext. Changing
@@ -67,7 +70,8 @@
// already been set on the security context. Meta tags can't set them
// and we should have already constructed the document with the correct
// sandbox flags from CSP already.
- mojom::blink::WebSandboxFlags flags = GetSecurityContext().GetSandboxFlags();
+ network::mojom::blink::WebSandboxFlags flags =
+ GetSecurityContext().GetSandboxFlags();
CHECK_EQ(flags | mask, flags);
}
diff --git a/third_party/blink/renderer/core/frame/csp/execution_context_csp_delegate.h b/third_party/blink/renderer/core/frame/csp/execution_context_csp_delegate.h
index 426ee79..03f8f58d 100644
--- a/third_party/blink/renderer/core/frame/csp/execution_context_csp_delegate.h
+++ b/third_party/blink/renderer/core/frame/csp/execution_context_csp_delegate.h
@@ -28,7 +28,7 @@
const SecurityOrigin* GetSecurityOrigin() override;
SecureContextMode GetSecureContextMode() override;
const KURL& Url() const override;
- void SetSandboxFlags(SandboxFlags) override;
+ void SetSandboxFlags(network::mojom::blink::WebSandboxFlags) override;
void SetRequireTrustedTypes() override;
void AddInsecureRequestPolicy(mojom::blink::InsecureRequestPolicy) override;
std::unique_ptr<SourceLocation> GetSourceLocation() override;
diff --git a/third_party/blink/renderer/core/frame/dom_window.cc b/third_party/blink/renderer/core/frame/dom_window.cc
index 0bf6a7d..db43ab35 100644
--- a/third_party/blink/renderer/core/frame/dom_window.cc
+++ b/third_party/blink/renderer/core/frame/dom_window.cc
@@ -6,6 +6,7 @@
#include <memory>
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/renderer/bindings/core/v8/serialization/post_message_helper.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_window_post_message_options.h"
#include "third_party/blink/renderer/bindings/core/v8/window_proxy_manager.h"
@@ -245,26 +246,27 @@
KURL target_url = local_dom_window
? local_dom_window->document()->Url()
: KURL(NullURL(), target_origin->ToString());
- if (GetFrame()->GetSecurityContext()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kOrigin) ||
- accessing_window->document()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kOrigin)) {
+ using SandboxFlags = network::mojom::blink::WebSandboxFlags;
+ if (GetFrame()->GetSecurityContext()->IsSandboxed(SandboxFlags::kOrigin) ||
+ accessing_window->document()->IsSandboxed(SandboxFlags::kOrigin)) {
message = "Blocked a frame at \"" +
SecurityOrigin::Create(active_url)->ToString() +
"\" from accessing a frame at \"" +
SecurityOrigin::Create(target_url)->ToString() + "\". ";
- if (GetFrame()->GetSecurityContext()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kOrigin) &&
- accessing_window->document()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kOrigin))
+
+ if (GetFrame()->GetSecurityContext()->IsSandboxed(SandboxFlags::kOrigin) &&
+ accessing_window->document()->IsSandboxed(SandboxFlags::kOrigin)) {
return "Sandbox access violation: " + message +
" Both frames are sandboxed and lack the \"allow-same-origin\" "
"flag.";
- if (GetFrame()->GetSecurityContext()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kOrigin))
+ }
+
+ if (GetFrame()->GetSecurityContext()->IsSandboxed(SandboxFlags::kOrigin)) {
return "Sandbox access violation: " + message +
" The frame being accessed is sandboxed and lacks the "
"\"allow-same-origin\" flag.";
+ }
+
return "Sandbox access violation: " + message +
" The frame requesting access is sandboxed and lacks the "
"\"allow-same-origin\" flag.";
diff --git a/third_party/blink/renderer/core/frame/frame_test_helpers.cc b/third_party/blink/renderer/core/frame/frame_test_helpers.cc
index e3a9ffc4..a91f27b 100644
--- a/third_party/blink/renderer/core/frame/frame_test_helpers.cc
+++ b/third_party/blink/renderer/core/frame/frame_test_helpers.cc
@@ -752,7 +752,7 @@
const WebWindowFeatures&,
const WebString& name,
WebNavigationPolicy,
- mojom::blink::WebSandboxFlags,
+ network::mojom::blink::WebSandboxFlags,
const FeaturePolicy::FeatureState&,
const SessionStorageNamespaceId&) {
auto webview_helper = std::make_unique<WebViewHelper>();
diff --git a/third_party/blink/renderer/core/frame/frame_test_helpers.h b/third_party/blink/renderer/core/frame/frame_test_helpers.h
index 35504d9..414b96f28 100644
--- a/third_party/blink/renderer/core/frame/frame_test_helpers.h
+++ b/third_party/blink/renderer/core/frame/frame_test_helpers.h
@@ -288,7 +288,7 @@
const WebWindowFeatures&,
const WebString& name,
WebNavigationPolicy,
- mojom::blink::WebSandboxFlags,
+ network::mojom::blink::WebSandboxFlags,
const FeaturePolicy::FeatureState&,
const SessionStorageNamespaceId&) override;
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
index 558e2a8..24e4e5b 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -77,7 +77,6 @@
#include "third_party/blink/renderer/core/frame/local_frame_client.h"
#include "third_party/blink/renderer/core/frame/local_frame_view.h"
#include "third_party/blink/renderer/core/frame/navigator.h"
-#include "third_party/blink/renderer/core/frame/sandbox_flags.h"
#include "third_party/blink/renderer/core/frame/screen.h"
#include "third_party/blink/renderer/core/frame/settings.h"
#include "third_party/blink/renderer/core/frame/viewport_data.h"
@@ -935,7 +934,8 @@
if (!GetFrame())
return;
- if (document()->IsSandboxed(mojom::blink::WebSandboxFlags::kModals)) {
+ if (document()->IsSandboxed(
+ network::mojom::blink::WebSandboxFlags::kModals)) {
UseCounter::Count(document(), WebFeature::kDialogInSandboxedContext);
GetFrameConsole()->AddMessage(MakeGarbageCollected<ConsoleMessage>(
mojom::ConsoleMessageSource::kSecurity,
@@ -968,7 +968,8 @@
if (!GetFrame())
return false;
- if (document()->IsSandboxed(mojom::blink::WebSandboxFlags::kModals)) {
+ if (document()->IsSandboxed(
+ network::mojom::blink::WebSandboxFlags::kModals)) {
UseCounter::Count(document(), WebFeature::kDialogInSandboxedContext);
GetFrameConsole()->AddMessage(MakeGarbageCollected<ConsoleMessage>(
mojom::ConsoleMessageSource::kSecurity,
@@ -1003,7 +1004,8 @@
if (!GetFrame())
return String();
- if (document()->IsSandboxed(mojom::blink::WebSandboxFlags::kModals)) {
+ if (document()->IsSandboxed(
+ network::mojom::blink::WebSandboxFlags::kModals)) {
UseCounter::Count(document(), WebFeature::kDialogInSandboxedContext);
GetFrameConsole()->AddMessage(MakeGarbageCollected<ConsoleMessage>(
mojom::ConsoleMessageSource::kSecurity,
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index ab0d55c3..90a0ef73 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -1127,7 +1127,7 @@
}
if (GetSecurityContext()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kNavigation)) {
+ network::mojom::blink::WebSandboxFlags::kNavigation)) {
if (!target_frame.Tree().IsDescendantOf(this) &&
!target_frame.IsMainFrame()) {
PrintNavigationErrorMessage(
@@ -1142,10 +1142,10 @@
// 'allow-popups' flag is specified, or if the
if (target_frame.IsMainFrame() && target_frame != Tree().Top() &&
GetSecurityContext()->IsSandboxed(
- mojom::blink::WebSandboxFlags::
+ network::mojom::blink::WebSandboxFlags::
kPropagatesToAuxiliaryBrowsingContexts) &&
(GetSecurityContext()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kPopups) ||
+ network::mojom::blink::WebSandboxFlags::kPopups) ||
target_frame.Client()->Opener() != this)) {
PrintNavigationErrorMessage(
target_frame,
@@ -1159,9 +1159,10 @@
// allow-top-navigation-by-user-activation will also skips origin checks.
if (target_frame == Tree().Top()) {
if (GetSecurityContext()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kTopNavigation) &&
+ network::mojom::blink::WebSandboxFlags::kTopNavigation) &&
GetSecurityContext()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kTopNavigationByUserActivation)) {
+ network::mojom::blink::WebSandboxFlags::
+ kTopNavigationByUserActivation)) {
PrintNavigationErrorMessage(
target_frame,
"The frame attempting navigation of the top-level window is "
@@ -1171,9 +1172,10 @@
}
if (GetSecurityContext()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kTopNavigation) &&
+ network::mojom::blink::WebSandboxFlags::kTopNavigation) &&
!GetSecurityContext()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kTopNavigationByUserActivation) &&
+ network::mojom::blink::WebSandboxFlags::
+ kTopNavigationByUserActivation) &&
!LocalFrame::HasTransientUserActivation(this)) {
// With only 'allow-top-navigation-by-user-activation' (but not
// 'allow-top-navigation'), top navigation requires a user gesture.
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
index 5faee38f..3df73aa 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
@@ -307,7 +307,7 @@
virtual void DidChangeFramePolicy(Frame* child_frame, const FramePolicy&) {}
virtual void DidSetFramePolicyHeaders(
- mojom::blink::WebSandboxFlags,
+ network::mojom::blink::WebSandboxFlags,
const ParsedFeaturePolicy& feature_policy_header,
const DocumentPolicy::FeatureState& document_policy_header) {}
diff --git a/third_party/blink/renderer/core/frame/mhtml_loading_test.cc b/third_party/blink/renderer/core/frame/mhtml_loading_test.cc
index b73fafe..ec2b154f 100644
--- a/third_party/blink/renderer/core/frame/mhtml_loading_test.cc
+++ b/third_party/blink/renderer/core/frame/mhtml_loading_test.cc
@@ -30,6 +30,8 @@
#include "base/bind_helpers.h"
#include "build/build_config.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/platform/web_string.h"
#include "third_party/blink/public/platform/web_url.h"
@@ -119,9 +121,9 @@
// Full sandboxing with the exception to new top-level windows should be
// turned on.
- EXPECT_EQ(mojom::blink::WebSandboxFlags::kAll &
- ~(mojom::blink::WebSandboxFlags::kPopups |
- mojom::blink::WebSandboxFlags::
+ EXPECT_EQ(network::mojom::blink::WebSandboxFlags::kAll &
+ ~(network::mojom::blink::WebSandboxFlags::kPopups |
+ network::mojom::blink::WebSandboxFlags::
kPropagatesToAuxiliaryBrowsingContexts),
document->GetSandboxFlags());
@@ -140,9 +142,9 @@
Document* child_document = child_frame->GetDocument();
ASSERT_TRUE(child_document);
- EXPECT_EQ(mojom::blink::WebSandboxFlags::kAll &
- ~(mojom::blink::WebSandboxFlags::kPopups |
- mojom::blink::WebSandboxFlags::
+ EXPECT_EQ(network::mojom::blink::WebSandboxFlags::kAll &
+ ~(network::mojom::blink::WebSandboxFlags::kPopups |
+ network::mojom::blink::WebSandboxFlags::
kPropagatesToAuxiliaryBrowsingContexts),
child_document->GetSandboxFlags());
@@ -167,9 +169,9 @@
// Full sandboxing with the exception to new top-level windows should be
// turned on.
- EXPECT_EQ(mojom::blink::WebSandboxFlags::kAll &
- ~(mojom::blink::WebSandboxFlags::kPopups |
- mojom::blink::WebSandboxFlags::
+ EXPECT_EQ(network::mojom::blink::WebSandboxFlags::kAll &
+ ~(network::mojom::blink::WebSandboxFlags::kPopups |
+ network::mojom::blink::WebSandboxFlags::
kPropagatesToAuxiliaryBrowsingContexts),
document->GetSandboxFlags());
diff --git a/third_party/blink/renderer/core/frame/remote_frame.cc b/third_party/blink/renderer/core/frame/remote_frame.cc
index 04c16e3..6af5773 100644
--- a/third_party/blink/renderer/core/frame/remote_frame.cc
+++ b/third_party/blink/renderer/core/frame/remote_frame.cc
@@ -5,6 +5,7 @@
#include "third_party/blink/renderer/core/frame/remote_frame.h"
#include "cc/layers/surface_layer.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/blink/public/mojom/frame/frame_owner_properties.mojom-blink.h"
#include "third_party/blink/public/mojom/frame/intrinsic_sizing_info.mojom-blink.h"
@@ -151,7 +152,7 @@
initiator_frame_has_download_sandbox_flag =
frame->GetSecurityContext() &&
frame->GetSecurityContext()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kDownloads);
+ network::mojom::blink::WebSandboxFlags::kDownloads);
initiator_frame_is_ad = frame->IsAdSubframe();
if (frame_request.ClientRedirectReason() != ClientNavigationReason::kNone) {
probe::FrameRequestedNavigation(frame, this, url,
@@ -323,7 +324,7 @@
}
void RemoteFrame::SetReplicatedSandboxFlags(
- mojom::blink::WebSandboxFlags flags) {
+ network::mojom::blink::WebSandboxFlags flags) {
security_context_.ResetAndEnforceSandboxFlags(flags);
}
@@ -564,8 +565,8 @@
// ensure that sandbox flags and feature policy are inherited properly if this
// proxy ever parents a local frame.
void RemoteFrame::DidSetFramePolicyHeaders(
- mojom::blink::WebSandboxFlags sandbox_flags,
- const Vector<ParsedFeaturePolicyDeclaration>& parsed_feature_policy) {
+ network::mojom::blink::WebSandboxFlags sandbox_flags,
+ const WTF::Vector<ParsedFeaturePolicyDeclaration>& parsed_feature_policy) {
SetReplicatedSandboxFlags(sandbox_flags);
// Convert from WTF::Vector<ParsedFeaturePolicyDeclaration>
// to std::vector<ParsedFeaturePolicyDeclaration>, since ParsedFeaturePolicy
diff --git a/third_party/blink/renderer/core/frame/remote_frame.h b/third_party/blink/renderer/core/frame/remote_frame.h
index 15767ce..61fb839 100644
--- a/third_party/blink/renderer/core/frame/remote_frame.h
+++ b/third_party/blink/renderer/core/frame/remote_frame.h
@@ -7,6 +7,7 @@
#include "mojo/public/cpp/bindings/associated_receiver.h"
#include "mojo/public/cpp/bindings/associated_remote.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink-forward.h"
#include "third_party/blink/public/mojom/frame/frame.mojom-blink.h"
#include "third_party/blink/public/mojom/frame/frame_owner_properties.mojom-blink-forward.h"
#include "third_party/blink/public/mojom/input/focus_type.mojom-blink-forward.h"
@@ -89,7 +90,7 @@
const ParsedFeaturePolicy& parsed_header,
const FeaturePolicy::FeatureState&);
- void SetReplicatedSandboxFlags(mojom::blink::WebSandboxFlags);
+ void SetReplicatedSandboxFlags(network::mojom::blink::WebSandboxFlags);
void SetInsecureRequestPolicy(mojom::blink::InsecureRequestPolicy);
void SetInsecureNavigationsSet(const WebVector<unsigned>&);
@@ -130,7 +131,7 @@
void IntrinsicSizingInfoOfChildChanged(
mojom::blink::IntrinsicSizingInfoPtr sizing_info) override;
void DidSetFramePolicyHeaders(
- mojom::blink::WebSandboxFlags,
+ network::mojom::blink::WebSandboxFlags,
const WTF::Vector<ParsedFeaturePolicyDeclaration>&) override;
// Updates the snapshotted policy attributes (sandbox flags and feature policy
// container policy) in the frame's FrameOwner. This is used when this frame's
diff --git a/third_party/blink/renderer/core/frame/sandbox_flags.cc b/third_party/blink/renderer/core/frame/sandbox_flags.cc
index 218f023..b428d83 100644
--- a/third_party/blink/renderer/core/frame/sandbox_flags.cc
+++ b/third_party/blink/renderer/core/frame/sandbox_flags.cc
@@ -26,7 +26,8 @@
#include "third_party/blink/renderer/core/frame/sandbox_flags.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom-blink.h"
#include "third_party/blink/renderer/core/feature_policy/feature_policy_parser.h"
#include "third_party/blink/renderer/core/html/html_iframe_element.h"
@@ -39,25 +40,28 @@
namespace blink {
const SandboxFlagFeaturePolicyPairs& SandboxFlagsWithFeaturePolicies() {
- DEFINE_STATIC_LOCAL(SandboxFlagFeaturePolicyPairs, array,
- ({{mojom::blink::WebSandboxFlags::kTopNavigation,
- mojom::blink::FeaturePolicyFeature::kTopNavigation},
- {mojom::blink::WebSandboxFlags::kForms,
- mojom::blink::FeaturePolicyFeature::kFormSubmission},
- {mojom::blink::WebSandboxFlags::kScripts,
- mojom::blink::FeaturePolicyFeature::kScript},
- {mojom::blink::WebSandboxFlags::kPopups,
- mojom::blink::FeaturePolicyFeature::kPopups},
- {mojom::blink::WebSandboxFlags::kPointerLock,
- mojom::blink::FeaturePolicyFeature::kPointerLock},
- {mojom::blink::WebSandboxFlags::kModals,
- mojom::blink::FeaturePolicyFeature::kModals},
- {mojom::blink::WebSandboxFlags::kOrientationLock,
- mojom::blink::FeaturePolicyFeature::kOrientationLock},
- {mojom::blink::WebSandboxFlags::kPresentationController,
- mojom::blink::FeaturePolicyFeature::kPresentation},
- {mojom::blink::WebSandboxFlags::kDownloads,
- mojom::blink::FeaturePolicyFeature::kDownloads}}));
+ DEFINE_STATIC_LOCAL(
+ SandboxFlagFeaturePolicyPairs, array,
+ ({
+ {network::mojom::blink::WebSandboxFlags::kTopNavigation,
+ mojom::blink::FeaturePolicyFeature::kTopNavigation},
+ {network::mojom::blink::WebSandboxFlags::kForms,
+ mojom::blink::FeaturePolicyFeature::kFormSubmission},
+ {network::mojom::blink::WebSandboxFlags::kScripts,
+ mojom::blink::FeaturePolicyFeature::kScript},
+ {network::mojom::blink::WebSandboxFlags::kPopups,
+ mojom::blink::FeaturePolicyFeature::kPopups},
+ {network::mojom::blink::WebSandboxFlags::kPointerLock,
+ mojom::blink::FeaturePolicyFeature::kPointerLock},
+ {network::mojom::blink::WebSandboxFlags::kModals,
+ mojom::blink::FeaturePolicyFeature::kModals},
+ {network::mojom::blink::WebSandboxFlags::kOrientationLock,
+ mojom::blink::FeaturePolicyFeature::kOrientationLock},
+ {network::mojom::blink::WebSandboxFlags::kPresentationController,
+ mojom::blink::FeaturePolicyFeature::kPresentation},
+ {network::mojom::blink::WebSandboxFlags::kDownloads,
+ mojom::blink::FeaturePolicyFeature::kDownloads},
+ }));
return array;
}
@@ -65,64 +69,65 @@
// corresponding feature policies. With FeaturePolicyForSandbox, these flags
// are always removed from the set of sandbox flags set for a sandboxed
// <iframe> (those sandbox flags are now contained in the |ContainerPolicy|).
-mojom::blink::WebSandboxFlags SandboxFlagsImplementedByFeaturePolicy() {
- DEFINE_STATIC_LOCAL(mojom::blink::WebSandboxFlags, mask,
- (mojom::blink::WebSandboxFlags::kNone));
- if (mask == mojom::blink::WebSandboxFlags::kNone) {
+network::mojom::blink::WebSandboxFlags
+SandboxFlagsImplementedByFeaturePolicy() {
+ DEFINE_STATIC_LOCAL(network::mojom::blink::WebSandboxFlags, mask,
+ (network::mojom::blink::WebSandboxFlags::kNone));
+ if (mask == network::mojom::blink::WebSandboxFlags::kNone) {
for (const auto& pair : SandboxFlagsWithFeaturePolicies())
mask |= pair.first;
}
return mask;
}
-mojom::blink::WebSandboxFlags ParseSandboxPolicy(
+network::mojom::blink::WebSandboxFlags ParseSandboxPolicy(
const SpaceSplitString& policy,
String& invalid_tokens_error_message) {
// http://www.w3.org/TR/html5/the-iframe-element.html#attr-iframe-sandbox
// Parse the unordered set of unique space-separated tokens.
- mojom::blink::WebSandboxFlags flags = mojom::blink::WebSandboxFlags::kAll;
+ network::mojom::blink::WebSandboxFlags flags =
+ network::mojom::blink::WebSandboxFlags::kAll;
unsigned length = policy.size();
unsigned number_of_token_errors = 0;
StringBuilder token_errors;
+ using SandboxFlags = network::mojom::blink::WebSandboxFlags;
+
for (unsigned index = 0; index < length; index++) {
// Turn off the corresponding sandbox flag if it's set as "allowed".
String sandbox_token(policy[index]);
if (EqualIgnoringASCIICase(sandbox_token, "allow-same-origin")) {
- flags = flags & ~mojom::blink::WebSandboxFlags::kOrigin;
+ flags = flags & ~SandboxFlags::kOrigin;
} else if (EqualIgnoringASCIICase(sandbox_token, "allow-forms")) {
- flags = flags & ~mojom::blink::WebSandboxFlags::kForms;
+ flags = flags & ~SandboxFlags::kForms;
} else if (EqualIgnoringASCIICase(sandbox_token, "allow-scripts")) {
- flags = flags & ~mojom::blink::WebSandboxFlags::kScripts;
- flags = flags & ~mojom::blink::WebSandboxFlags::kAutomaticFeatures;
+ flags = flags & ~SandboxFlags::kScripts;
+ flags = flags & ~SandboxFlags::kAutomaticFeatures;
} else if (EqualIgnoringASCIICase(sandbox_token, "allow-top-navigation")) {
- flags = flags & ~mojom::blink::WebSandboxFlags::kTopNavigation;
+ flags = flags & ~SandboxFlags::kTopNavigation;
} else if (EqualIgnoringASCIICase(sandbox_token, "allow-popups")) {
- flags = flags & ~mojom::blink::WebSandboxFlags::kPopups;
+ flags = flags & ~SandboxFlags::kPopups;
} else if (EqualIgnoringASCIICase(sandbox_token, "allow-pointer-lock")) {
- flags = flags & ~mojom::blink::WebSandboxFlags::kPointerLock;
+ flags = flags & ~SandboxFlags::kPointerLock;
} else if (EqualIgnoringASCIICase(sandbox_token,
"allow-orientation-lock")) {
- flags = flags & ~mojom::blink::WebSandboxFlags::kOrientationLock;
+ flags = flags & ~SandboxFlags::kOrientationLock;
} else if (EqualIgnoringASCIICase(sandbox_token,
"allow-popups-to-escape-sandbox")) {
- flags = flags & ~mojom::blink::WebSandboxFlags::
- kPropagatesToAuxiliaryBrowsingContexts;
+ flags = flags & ~SandboxFlags::kPropagatesToAuxiliaryBrowsingContexts;
} else if (EqualIgnoringASCIICase(sandbox_token, "allow-modals")) {
- flags = flags & ~mojom::blink::WebSandboxFlags::kModals;
+ flags = flags & ~SandboxFlags::kModals;
} else if (EqualIgnoringASCIICase(sandbox_token, "allow-presentation")) {
- flags = flags & ~mojom::blink::WebSandboxFlags::kPresentationController;
+ flags = flags & ~SandboxFlags::kPresentationController;
} else if (EqualIgnoringASCIICase(
sandbox_token, "allow-top-navigation-by-user-activation")) {
- flags = flags &
- ~mojom::blink::WebSandboxFlags::kTopNavigationByUserActivation;
+ flags = flags & ~SandboxFlags::kTopNavigationByUserActivation;
} else if (EqualIgnoringASCIICase(sandbox_token, "allow-downloads")) {
- flags = flags & ~mojom::blink::WebSandboxFlags::kDownloads;
+ flags = flags & ~SandboxFlags::kDownloads;
} else if (RuntimeEnabledFeatures::StorageAccessAPIEnabled() &&
EqualIgnoringASCIICase(
sandbox_token, "allow-storage-access-by-user-activation")) {
- flags = flags &
- ~mojom::blink::WebSandboxFlags::kStorageAccessByUserActivation;
+ flags = flags & ~SandboxFlags::kStorageAccessByUserActivation;
} else {
token_errors.Append(token_errors.IsEmpty() ? "'" : ", '");
token_errors.Append(sandbox_token);
@@ -143,17 +148,19 @@
// Removes a certain set of flags from |sandbox_flags| for which we have feature
// policies implemented.
-mojom::blink::WebSandboxFlags GetSandboxFlagsNotImplementedAsFeaturePolicy(
- mojom::blink::WebSandboxFlags sandbox_flags) {
+network::mojom::blink::WebSandboxFlags
+GetSandboxFlagsNotImplementedAsFeaturePolicy(
+ network::mojom::blink::WebSandboxFlags sandbox_flags) {
// Punch all the sandbox flags which are converted to feature policy.
return sandbox_flags & ~SandboxFlagsImplementedByFeaturePolicy();
}
void ApplySandboxFlagsToParsedFeaturePolicy(
- mojom::blink::WebSandboxFlags sandbox_flags,
+ network::mojom::blink::WebSandboxFlags sandbox_flags,
ParsedFeaturePolicy& parsed_feature_policy) {
for (const auto& pair : SandboxFlagsWithFeaturePolicies()) {
- if ((sandbox_flags & pair.first) != mojom::blink::WebSandboxFlags::kNone)
+ if ((sandbox_flags & pair.first) !=
+ network::mojom::blink::WebSandboxFlags::kNone)
DisallowFeatureIfNotPresent(pair.second, parsed_feature_policy);
}
}
diff --git a/third_party/blink/renderer/core/frame/sandbox_flags.h b/third_party/blink/renderer/core/frame/sandbox_flags.h
index 817d836..87bae2e 100644
--- a/third_party/blink/renderer/core/frame/sandbox_flags.h
+++ b/third_party/blink/renderer/core/frame/sandbox_flags.h
@@ -27,16 +27,15 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_SANDBOX_FLAGS_H_
#define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_SANDBOX_FLAGS_H_
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink-forward.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
-#include "third_party/blink/public/common/frame/sandbox_flags.h"
-#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom-blink-forward.h"
#include "third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom-blink-forward.h"
#include "third_party/blink/renderer/core/dom/space_split_string.h"
#include "third_party/blink/renderer/platform/wtf/forward.h"
namespace blink {
using SandboxFlagFeaturePolicyPairs =
- Vector<std::pair<mojom::blink::WebSandboxFlags,
+ Vector<std::pair<network::mojom::blink::WebSandboxFlags,
mojom::blink::FeaturePolicyFeature>>;
// Returns a vector of pairs of sandbox flags and the corresponding feature
@@ -44,21 +43,23 @@
// yet migrated to using feature policies.
const SandboxFlagFeaturePolicyPairs& SandboxFlagsWithFeaturePolicies();
-mojom::blink::WebSandboxFlags ParseSandboxPolicy(
+network::mojom::blink::WebSandboxFlags ParseSandboxPolicy(
const SpaceSplitString& policy,
String& invalid_tokens_error_message);
// With FeaturePolicyForSandbox most sandbox flags will be represented with
// features. This method returns the part of sandbox flags which were not mapped
// to corresponding features.
-mojom::blink::WebSandboxFlags GetSandboxFlagsNotImplementedAsFeaturePolicy(
- mojom::blink::WebSandboxFlags);
+network::mojom::blink::WebSandboxFlags
+ GetSandboxFlagsNotImplementedAsFeaturePolicy(
+ network::mojom::blink::WebSandboxFlags);
// Applies the sandbox flags as parsed feature policies; If a flag is present
// both in the provided flags and in the parsed feature as a feature policy,
// the parsed policy takes precedence.
-void ApplySandboxFlagsToParsedFeaturePolicy(mojom::blink::WebSandboxFlags,
- ParsedFeaturePolicy&);
+void ApplySandboxFlagsToParsedFeaturePolicy(
+ network::mojom::blink::WebSandboxFlags,
+ ParsedFeaturePolicy&);
} // namespace blink
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
index 2660078..2954e46 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
@@ -95,6 +95,8 @@
#include "build/build_config.h"
#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
#include "mojo/public/cpp/bindings/pending_associated_remote.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/common/frame/frame_owner_element_type.h"
#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom-blink.h"
#include "third_party/blink/public/mojom/frame/media_player_action.mojom-blink.h"
@@ -1648,7 +1650,7 @@
InterfaceRegistry* interface_registry,
WebFrame* opener,
const WebString& name,
- mojom::blink::WebSandboxFlags sandbox_flags,
+ network::mojom::blink::WebSandboxFlags sandbox_flags,
const FeaturePolicy::FeatureState& opener_feature_state) {
return WebLocalFrameImpl::CreateMainFrame(
web_view, client, interface_registry, opener, name, sandbox_flags,
@@ -1671,7 +1673,7 @@
InterfaceRegistry* interface_registry,
WebFrame* opener,
const WebString& name,
- mojom::blink::WebSandboxFlags sandbox_flags,
+ network::mojom::blink::WebSandboxFlags sandbox_flags,
const FeaturePolicy::FeatureState& opener_feature_state) {
auto* frame = MakeGarbageCollected<WebLocalFrameImpl>(
util::PassKey<WebLocalFrameImpl>(), WebTreeScopeType::kDocument, client,
@@ -1702,8 +1704,8 @@
client, interface_registry);
web_frame->SetParent(previous_web_frame->Parent());
web_frame->SetOpener(previous_web_frame->Opener());
- mojom::blink::WebSandboxFlags sandbox_flags =
- mojom::blink::WebSandboxFlags::kNone;
+ network::mojom::blink::WebSandboxFlags sandbox_flags =
+ network::mojom::blink::WebSandboxFlags::kNone;
FeaturePolicy::FeatureState feature_state;
if (!previous_frame->Owner()) {
// Provisional main frames need to force sandbox flags. This is necessary
@@ -1808,7 +1810,7 @@
FrameOwner* owner,
const AtomicString& name,
WindowAgentFactory* window_agent_factory,
- mojom::blink::WebSandboxFlags sandbox_flags,
+ network::mojom::blink::WebSandboxFlags sandbox_flags,
const FeaturePolicy::FeatureState& opener_feature_state) {
SetCoreFrame(MakeGarbageCollected<LocalFrame>(local_frame_client_.Get(), page,
owner, window_agent_factory,
@@ -2290,11 +2292,12 @@
GetFrame()->CopyImageAtViewportPoint(IntPoint(pos_in_viewport));
}
-mojom::blink::WebSandboxFlags
+network::mojom::blink::WebSandboxFlags
WebLocalFrameImpl::EffectiveSandboxFlagsForTesting() const {
if (!GetFrame())
- return mojom::blink::WebSandboxFlags::kNone;
- SandboxFlags flags = GetFrame()->Loader().EffectiveSandboxFlags();
+ return network::mojom::blink::WebSandboxFlags::kNone;
+ network::mojom::blink::WebSandboxFlags flags =
+ GetFrame()->Loader().EffectiveSandboxFlags();
if (RuntimeEnabledFeatures::FeaturePolicyForSandboxEnabled()) {
// When some of sandbox flags set in the 'sandbox' attribute are implemented
// as policies they are removed form the FrameOwner's sandbox flags to avoid
@@ -2311,7 +2314,7 @@
->sandbox_flags_converted_to_feature_policies();
}
}
- return static_cast<mojom::blink::WebSandboxFlags>(flags);
+ return flags;
}
bool WebLocalFrameImpl::IsAllowedToDownload() const {
@@ -2330,8 +2333,8 @@
GetFrame()->Owner()->GetFramePolicy().allowed_to_download;
}
return (GetFrame()->Loader().PendingEffectiveSandboxFlags() &
- mojom::blink::WebSandboxFlags::kDownloads) ==
- mojom::blink::WebSandboxFlags::kNone;
+ network::mojom::blink::WebSandboxFlags::kDownloads) ==
+ network::mojom::blink::WebSandboxFlags::kNone;
}
void WebLocalFrameImpl::UsageCountChromeLoadTimes(const WebString& metric) {
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
index a8d2023b..27ede277 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
@@ -39,6 +39,7 @@
#include "base/util/type_safety/pass_key.h"
#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
#include "mojo/public/cpp/bindings/pending_associated_remote.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/mojom/ad_tagging/ad_frame.mojom-blink-forward.h"
#include "third_party/blink/public/mojom/devtools/devtools_agent.mojom-blink-forward.h"
#include "third_party/blink/public/mojom/frame/find_in_page.mojom-blink-forward.h"
@@ -237,7 +238,7 @@
const WebVector<WebString>& words) override;
void SetContentSettingsClient(WebContentSettingsClient*) override;
void ReloadImage(const WebNode&) override;
- mojom::blink::WebSandboxFlags EffectiveSandboxFlagsForTesting()
+ network::mojom::blink::WebSandboxFlags EffectiveSandboxFlagsForTesting()
const override;
bool IsAllowedToDownload() const override;
bool FindForTesting(int identifier,
@@ -335,8 +336,8 @@
FrameOwner*,
const AtomicString& name,
WindowAgentFactory*,
- mojom::blink::WebSandboxFlags sandbox_flags =
- mojom::blink::WebSandboxFlags::kNone,
+ network::mojom::blink::WebSandboxFlags sandbox_flags =
+ network::mojom::blink::WebSandboxFlags::kNone,
const FeaturePolicy::FeatureState& opener_feature_state =
FeaturePolicy::FeatureState());
LocalFrame* GetFrame() const { return frame_.Get(); }
@@ -345,13 +346,14 @@
void WillDetachParent();
void CollectGarbageForTesting();
- static WebLocalFrameImpl* CreateMainFrame(WebView*,
- WebLocalFrameClient*,
- InterfaceRegistry*,
- WebFrame* opener,
- const WebString& name,
- mojom::blink::WebSandboxFlags,
- const FeaturePolicy::FeatureState&);
+ static WebLocalFrameImpl* CreateMainFrame(
+ WebView*,
+ WebLocalFrameClient*,
+ InterfaceRegistry*,
+ WebFrame* opener,
+ const WebString& name,
+ network::mojom::blink::WebSandboxFlags,
+ const FeaturePolicy::FeatureState&);
static WebLocalFrameImpl* CreateProvisional(WebLocalFrameClient*,
InterfaceRegistry*,
WebFrame*,
diff --git a/third_party/blink/renderer/core/html/forms/html_form_element.cc b/third_party/blink/renderer/core/html/forms/html_form_element.cc
index 0a4292b..bc7b44a 100644
--- a/third_party/blink/renderer/core/html/forms/html_form_element.cc
+++ b/third_party/blink/renderer/core/html/forms/html_form_element.cc
@@ -266,7 +266,8 @@
return;
}
- if (GetDocument().IsSandboxed(mojom::blink::WebSandboxFlags::kForms)) {
+ if (GetDocument().IsSandboxed(
+ network::mojom::blink::WebSandboxFlags::kForms)) {
GetDocument().AddConsoleMessage(MakeGarbageCollected<ConsoleMessage>(
mojom::ConsoleMessageSource::kSecurity,
mojom::ConsoleMessageLevel::kError,
@@ -523,7 +524,8 @@
DCHECK(submission->Form());
if (submission->Action().IsEmpty())
return;
- if (GetDocument().IsSandboxed(mojom::blink::WebSandboxFlags::kForms)) {
+ if (GetDocument().IsSandboxed(
+ network::mojom::blink::WebSandboxFlags::kForms)) {
// FIXME: This message should be moved off the console once a solution to
// https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
GetDocument().AddConsoleMessage(MakeGarbageCollected<ConsoleMessage>(
diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third_party/blink/renderer/core/html/html_anchor_element.cc
index 932d534..4251a36d 100644
--- a/third_party/blink/renderer/core/html/html_anchor_element.cc
+++ b/third_party/blink/renderer/core/html/html_anchor_element.cc
@@ -78,7 +78,8 @@
should_intervene_download = true;
}
}
- if (document.IsSandboxed(mojom::blink::WebSandboxFlags::kDownloads)) {
+ if (document.IsSandboxed(
+ network::mojom::blink::WebSandboxFlags::kDownloads)) {
UseCounter::Count(document, WebFeature::kDownloadInSandbox);
if (RuntimeEnabledFeatures::BlockingDownloadsInSandboxEnabled())
should_intervene_download = true;
diff --git a/third_party/blink/renderer/core/html/html_frame_element_base.cc b/third_party/blink/renderer/core/html/html_frame_element_base.cc
index c4018d9..ac51562 100644
--- a/third_party/blink/renderer/core/html/html_frame_element_base.cc
+++ b/third_party/blink/renderer/core/html/html_frame_element_base.cc
@@ -23,6 +23,8 @@
#include "third_party/blink/renderer/core/html/html_frame_element_base.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/renderer/bindings/core/v8/binding_security.h"
#include "third_party/blink/renderer/bindings/core/v8/script_controller.h"
#include "third_party/blink/renderer/bindings/core/v8/script_event_listener.h"
@@ -162,9 +164,10 @@
HTMLFrameElementBase::GetOriginForFeaturePolicy() const {
// Sandboxed frames have a unique origin.
if ((GetFramePolicy().sandbox_flags &
- mojom::blink::WebSandboxFlags::kOrigin) !=
- mojom::blink::WebSandboxFlags::kNone)
+ network::mojom::blink::WebSandboxFlags::kOrigin) !=
+ network::mojom::blink::WebSandboxFlags::kNone) {
return SecurityOrigin::CreateUniqueOpaque();
+ }
// If the frame will inherit its origin from the owner, then use the owner's
// origin when constructing the container policy.
diff --git a/third_party/blink/renderer/core/html/html_frame_owner_element.cc b/third_party/blink/renderer/core/html/html_frame_owner_element.cc
index 9be3773..e7a51a4 100644
--- a/third_party/blink/renderer/core/html/html_frame_owner_element.cc
+++ b/third_party/blink/renderer/core/html/html_frame_owner_element.cc
@@ -274,7 +274,7 @@
}
void HTMLFrameOwnerElement::SetSandboxFlags(
- mojom::blink::WebSandboxFlags flags) {
+ network::mojom::blink::WebSandboxFlags flags) {
frame_policy_.sandbox_flags = flags;
// Recalculate the container policy in case the allow-same-origin flag has
// changed.
diff --git a/third_party/blink/renderer/core/html/html_frame_owner_element.h b/third_party/blink/renderer/core/html/html_frame_owner_element.h
index 92cb4da9..fd2751a 100644
--- a/third_party/blink/renderer/core/html/html_frame_owner_element.h
+++ b/third_party/blink/renderer/core/html/html_frame_owner_element.h
@@ -140,7 +140,7 @@
protected:
HTMLFrameOwnerElement(const QualifiedName& tag_name, Document&);
- void SetSandboxFlags(mojom::blink::WebSandboxFlags);
+ void SetSandboxFlags(network::mojom::blink::WebSandboxFlags);
void SetAllowedToDownload(bool allowed) {
frame_policy_.allowed_to_download = allowed;
}
diff --git a/third_party/blink/renderer/core/html/html_iframe_element.cc b/third_party/blink/renderer/core/html/html_iframe_element.cc
index 8056ae5..e4307f3 100644
--- a/third_party/blink/renderer/core/html/html_iframe_element.cc
+++ b/third_party/blink/renderer/core/html/html_iframe_element.cc
@@ -24,7 +24,9 @@
#include "third_party/blink/renderer/core/html/html_iframe_element.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
#include "services/network/public/mojom/trust_tokens.mojom-blink.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom-blink.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_html_iframe_element.h"
#include "third_party/blink/renderer/core/css/css_property_names.h"
@@ -151,22 +153,22 @@
String invalid_tokens;
bool feature_policy_for_sandbox =
RuntimeEnabledFeatures::FeaturePolicyForSandboxEnabled();
- mojom::blink::WebSandboxFlags current_flags =
+ network::mojom::blink::WebSandboxFlags current_flags =
value.IsNull()
- ? mojom::blink::WebSandboxFlags::kNone
+ ? network::mojom::blink::WebSandboxFlags::kNone
: ParseSandboxPolicy(sandbox_->TokenSet(), invalid_tokens);
SetAllowedToDownload(
- (current_flags & mojom::blink::WebSandboxFlags::kDownloads) ==
- mojom::blink::WebSandboxFlags::kNone);
+ (current_flags & network::mojom::blink::WebSandboxFlags::kDownloads) ==
+ network::mojom::blink::WebSandboxFlags::kNone);
// With FeaturePolicyForSandbox, sandbox flags are represented as part of
// the container policies. However, not all sandbox flags are yet converted
// and for now the residue will stay around in the stored flags.
// (see https://crbug.com/812381).
- mojom::blink::WebSandboxFlags sandbox_to_set = current_flags;
+ network::mojom::blink::WebSandboxFlags sandbox_to_set = current_flags;
sandbox_flags_converted_to_feature_policies_ =
- mojom::blink::WebSandboxFlags::kNone;
+ network::mojom::blink::WebSandboxFlags::kNone;
if (feature_policy_for_sandbox &&
- current_flags != mojom::blink::WebSandboxFlags::kNone) {
+ current_flags != network::mojom::blink::WebSandboxFlags::kNone) {
// Residue sandbox which will not be mapped to feature policies.
sandbox_to_set =
GetSandboxFlagsNotImplementedAsFeaturePolicy(current_flags);
@@ -318,11 +320,11 @@
// If the frame is sandboxed at all, then warn if feature policy attributes
// will override the sandbox attributes.
if (messages && (sandbox_flags_converted_to_feature_policies_ &
- mojom::blink::WebSandboxFlags::kNavigation) !=
- mojom::blink::WebSandboxFlags::kNone) {
+ network::mojom::blink::WebSandboxFlags::kNavigation) !=
+ network::mojom::blink::WebSandboxFlags::kNone) {
for (const auto& pair : SandboxFlagsWithFeaturePolicies()) {
if ((sandbox_flags_converted_to_feature_policies_ & pair.first) !=
- mojom::blink::WebSandboxFlags::kNone &&
+ network::mojom::blink::WebSandboxFlags::kNone &&
IsFeatureDeclared(pair.second, container_policy)) {
messages->push_back(String::Format(
"Allow and Sandbox attributes both mention '%s'. Allow will take "
diff --git a/third_party/blink/renderer/core/html/html_iframe_element.h b/third_party/blink/renderer/core/html/html_iframe_element.h
index 5040896..533dd1d 100644
--- a/third_party/blink/renderer/core/html/html_iframe_element.h
+++ b/third_party/blink/renderer/core/html/html_iframe_element.h
@@ -25,6 +25,7 @@
#define THIRD_PARTY_BLINK_RENDERER_CORE_HTML_HTML_IFRAME_ELEMENT_H_
#include "services/network/public/mojom/trust_tokens.mojom-blink-forward.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/public/common/frame/frame_owner_element_type.h"
#include "third_party/blink/renderer/core/core_export.h"
@@ -62,8 +63,8 @@
return FrameOwnerElementType::kIframe;
}
- mojom::blink::WebSandboxFlags sandbox_flags_converted_to_feature_policies()
- const {
+ network::mojom::blink::WebSandboxFlags
+ sandbox_flags_converted_to_feature_policies() const {
return sandbox_flags_converted_to_feature_policies_;
}
@@ -111,8 +112,9 @@
// This represents a subset of sandbox flags set through 'sandbox' attribute
// that will be converted to feature policies as part of the container
// policies.
- mojom::blink::WebSandboxFlags sandbox_flags_converted_to_feature_policies_ =
- mojom::blink::WebSandboxFlags::kNone;
+ network::mojom::blink::WebSandboxFlags
+ sandbox_flags_converted_to_feature_policies_ =
+ network::mojom::blink::WebSandboxFlags::kNone;
network::mojom::ReferrerPolicy referrer_policy_;
};
diff --git a/third_party/blink/renderer/core/html/html_plugin_element.cc b/third_party/blink/renderer/core/html/html_plugin_element.cc
index a1564b5..0842af9 100644
--- a/third_party/blink/renderer/core/html/html_plugin_element.cc
+++ b/third_party/blink/renderer/core/html/html_plugin_element.cc
@@ -732,7 +732,8 @@
bool HTMLPlugInElement::AllowedToLoadPlugin(const KURL& url,
const String& mime_type) {
- if (GetDocument().IsSandboxed(mojom::blink::WebSandboxFlags::kPlugins)) {
+ if (GetDocument().IsSandboxed(
+ network::mojom::blink::WebSandboxFlags::kPlugins)) {
GetDocument().AddConsoleMessage(MakeGarbageCollected<ConsoleMessage>(
mojom::ConsoleMessageSource::kSecurity,
mojom::ConsoleMessageLevel::kError,
diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
index 9e03caf6..f435e76 100644
--- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc
+++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
@@ -379,8 +379,9 @@
bool AutoplayPolicy::ShouldAutoplay() {
if (element_->GetDocument().IsSandboxed(
- mojom::blink::WebSandboxFlags::kAutomaticFeatures))
+ network::mojom::blink::WebSandboxFlags::kAutomaticFeatures)) {
return false;
+ }
return element_->can_autoplay_ && element_->paused_ && element_->Autoplay();
}
diff --git a/third_party/blink/renderer/core/loader/appcache/application_cache_host_for_frame.cc b/third_party/blink/renderer/core/loader/appcache/application_cache_host_for_frame.cc
index 551b8d5f..c84e4137 100644
--- a/third_party/blink/renderer/core/loader/appcache/application_cache_host_for_frame.cc
+++ b/third_party/blink/renderer/core/loader/appcache/application_cache_host_for_frame.cc
@@ -208,7 +208,7 @@
const KURL& manifest_url) {
LocalFrame* frame = document_loader_->GetFrame();
Document* document = frame->GetDocument();
- if (document->IsSandboxed(mojom::blink::WebSandboxFlags::kOrigin)) {
+ if (document->IsSandboxed(network::mojom::blink::WebSandboxFlags::kOrigin)) {
// Prevent sandboxes from establishing application caches.
SelectCacheWithoutManifest();
return;
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
index bbfe287..72ed70a3 100644
--- a/third_party/blink/renderer/core/loader/empty_clients.h
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
@@ -134,7 +134,7 @@
const FrameLoadRequest&,
const AtomicString&,
const WebWindowFeatures&,
- mojom::blink::WebSandboxFlags,
+ network::mojom::blink::WebSandboxFlags,
const FeaturePolicy::FeatureState&,
const SessionStorageNamespaceId&) override {
return nullptr;
diff --git a/third_party/blink/renderer/core/loader/frame_loader.cc b/third_party/blink/renderer/core/loader/frame_loader.cc
index 2abe0457..7ebd3523 100644
--- a/third_party/blink/renderer/core/loader/frame_loader.cc
+++ b/third_party/blink/renderer/core/loader/frame_loader.cc
@@ -46,6 +46,8 @@
#include "services/metrics/public/cpp/ukm_builders.h"
#include "services/metrics/public/cpp/ukm_recorder.h"
#include "services/network/public/cpp/features.h"
+#include "services/network/public/cpp/web_sandbox_flags.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h"
#include "third_party/blink/public/mojom/frame/navigation_initiator.mojom-blink.h"
@@ -178,7 +180,7 @@
FrameLoader::FrameLoader(LocalFrame* frame)
: frame_(frame),
progress_tracker_(MakeGarbageCollected<ProgressTracker>(frame)),
- forced_sandbox_flags_(mojom::blink::WebSandboxFlags::kNone),
+ forced_sandbox_flags_(network::mojom::blink::WebSandboxFlags::kNone),
dispatching_did_clear_window_object_in_main_world_(false),
detached_(false),
virtual_time_pauser_(
@@ -539,9 +541,10 @@
return false;
if (frame_->Owner() && ((frame_->Owner()->GetFramePolicy().sandbox_flags &
- mojom::blink::WebSandboxFlags::kOrigin) !=
- mojom::blink::WebSandboxFlags::kNone))
+ network::mojom::blink::WebSandboxFlags::kOrigin) !=
+ network::mojom::blink::WebSandboxFlags::kNone)) {
return false;
+ }
}
if (!request.CanDisplay(url)) {
@@ -1422,11 +1425,12 @@
// be considered when deciding whether to reuse it.
// Spec:
// https://html.spec.whatwg.org/C/#initialise-the-document-object
- if ((csp &&
- (csp->GetSandboxMask() & mojom::blink::WebSandboxFlags::kOrigin) !=
- mojom::blink::WebSandboxFlags::kNone) ||
- ((EffectiveSandboxFlags() & mojom::blink::WebSandboxFlags::kOrigin) !=
- mojom::blink::WebSandboxFlags::kNone)) {
+ if ((csp && (csp->GetSandboxMask() &
+ network::mojom::blink::WebSandboxFlags::kOrigin) !=
+ network::mojom::blink::WebSandboxFlags::kNone) ||
+ ((EffectiveSandboxFlags() &
+ network::mojom::blink::WebSandboxFlags::kOrigin) !=
+ network::mojom::blink::WebSandboxFlags::kNone)) {
return false;
}
@@ -1492,6 +1496,16 @@
// The frame might be detached at this point.
}
+void FrameLoader::ForceSandboxFlags(
+ network::mojom::blink::WebSandboxFlags flags) {
+ forced_sandbox_flags_ |= flags;
+}
+
+void FrameLoader::SetFrameOwnerSandboxFlags(
+ network::mojom::blink::WebSandboxFlags flags) {
+ frame_owner_sandbox_flags_ = flags;
+}
+
void FrameLoader::DispatchDidClearDocumentOfWindowObject() {
DCHECK(frame_->GetDocument());
if (state_machine_.CreatingInitialEmptyDocument())
@@ -1527,8 +1541,9 @@
Client()->DispatchDidClearWindowObjectInMainWorld();
}
-SandboxFlags FrameLoader::EffectiveSandboxFlags() const {
- SandboxFlags flags = forced_sandbox_flags_;
+network::mojom::blink::WebSandboxFlags FrameLoader::EffectiveSandboxFlags()
+ const {
+ network::mojom::blink::WebSandboxFlags flags = forced_sandbox_flags_;
if (frame_->Owner()) {
// Cannot use flags in frame_owner->GetFramePolicy().sandbox_flags, because
// frame_owner's frame policy is volatile and can be changed by javascript
@@ -1544,8 +1559,9 @@
return flags;
}
-SandboxFlags FrameLoader::PendingEffectiveSandboxFlags() const {
- SandboxFlags flags = forced_sandbox_flags_;
+network::mojom::blink::WebSandboxFlags
+FrameLoader::PendingEffectiveSandboxFlags() const {
+ network::mojom::blink::WebSandboxFlags flags = forced_sandbox_flags_;
if (FrameOwner* frame_owner = frame_->Owner())
flags |= frame_owner->GetFramePolicy().sandbox_flags;
// Frames need to inherit the sandbox flags of their parent frame.
diff --git a/third_party/blink/renderer/core/loader/frame_loader.h b/third_party/blink/renderer/core/loader/frame_loader.h
index bda3ebc..0d72056 100644
--- a/third_party/blink/renderer/core/loader/frame_loader.h
+++ b/third_party/blink/renderer/core/loader/frame_loader.h
@@ -37,6 +37,7 @@
#include "base/bind_helpers.h"
#include "base/macros.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink-forward.h"
#include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
#include "third_party/blink/public/mojom/loader/request_context_frame_type.mojom-blink-forward.h"
#include "third_party/blink/public/platform/scheduler/web_scoped_virtual_time_pauser.h"
@@ -47,7 +48,6 @@
#include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/core/dom/document.h"
#include "third_party/blink/renderer/core/frame/frame_types.h"
-#include "third_party/blink/renderer/core/frame/sandbox_flags.h"
#include "third_party/blink/renderer/core/loader/frame_loader_state_machine.h"
#include "third_party/blink/renderer/core/loader/frame_loader_types.h"
#include "third_party/blink/renderer/core/loader/history_item.h"
@@ -142,28 +142,24 @@
// The following sandbox flags will be forced, regardless of changes to the
// sandbox attribute of any parent frames.
- void ForceSandboxFlags(mojom::blink::WebSandboxFlags flags) {
- forced_sandbox_flags_ |= flags;
- }
+ void ForceSandboxFlags(network::mojom::blink::WebSandboxFlags flags);
// Set frame_owner's effective sandbox flags, which are sandbox flags value
// at the beginning of navigation.
- void SetFrameOwnerSandboxFlags(mojom::blink::WebSandboxFlags flags) {
- frame_owner_sandbox_flags_ = flags;
- }
+ void SetFrameOwnerSandboxFlags(network::mojom::blink::WebSandboxFlags flags);
// Includes the collection of forced, inherited, and FrameOwner's sandbox
// flags, where the FrameOwner's flag is snapshotted from the last committed
// navigation. Note: with FeaturePolicyForSandbox the frame owner's sandbox
// flags only includes the flags which are *not* implemented as feature
// policies already present in the FrameOwner's ContainerPolicy.
- mojom::blink::WebSandboxFlags EffectiveSandboxFlags() const;
+ network::mojom::blink::WebSandboxFlags EffectiveSandboxFlags() const;
// Includes the collection of forced, inherited, and FrameOwner's sandbox
// flags. Note: with FeaturePolicyForSandbox the frame owner's sandbox flags
// only includes the flags which are *not* implemented as feature policies
// already present in the FrameOwner's ContainerPolicy.
- mojom::blink::WebSandboxFlags PendingEffectiveSandboxFlags() const;
+ network::mojom::blink::WebSandboxFlags PendingEffectiveSandboxFlags() const;
// Modifying itself is done based on |fetch_client_settings_object|.
// |document_for_logging| is used only for logging, use counters,
@@ -322,15 +318,15 @@
};
std::unique_ptr<ClientNavigationState> client_navigation_;
- mojom::blink::WebSandboxFlags forced_sandbox_flags_;
+ network::mojom::blink::WebSandboxFlags forced_sandbox_flags_;
// A snapshot value of frame_owner's sandbox flags states at the beginning of
// navigation. For main frame which does not have a frame owner, the value is
// base::nullopt.
// The snapshot value is needed because of potential racing conditions on
// sandbox attribute on iframe element.
// crbug.com/1026627
- base::Optional<mojom::blink::WebSandboxFlags> frame_owner_sandbox_flags_ =
- base::nullopt;
+ base::Optional<network::mojom::blink::WebSandboxFlags>
+ frame_owner_sandbox_flags_ = base::nullopt;
bool dispatching_did_clear_window_object_in_main_world_;
bool detached_;
diff --git a/third_party/blink/renderer/core/page/chrome_client.cc b/third_party/blink/renderer/core/page/chrome_client.cc
index a7c33411..89d0c40a 100644
--- a/third_party/blink/renderer/core/page/chrome_client.cc
+++ b/third_party/blink/renderer/core/page/chrome_client.cc
@@ -126,7 +126,7 @@
const FrameLoadRequest& r,
const AtomicString& frame_name,
const WebWindowFeatures& features,
- mojom::blink::WebSandboxFlags sandbox_flags,
+ network::mojom::blink::WebSandboxFlags sandbox_flags,
const FeaturePolicy::FeatureState& opener_feature_state,
const SessionStorageNamespaceId& session_storage_namespace_id) {
if (!CanOpenUIElementIfDuringPageDismissal(
@@ -278,7 +278,7 @@
}
if (frame->GetDocument()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kModals)) {
+ network::mojom::blink::WebSandboxFlags::kModals)) {
UseCounter::Count(frame->GetDocument(),
WebFeature::kDialogInSandboxedContext);
frame->Console().AddMessage(MakeGarbageCollected<ConsoleMessage>(
diff --git a/third_party/blink/renderer/core/page/chrome_client.h b/third_party/blink/renderer/core/page/chrome_client.h
index e027493..9898b32 100644
--- a/third_party/blink/renderer/core/page/chrome_client.h
+++ b/third_party/blink/renderer/core/page/chrome_client.h
@@ -44,7 +44,6 @@
#include "third_party/blink/public/web/web_widget_client.h"
#include "third_party/blink/renderer/core/accessibility/ax_object_cache.h"
#include "third_party/blink/renderer/core/core_export.h"
-#include "third_party/blink/renderer/core/frame/sandbox_flags.h"
#include "third_party/blink/renderer/core/html/forms/external_date_time_chooser.h"
#include "third_party/blink/renderer/core/html/forms/popup_menu.h"
#include "third_party/blink/renderer/core/layout/geometry/physical_offset.h"
@@ -201,7 +200,7 @@
const FrameLoadRequest&,
const AtomicString& frame_name,
const WebWindowFeatures&,
- mojom::blink::WebSandboxFlags,
+ network::mojom::blink::WebSandboxFlags,
const FeaturePolicy::FeatureState&,
const SessionStorageNamespaceId&);
virtual void Show(NavigationPolicy) = 0;
@@ -528,7 +527,7 @@
const FrameLoadRequest&,
const AtomicString& frame_name,
const WebWindowFeatures&,
- mojom::blink::WebSandboxFlags,
+ network::mojom::blink::WebSandboxFlags,
const FeaturePolicy::FeatureState&,
const SessionStorageNamespaceId&) = 0;
diff --git a/third_party/blink/renderer/core/page/chrome_client_impl.cc b/third_party/blink/renderer/core/page/chrome_client_impl.cc
index cf28300c..197279a 100644
--- a/third_party/blink/renderer/core/page/chrome_client_impl.cc
+++ b/third_party/blink/renderer/core/page/chrome_client_impl.cc
@@ -251,7 +251,7 @@
const FrameLoadRequest& r,
const AtomicString& name,
const WebWindowFeatures& features,
- mojom::blink::WebSandboxFlags sandbox_flags,
+ network::mojom::blink::WebSandboxFlags sandbox_flags,
const FeaturePolicy::FeatureState& opener_feature_state,
const SessionStorageNamespaceId& session_storage_namespace_id) {
if (!web_view_->Client())
@@ -268,8 +268,7 @@
WebLocalFrameImpl::FromFrame(frame),
WrappedResourceRequest(r.GetResourceRequest()), features, frame_name,
static_cast<WebNavigationPolicy>(r.GetNavigationPolicy()),
- static_cast<mojom::blink::WebSandboxFlags>(sandbox_flags),
- opener_feature_state, session_storage_namespace_id));
+ sandbox_flags, opener_feature_state, session_storage_namespace_id));
if (!new_view)
return nullptr;
return new_view->GetPage();
diff --git a/third_party/blink/renderer/core/page/chrome_client_impl.h b/third_party/blink/renderer/core/page/chrome_client_impl.h
index ec816f10..c2646fe 100644
--- a/third_party/blink/renderer/core/page/chrome_client_impl.h
+++ b/third_party/blink/renderer/core/page/chrome_client_impl.h
@@ -87,7 +87,7 @@
const FrameLoadRequest&,
const AtomicString& name,
const WebWindowFeatures&,
- mojom::blink::WebSandboxFlags,
+ network::mojom::blink::WebSandboxFlags,
const FeaturePolicy::FeatureState&,
const SessionStorageNamespaceId&) override;
void Show(NavigationPolicy) override;
diff --git a/third_party/blink/renderer/core/page/chrome_client_impl_test.cc b/third_party/blink/renderer/core/page/chrome_client_impl_test.cc
index 5eedac92..efc5c459 100644
--- a/third_party/blink/renderer/core/page/chrome_client_impl_test.cc
+++ b/third_party/blink/renderer/core/page/chrome_client_impl_test.cc
@@ -31,6 +31,7 @@
#include "third_party/blink/renderer/core/page/chrome_client_impl.h"
#include "base/run_loop.h"
#include "cc/trees/layer_tree_host.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/public/common/input/web_input_event.h"
@@ -63,7 +64,7 @@
const WebWindowFeatures&,
const WebString& name,
WebNavigationPolicy,
- mojom::blink::WebSandboxFlags,
+ network::mojom::blink::WebSandboxFlags,
const FeaturePolicy::FeatureState&,
const SessionStorageNamespaceId&) override {
return web_view_helper_.InitializeWithOpener(opener);
@@ -97,7 +98,7 @@
WebWindowFeatures features;
EXPECT_EQ(nullptr, chrome_client_impl_->CreateWindow(
frame, request, "", features,
- mojom::blink::WebSandboxFlags::kNone,
+ network::mojom::blink::WebSandboxFlags::kNone,
FeaturePolicy::FeatureState(), ""));
}
diff --git a/third_party/blink/renderer/core/page/create_window.cc b/third_party/blink/renderer/core/page/create_window.cc
index 79b3084..556ed037 100644
--- a/third_party/blink/renderer/core/page/create_window.cc
+++ b/third_party/blink/renderer/core/page/create_window.cc
@@ -272,7 +272,7 @@
// Sandboxed frames cannot open new auxiliary browsing contexts.
if (opener_frame.GetDocument()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kPopups)) {
+ network::mojom::blink::WebSandboxFlags::kPopups)) {
// FIXME: This message should be moved off the console once a solution to
// https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
opener_frame.GetDocument()->AddConsoleMessage(
@@ -286,12 +286,13 @@
}
bool propagate_sandbox = opener_frame.GetDocument()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kPropagatesToAuxiliaryBrowsingContexts);
- const SandboxFlags sandbox_flags =
+ network::mojom::blink::WebSandboxFlags::
+ kPropagatesToAuxiliaryBrowsingContexts);
+ network::mojom::blink::WebSandboxFlags sandbox_flags =
propagate_sandbox ? opener_frame.GetDocument()->GetSandboxFlags()
- : mojom::blink::WebSandboxFlags::kNone;
+ : network::mojom::blink::WebSandboxFlags::kNone;
bool not_sandboxed = opener_frame.GetDocument()->GetSandboxFlags() ==
- mojom::blink::WebSandboxFlags::kNone;
+ network::mojom::blink::WebSandboxFlags::kNone;
FeaturePolicy::FeatureState opener_feature_state =
(not_sandboxed || propagate_sandbox) ? opener_frame.GetSecurityContext()
->GetFeaturePolicy()
diff --git a/third_party/blink/renderer/core/page/pointer_lock_controller.cc b/third_party/blink/renderer/core/page/pointer_lock_controller.cc
index 8b72cb3..ee66ab8 100644
--- a/third_party/blink/renderer/core/page/pointer_lock_controller.cc
+++ b/third_party/blink/renderer/core/page/pointer_lock_controller.cc
@@ -25,6 +25,7 @@
#include "third_party/blink/renderer/core/page/pointer_lock_controller.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/common/input/web_mouse_event.h"
#include "third_party/blink/public/mojom/input/pointer_lock_result.mojom-blink.h"
#include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
@@ -71,7 +72,7 @@
}
if (target->GetDocument().IsSandboxed(
- mojom::blink::WebSandboxFlags::kPointerLock)) {
+ network::mojom::blink::WebSandboxFlags::kPointerLock)) {
// FIXME: This message should be moved off the console once a solution to
// https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
target->GetDocument().AddConsoleMessage(
diff --git a/third_party/blink/renderer/core/svg/graphics/svg_image.cc b/third_party/blink/renderer/core/svg/graphics/svg_image.cc
index d9dea86e..13ebb14 100644
--- a/third_party/blink/renderer/core/svg/graphics/svg_image.cc
+++ b/third_party/blink/renderer/core/svg/graphics/svg_image.cc
@@ -868,7 +868,7 @@
}
FrameLoader& loader = frame->Loader();
- loader.ForceSandboxFlags(mojom::blink::WebSandboxFlags::kAll);
+ loader.ForceSandboxFlags(network::mojom::blink::WebSandboxFlags::kAll);
// SVG Images will always synthesize a viewBox, if it's not available, and
// thus never see scrollbars.
diff --git a/third_party/blink/renderer/core/workers/worker_or_worklet_global_scope.cc b/third_party/blink/renderer/core/workers/worker_or_worklet_global_scope.cc
index 141b1d0..8e4621b 100644
--- a/third_party/blink/renderer/core/workers/worker_or_worklet_global_scope.cc
+++ b/third_party/blink/renderer/core/workers/worker_or_worklet_global_scope.cc
@@ -4,6 +4,7 @@
#include "third_party/blink/renderer/core/workers/worker_or_worklet_global_scope.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom-blink.h"
#include "third_party/blink/public/platform/task_type.h"
@@ -97,7 +98,7 @@
// SecurityContext and FetchClientSettingsObject, e.g. when doing
// off-the-main-thread shared worker/service worker top-level script fetch.
// https://crbug.com/924041 https://crbug.com/924043
- void SetSandboxFlags(SandboxFlags) override {}
+ void SetSandboxFlags(network::mojom::blink::WebSandboxFlags) override {}
void SetRequireTrustedTypes() override {}
void AddInsecureRequestPolicy(mojom::blink::InsecureRequestPolicy) override {}
void DisableEval(const String& error_message) override {}
@@ -423,9 +424,10 @@
return GetThread()->GetTaskRunner(type);
}
-void WorkerOrWorkletGlobalScope::ApplySandboxFlags(SandboxFlags mask) {
+void WorkerOrWorkletGlobalScope::ApplySandboxFlags(
+ network::mojom::blink::WebSandboxFlags mask) {
GetSecurityContext().ApplySandboxFlags(mask);
- if (IsSandboxed(mojom::blink::WebSandboxFlags::kOrigin) &&
+ if (IsSandboxed(network::mojom::blink::WebSandboxFlags::kOrigin) &&
!GetSecurityOrigin()->IsOpaque()) {
GetSecurityContext().SetSecurityOrigin(
GetSecurityOrigin()->DeriveNewOpaqueOrigin());
diff --git a/third_party/blink/renderer/core/workers/worker_or_worklet_global_scope.h b/third_party/blink/renderer/core/workers/worker_or_worklet_global_scope.h
index 5b8588e..5394d73 100644
--- a/third_party/blink/renderer/core/workers/worker_or_worklet_global_scope.h
+++ b/third_party/blink/renderer/core/workers/worker_or_worklet_global_scope.h
@@ -8,6 +8,7 @@
#include <bitset>
#include "base/single_thread_task_runner.h"
#include "services/network/public/mojom/fetch_api.mojom-blink-forward.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink-forward.h"
#include "third_party/blink/public/platform/web_url_request.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_cache_options.h"
#include "third_party/blink/renderer/core/core_export.h"
@@ -152,7 +153,7 @@
scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner(TaskType) override;
- void ApplySandboxFlags(SandboxFlags mask);
+ void ApplySandboxFlags(network::mojom::blink::WebSandboxFlags mask);
void SetDefersLoadingForResourceFetchers(bool defers);
diff --git a/third_party/blink/renderer/modules/cache_storage/global_cache_storage.cc b/third_party/blink/renderer/modules/cache_storage/global_cache_storage.cc
index 30d6dfc..5921dff 100644
--- a/third_party/blink/renderer/modules/cache_storage/global_cache_storage.cc
+++ b/third_party/blink/renderer/modules/cache_storage/global_cache_storage.cc
@@ -44,7 +44,7 @@
ExecutionContext* context = fetching_scope.GetExecutionContext();
if (!context->GetSecurityOrigin()->CanAccessCacheStorage()) {
if (context->GetSecurityContext().IsSandboxed(
- mojom::blink::WebSandboxFlags::kOrigin)) {
+ network::mojom::blink::WebSandboxFlags::kOrigin)) {
exception_state.ThrowSecurityError(
"Cache storage is disabled because the context is sandboxed and "
"lacks the 'allow-same-origin' flag.");
diff --git a/third_party/blink/renderer/modules/native_file_system/native_file_system_directory_handle.cc b/third_party/blink/renderer/modules/native_file_system/native_file_system_directory_handle.cc
index ad38666..cd1cfa5 100644
--- a/third_party/blink/renderer/modules/native_file_system/native_file_system_directory_handle.cc
+++ b/third_party/blink/renderer/modules/native_file_system/native_file_system_directory_handle.cc
@@ -6,6 +6,7 @@
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/common/browser_interface_broker_proxy.h"
#include "third_party/blink/public/mojom/native_file_system/native_file_system_error.mojom-blink.h"
#include "third_party/blink/public/mojom/native_file_system/native_file_system_manager.mojom-blink.h"
@@ -197,7 +198,7 @@
ExecutionContext* context = ExecutionContext::From(script_state);
if (!context->GetSecurityOrigin()->CanAccessNativeFileSystem()) {
if (context->GetSecurityContext().IsSandboxed(
- mojom::blink::WebSandboxFlags::kOrigin)) {
+ network::mojom::blink::WebSandboxFlags::kOrigin)) {
exception_state.ThrowSecurityError(
"System directory access is denied because the context is "
"sandboxed and lacks the 'allow-same-origin' flag.");
diff --git a/third_party/blink/renderer/modules/native_file_system/window_native_file_system.cc b/third_party/blink/renderer/modules/native_file_system/window_native_file_system.cc
index e0fe751..664309fe 100644
--- a/third_party/blink/renderer/modules/native_file_system/window_native_file_system.cc
+++ b/third_party/blink/renderer/modules/native_file_system/window_native_file_system.cc
@@ -7,6 +7,7 @@
#include <utility>
#include "mojo/public/cpp/bindings/remote.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/common/browser_interface_broker_proxy.h"
#include "third_party/blink/public/mojom/native_file_system/native_file_system_manager.mojom-blink.h"
#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
@@ -77,7 +78,8 @@
}
if (!document->GetSecurityOrigin()->CanAccessNativeFileSystem()) {
- if (document->IsSandboxed(mojom::blink::WebSandboxFlags::kOrigin)) {
+ if (document->IsSandboxed(
+ network::mojom::blink::WebSandboxFlags::kOrigin)) {
exception_state.ThrowSecurityError(
"Sandboxed documents aren't allowed to show a file picker.");
return ScriptPromise();
diff --git a/third_party/blink/renderer/modules/presentation/presentation_request.cc b/third_party/blink/renderer/modules/presentation/presentation_request.cc
index 9483efa4..93e291d 100644
--- a/third_party/blink/renderer/modules/presentation/presentation_request.cc
+++ b/third_party/blink/renderer/modules/presentation/presentation_request.cc
@@ -60,8 +60,8 @@
const Vector<String>& urls,
ExceptionState& exception_state) {
if (Document::From(execution_context)
- ->IsSandboxed(
- mojom::blink::WebSandboxFlags::kPresentationController)) {
+ ->IsSandboxed(network::mojom::blink::WebSandboxFlags::
+ kPresentationController)) {
exception_state.ThrowSecurityError(
"The document is sandboxed and lacks the 'allow-presentation' flag.");
return nullptr;
diff --git a/third_party/blink/renderer/modules/screen_orientation/screen_orientation.cc b/third_party/blink/renderer/modules/screen_orientation/screen_orientation.cc
index b232b8fb..3a9d1b4b 100644
--- a/third_party/blink/renderer/modules/screen_orientation/screen_orientation.cc
+++ b/third_party/blink/renderer/modules/screen_orientation/screen_orientation.cc
@@ -7,6 +7,7 @@
#include <memory>
#include "base/stl_util.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/common/screen_orientation/web_screen_orientation_type.h"
#include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
@@ -161,7 +162,8 @@
return ScriptPromise();
}
- if (document->IsSandboxed(mojom::blink::WebSandboxFlags::kOrientationLock)) {
+ if (document->IsSandboxed(
+ network::mojom::blink::WebSandboxFlags::kOrientationLock)) {
exception_state.ThrowSecurityError(
"The document is sandboxed and lacks the "
"'allow-orientation-lock' flag.");
diff --git a/third_party/blink/renderer/modules/service_worker/navigator_service_worker.cc b/third_party/blink/renderer/modules/service_worker/navigator_service_worker.cc
index 668a8deb..7e2bab5 100644
--- a/third_party/blink/renderer/modules/service_worker/navigator_service_worker.cc
+++ b/third_party/blink/renderer/modules/service_worker/navigator_service_worker.cc
@@ -4,6 +4,7 @@
#include "third_party/blink/renderer/modules/service_worker/navigator_service_worker.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/renderer/core/dom/document.h"
#include "third_party/blink/renderer/core/execution_context/execution_context.h"
#include "third_party/blink/renderer/core/frame/local_dom_window.h"
@@ -91,7 +92,7 @@
->CanAccessServiceWorkers()) {
String error_message;
if (frame->GetSecurityContext()->IsSandboxed(
- mojom::blink::WebSandboxFlags::kOrigin)) {
+ network::mojom::blink::WebSandboxFlags::kOrigin)) {
error_message =
"Service worker is disabled because the context is sandboxed and "
"lacks the 'allow-same-origin' flag.";
diff --git a/third_party/blink/renderer/modules/storage/dom_window_storage.cc b/third_party/blink/renderer/modules/storage/dom_window_storage.cc
index 31e07a88..709572e9 100644
--- a/third_party/blink/renderer/modules/storage/dom_window_storage.cc
+++ b/third_party/blink/renderer/modules/storage/dom_window_storage.cc
@@ -6,6 +6,7 @@
#include "base/feature_list.h"
#include "base/memory/scoped_refptr.h"
+#include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/renderer/core/dom/document.h"
#include "third_party/blink/renderer/core/frame/local_dom_window.h"
@@ -64,7 +65,7 @@
DCHECK(document);
String access_denied_message = "Access is denied for this document.";
if (!document->GetSecurityOrigin()->CanAccessSessionStorage()) {
- if (document->IsSandboxed(mojom::blink::WebSandboxFlags::kOrigin))
+ if (document->IsSandboxed(network::mojom::blink::WebSandboxFlags::kOrigin))
exception_state.ThrowSecurityError(
"The document is sandboxed and lacks the 'allow-same-origin' flag.");
else if (document->Url().ProtocolIs("data"))
@@ -116,7 +117,7 @@
DCHECK(document);
String access_denied_message = "Access is denied for this document.";
if (!document->GetSecurityOrigin()->CanAccessLocalStorage()) {
- if (document->IsSandboxed(mojom::blink::WebSandboxFlags::kOrigin))
+ if (document->IsSandboxed(network::mojom::blink::WebSandboxFlags::kOrigin))
exception_state.ThrowSecurityError(
"The document is sandboxed and lacks the 'allow-same-origin' flag.");
else if (document->Url().ProtocolIs("data"))
