Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Unified Diff: chrome/browser/storage/durable_storage_permission_context_unittest.cc

Issue 2385653005: [DurableStorage] Don't grant durable if origin cannot write cookies. (Closed)
Patch Set: addressed comments, added test Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/storage/durable_storage_permission_context.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/storage/durable_storage_permission_context_unittest.cc
diff --git a/chrome/browser/storage/durable_storage_permission_context_unittest.cc b/chrome/browser/storage/durable_storage_permission_context_unittest.cc
index 101df28604542250ca15d7bc5bea4529e26920d8..08a169ba3f859d9f32b454efe17af6bff5fe2285 100644
--- a/chrome/browser/storage/durable_storage_permission_context_unittest.cc
+++ b/chrome/browser/storage/durable_storage_permission_context_unittest.cc
@@ -4,11 +4,76 @@
#include "chrome/browser/storage/durable_storage_permission_context.h"
+#include "base/bind.h"
#include "base/macros.h"
+#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
+#include "chrome/browser/content_settings/cookie_settings_factory.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/permissions/permission_request_id.h"
+#include "chrome/browser/permissions/permission_request_manager.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.h"
+#include "chrome/test/base/testing_profile.h"
+#include "components/bookmarks/test/bookmark_test_helpers.h"
+#include "components/content_settings/core/browser/cookie_settings.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "content/public/browser/permission_manager.h"
+#include "content/public/browser/render_process_host.h"
#include "testing/gtest/include/gtest/gtest.h"
using bookmarks::BookmarkModel;
+namespace {
+
+void DoNothing(ContentSetting content_setting) {}
+
+class TestDurablePermissionContext : public DurableStoragePermissionContext {
+ public:
+ explicit TestDurablePermissionContext(Profile* profile)
+ : DurableStoragePermissionContext(profile),
+ permission_set_count_(0),
+ last_permission_set_persisted_(false),
+ last_permission_set_setting_(CONTENT_SETTING_DEFAULT) {}
+
+ int permission_set_count() const { return permission_set_count_; }
+ bool last_permission_set_persisted() const {
+ return last_permission_set_persisted_;
+ }
+ ContentSetting last_permission_set_setting() const {
+ return last_permission_set_setting_;
+ }
+
+ ContentSetting GetContentSettingFromMap(const GURL& url_a,
+ const GURL& url_b) {
+ return HostContentSettingsMapFactory::GetForProfile(profile())
+ ->GetContentSetting(url_a.GetOrigin(), url_b.GetOrigin(),
+ CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,
+ std::string());
+ }
+
+ private:
+ // NotificationPermissionContext:
+ void NotifyPermissionSet(const PermissionRequestID& id,
+ const GURL& requesting_origin,
+ const GURL& embedder_origin,
+ const BrowserPermissionCallback& callback,
+ bool persist,
+ ContentSetting content_setting) override {
+ permission_set_count_++;
+ last_permission_set_persisted_ = persist;
+ last_permission_set_setting_ = content_setting;
+ DurableStoragePermissionContext::NotifyPermissionSet(
+ id, requesting_origin, embedder_origin, callback, persist,
+ content_setting);
+ }
+
+ int permission_set_count_;
+ bool last_permission_set_persisted_;
+ ContentSetting last_permission_set_setting_;
+};
+
+} // namespace
+
class BookmarksOriginTest : public ::testing::Test {
protected:
static std::vector<BookmarkModel::URLAndTitle> MakeBookmarks(
@@ -49,3 +114,166 @@ TEST_F(BookmarksOriginTest, DoesntExist) {
EXPECT_FALSE(DurableStoragePermissionContext::IsOriginBookmarked(
bookmarks, looking_for));
}
+
+class DurableStoragePermissionContextTest
+ : public ChromeRenderViewHostTestHarness {
+ protected:
+ void SetUp() override {
+ ChromeRenderViewHostTestHarness::SetUp();
+ HostContentSettingsMapFactory::GetForProfile(profile())
+ ->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_DURABLE_STORAGE);
+ }
+
+ void AddBookmark(const GURL& origin) {
+ if (!model_) {
+ profile()->CreateBookmarkModel(true);
+ model_ = BookmarkModelFactory::GetForBrowserContext(profile());
+ bookmarks::test::WaitForBookmarkModelToLoad(model_);
+ }
+
+ model_->AddURL(model_->bookmark_bar_node(), 0,
+ base::ASCIIToUTF16(origin.spec()), origin);
+ }
+
+ BookmarkModel* model_ = nullptr;
+};
+
+TEST_F(DurableStoragePermissionContextTest, Bookmarked) {
+ TestDurablePermissionContext permission_context(profile());
+ GURL url("https://www.google.com");
+ AddBookmark(url);
+ NavigateAndCommit(url);
+
+ const PermissionRequestID id(web_contents()->GetRenderProcessHost()->GetID(),
+ web_contents()->GetMainFrame()->GetRoutingID(),
+ -1);
+
+ ASSERT_EQ(0, permission_context.permission_set_count());
+ ASSERT_FALSE(permission_context.last_permission_set_persisted());
+ ASSERT_EQ(CONTENT_SETTING_DEFAULT,
+ permission_context.last_permission_set_setting());
+
+ permission_context.DecidePermission(web_contents(), id, url, url,
+ true /* user_gesture */,
+ base::Bind(&DoNothing));
+ // Success.
+ EXPECT_EQ(1, permission_context.permission_set_count());
+ EXPECT_TRUE(permission_context.last_permission_set_persisted());
+ EXPECT_EQ(CONTENT_SETTING_ALLOW,
+ permission_context.last_permission_set_setting());
+}
+
+TEST_F(DurableStoragePermissionContextTest, BookmarkAndIncognitoMode) {
+ TestDurablePermissionContext permission_context(
+ profile()->GetOffTheRecordProfile());
+ GURL url("https://www.google.com");
+ AddBookmark(url);
+ NavigateAndCommit(url);
+
+ const PermissionRequestID id(web_contents()->GetRenderProcessHost()->GetID(),
+ web_contents()->GetMainFrame()->GetRoutingID(),
+ -1);
+
+ ASSERT_EQ(0, permission_context.permission_set_count());
+ ASSERT_FALSE(permission_context.last_permission_set_persisted());
+ ASSERT_EQ(CONTENT_SETTING_DEFAULT,
+ permission_context.last_permission_set_setting());
+
+ permission_context.DecidePermission(web_contents(), id, url, url,
+ true /* user_gesture */,
+ base::Bind(&DoNothing));
+ // Success.
+ EXPECT_EQ(1, permission_context.permission_set_count());
+ EXPECT_TRUE(permission_context.last_permission_set_persisted());
+ EXPECT_EQ(CONTENT_SETTING_ALLOW,
+ permission_context.last_permission_set_setting());
+}
+
+TEST_F(DurableStoragePermissionContextTest, NoBookmark) {
+ TestDurablePermissionContext permission_context(profile());
+ GURL url("https://www.google.com");
+ NavigateAndCommit(url);
+
+ const PermissionRequestID id(web_contents()->GetRenderProcessHost()->GetID(),
+ web_contents()->GetMainFrame()->GetRoutingID(),
+ -1);
+
+ ASSERT_EQ(0, permission_context.permission_set_count());
+ ASSERT_FALSE(permission_context.last_permission_set_persisted());
+ ASSERT_EQ(CONTENT_SETTING_DEFAULT,
+ permission_context.last_permission_set_setting());
+
+ permission_context.DecidePermission(web_contents(), id, url, url,
+ true /* user_gesture */,
+ base::Bind(&DoNothing));
+
+ // We shouldn't be granted.
+ EXPECT_EQ(1, permission_context.permission_set_count());
+ EXPECT_FALSE(permission_context.last_permission_set_persisted());
+ EXPECT_EQ(CONTENT_SETTING_DEFAULT,
+ permission_context.last_permission_set_setting());
+}
+
+TEST_F(DurableStoragePermissionContextTest, CookiesNotAllowed) {
+ TestDurablePermissionContext permission_context(profile());
+ GURL url("https://www.google.com");
+ AddBookmark(url);
+ NavigateAndCommit(url);
+
+ scoped_refptr<content_settings::CookieSettings> cookie_settings =
+ CookieSettingsFactory::GetForProfile(profile());
+
+ cookie_settings->SetCookieSetting(url, CONTENT_SETTING_BLOCK);
+
+ const PermissionRequestID id(web_contents()->GetRenderProcessHost()->GetID(),
+ web_contents()->GetMainFrame()->GetRoutingID(),
+ -1);
+
+ ASSERT_EQ(0, permission_context.permission_set_count());
+ ASSERT_FALSE(permission_context.last_permission_set_persisted());
+ ASSERT_EQ(CONTENT_SETTING_DEFAULT,
+ permission_context.last_permission_set_setting());
+
+ permission_context.DecidePermission(web_contents(), id, url, url,
+ true /* user_gesture */,
+ base::Bind(&DoNothing));
+ // We shouldn't be granted.
+ EXPECT_EQ(1, permission_context.permission_set_count());
+ EXPECT_FALSE(permission_context.last_permission_set_persisted());
+ EXPECT_EQ(CONTENT_SETTING_DEFAULT,
+ permission_context.last_permission_set_setting());
+}
+
+TEST_F(DurableStoragePermissionContextTest, EmbeddedFrame) {
+ TestDurablePermissionContext permission_context(profile());
+ GURL url("https://www.google.com");
+ GURL requesting_url("https://www.youtube.com");
+ AddBookmark(url);
+ NavigateAndCommit(url);
+
+ const PermissionRequestID id(web_contents()->GetRenderProcessHost()->GetID(),
+ web_contents()->GetMainFrame()->GetRoutingID(),
+ -1);
+
+ ASSERT_EQ(0, permission_context.permission_set_count());
+ ASSERT_FALSE(permission_context.last_permission_set_persisted());
+ ASSERT_EQ(CONTENT_SETTING_DEFAULT,
+ permission_context.last_permission_set_setting());
+
+ permission_context.DecidePermission(web_contents(), id, requesting_url, url,
+ true /* user_gesture */,
+ base::Bind(&DoNothing));
+ // We shouldn't be granted.
+ EXPECT_EQ(1, permission_context.permission_set_count());
+ EXPECT_FALSE(permission_context.last_permission_set_persisted());
+ EXPECT_EQ(CONTENT_SETTING_DEFAULT,
+ permission_context.last_permission_set_setting());
+}
+
+TEST_F(DurableStoragePermissionContextTest, NonsecureOrigin) {
+ TestDurablePermissionContext permission_context(profile());
+ GURL url("http://www.google.com");
+
+ EXPECT_EQ(CONTENT_SETTING_BLOCK,
+ permission_context.GetPermissionStatus(url, url));
+}
« no previous file with comments | « chrome/browser/storage/durable_storage_permission_context.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698