Skip to content

GitLab

T
tangled
Commit 575e18a4 authored by Eric Lawrence's avatar Eric Lawrence Committed by Commit Bot
Browse files
Options

Don't propagate SessionStorage when noopener is set 

When a browsing context is opened with the noopener flag set, do not
clone its SessionStorage from the opener's SessionStorage

Bug: 771959
Change-Id: I3040d8c0f490198f3414fb9b9108cfccca0da486
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1809006
Commit-Queue: Eric Lawrence [MSFT] <ericlaw@microsoft.com>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Reviewed-by: default avatarMarijn Kruisselbrink <mek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#831044}
parent 17aeea03
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 14 deletions
content/browser/dom_storage/dom_storage_browsertest.cc
View file @ 575e18a4
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/test/bind.h" #include "base/test/bind.h"
#include "base/test/scoped_feature_list.h"
#include "base/threading/thread_restrictions.h" #include "base/threading/thread_restrictions.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "components/services/storage/dom_storage/legacy_dom_storage_database.h" #include "components/services/storage/dom_storage/legacy_dom_storage_database.h"
...@@ -199,4 +200,28 @@ IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, DataMigrates) { ...@@ -199,4 +200,28 @@ IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, DataMigrates) {
} }
} }
// Verify that when kCloneSessionStorageForNoOpener is enabled, sessionStorage
// is cloned for popups even when |noopener| is specified.
// TODO(crbug.com/1151381): Remove in Chrome 92.
class DOMStorageCloningBrowserTest : public ContentBrowserTest {
public:
DOMStorageCloningBrowserTest() {
feature_list_.InitAndEnableFeature(
blink::features::kCloneSessionStorageForNoOpener);
}
void PopupTest(const GURL& test_url, const std::string& expected) {
NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 2);
std::string result = shell()->web_contents()->GetLastCommittedURL().ref();
EXPECT_EQ(result, expected);
}
private:
base::test::ScopedFeatureList feature_list_;
};
IN_PROC_BROWSER_TEST_F(DOMStorageCloningBrowserTest, NoOpenerTest) {
PopupTest(GetTestUrl("dom_storage", "noopener_cloning.html"), "firstTab");
}
} // namespace content } // namespace content
content/renderer/render_view_impl.cc
View file @ 575e18a4
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "content/renderer/agent_scheduling_group.h" #include "content/renderer/agent_scheduling_group.h"
#include "content/renderer/render_frame_proxy.h" #include "content/renderer/render_frame_proxy.h"
#include "content/renderer/render_thread_impl.h" #include "content/renderer/render_thread_impl.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/platform/modules/video_capture/web_video_capture_impl_manager.h" #include "third_party/blink/public/platform/modules/video_capture/web_video_capture_impl_manager.h"
#include "third_party/blink/public/platform/url_conversion.h" #include "third_party/blink/public/platform/url_conversion.h"
#include "third_party/blink/public/web/modules/mediastream/web_media_stream_device_observer.h" #include "third_party/blink/public/web/modules/mediastream/web_media_stream_device_observer.h"
...@@ -364,11 +365,12 @@ WebView* RenderViewImpl::CreateView( ...@@ -364,11 +365,12 @@ WebView* RenderViewImpl::CreateView(
params->window_container_type = WindowFeaturesToContainerType(features); params->window_container_type = WindowFeaturesToContainerType(features);
params->session_storage_namespace_id = session_storage_namespace_id; params->session_storage_namespace_id = session_storage_namespace_id;
// TODO(dmurph): Don't copy session storage when features.noopener is true: if (!features.noopener ||
// https://html.spec.whatwg.org/multipage/browsers.html#copy-session-storage base::FeatureList::IsEnabled(
// https://crbug.com/771959 blink::features::kCloneSessionStorageForNoOpener)) {
params->clone_from_session_storage_namespace_id = params->clone_from_session_storage_namespace_id =
session_storage_namespace_id_; session_storage_namespace_id_;
}
const std::string& frame_name_utf8 = frame_name.Utf8( const std::string& frame_name_utf8 = frame_name.Utf8(
WebString::UTF8ConversionMode::kStrictReplacingErrorsWithFFFD); WebString::UTF8ConversionMode::kStrictReplacingErrorsWithFFFD);
......
content/test/data/dom_storage/noopener_cloning.html 0 → 100644
View file @ 575e18a4
<!DOCTYPE HTML>
<html>
<head>
<title>Open a new window with noopener</title>
</head>
<body>
<script>
var storage = window.sessionStorage;
storage.clear();
storage.setItem('setBy', 'firstTab');
let channel = new BroadcastChannel('storage_session_window_noopener');
channel.addEventListener('message', function(e) {
document.location.hash = '#'+e.data.setBy;
});
var win = window.open('session_storage_popup.html', '_blank', 'noopener');
</script>
</body>
</html>
content/test/data/dom_storage/session_storage_popup.html 0 → 100644
View file @ 575e18a4
<!DOCTYPE HTML>
<html>
<head>
<title>Second page</title>
</head>
<body>
<script>
var storage = window.sessionStorage;
let channel = new BroadcastChannel('storage_session_window_noopener');
channel.postMessage({'setBy': storage.getItem('setBy')}, '*');
window.close();
</script>
</body>
</html>
third_party/blink/common/features.cc
View file @ 575e18a4
...@@ -829,5 +829,11 @@ const base::Feature kTargetBlankImpliesNoOpener{ ...@@ -829,5 +829,11 @@ const base::Feature kTargetBlankImpliesNoOpener{
// TODO(crbug.com/1152307): Remove in M91. // TODO(crbug.com/1152307): Remove in M91.
const base::Feature kMediaStreamTrackUseConfigMaxFrameRate{ const base::Feature kMediaStreamTrackUseConfigMaxFrameRate{
"MediaStreamTrackUseConfigMaxFrameRate", base::FEATURE_DISABLED_BY_DEFAULT}; "MediaStreamTrackUseConfigMaxFrameRate", base::FEATURE_DISABLED_BY_DEFAULT};
// Kill switch for the new behavior whereby noopener windows no longer get their
// sessionStorage cloned from their originator. TODO(crbug.com/1151381): Remove
// in Chrome 92.
const base::Feature kCloneSessionStorageForNoOpener{
"CloneSessionStorageForNoOpener", base::FEATURE_DISABLED_BY_DEFAULT};
} // namespace features } // namespace features
} // namespace blink } // namespace blink
third_party/blink/public/common/features.h
View file @ 575e18a4
...@@ -341,6 +341,8 @@ BLINK_COMMON_EXPORT extern const base::Feature kTargetBlankImpliesNoOpener; ...@@ -341,6 +341,8 @@ BLINK_COMMON_EXPORT extern const base::Feature kTargetBlankImpliesNoOpener;
BLINK_COMMON_EXPORT extern const base::Feature BLINK_COMMON_EXPORT extern const base::Feature
kMediaStreamTrackUseConfigMaxFrameRate; kMediaStreamTrackUseConfigMaxFrameRate;
BLINK_COMMON_EXPORT extern const base::Feature kCloneSessionStorageForNoOpener;
} // namespace features } // namespace features
} // namespace blink } // namespace blink
......
third_party/blink/renderer/core/page/create_window.cc
View file @ 575e18a4
...@@ -297,11 +297,11 @@ Frame* CreateNewWindow(LocalFrame& opener_frame, ...@@ -297,11 +297,11 @@ Frame* CreateNewWindow(LocalFrame& opener_frame,
AllocateSessionStorageNamespaceId(); AllocateSessionStorageNamespaceId();
Page* old_page = opener_frame.GetPage(); Page* old_page = opener_frame.GetPage();
// TODO(dmurph): Don't copy session storage when features.noopener is true: if (!features.noopener ||
// https://html.spec.whatwg.org/C/#copy-session-storage base::FeatureList::IsEnabled(features::kCloneSessionStorageForNoOpener)) {
// https://crbug.com/771959
CoreInitializer::GetInstance().CloneSessionStorage(old_page, CoreInitializer::GetInstance().CloneSessionStorage(old_page,
new_namespace_id); new_namespace_id);
}
bool consumed_user_gesture = false; bool consumed_user_gesture = false;
Page* page = old_page->GetChromeClient().CreateWindow( Page* page = old_page->GetChromeClient().CreateWindow(
......
third_party/blink/web_tests/external/wpt/webstorage/storage_session_window_noopener-expected.txt deleted 100644 → 0
View file @ 17aeea03
This is a testharness.js-based test.
FAIL A new noopener window to make sure there is a not copy of the previous window's sessionStorage assert_equals: storage.getItem('FOO') expected (object) null but got (string) "BAR"
Harness: the test ran to completion.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment