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

Side by Side Diff: chrome/browser/ui/webui/settings/site_settings_handler.cc

Issue 2936003003: MD Settings: Set all content setting values in Site Details Javascript. (Closed)
Patch Set: Fix last reference to |site| in site_details.html. Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" 5 #include "chrome/browser/ui/webui/settings/site_settings_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/i18n/number_formatting.h" 13 #include "base/i18n/number_formatting.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" 16 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
17 #include "chrome/browser/chrome_notification_types.h" 17 #include "chrome/browser/chrome_notification_types.h"
18 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 18 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
19 #include "chrome/browser/content_settings/web_site_settings_uma_util.h" 19 #include "chrome/browser/content_settings/web_site_settings_uma_util.h"
20 #include "chrome/browser/permissions/chooser_context_base.h" 20 #include "chrome/browser/permissions/chooser_context_base.h"
21 #include "chrome/browser/permissions/permission_manager.h"
22 #include "chrome/browser/permissions/permission_result.h"
21 #include "chrome/browser/permissions/permission_uma_util.h" 23 #include "chrome/browser/permissions/permission_uma_util.h"
22 #include "chrome/browser/permissions/permission_util.h" 24 #include "chrome/browser/permissions/permission_util.h"
23 #include "chrome/browser/profiles/profile.h" 25 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/ui/webui/site_settings_helper.h" 26 #include "chrome/browser/ui/webui/site_settings_helper.h"
25 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 27 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
26 #include "chrome/grit/generated_resources.h" 28 #include "chrome/grit/generated_resources.h"
29 #include "components/content_settings/core/browser/content_settings_utils.h"
27 #include "components/content_settings/core/browser/host_content_settings_map.h" 30 #include "components/content_settings/core/browser/host_content_settings_map.h"
28 #include "components/content_settings/core/common/content_settings_types.h" 31 #include "components/content_settings/core/common/content_settings_types.h"
29 #include "components/crx_file/id_util.h" 32 #include "components/crx_file/id_util.h"
30 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
31 #include "content/public/browser/notification_service.h" 34 #include "content/public/browser/notification_service.h"
32 #include "content/public/browser/web_ui.h" 35 #include "content/public/browser/web_ui.h"
33 #include "content/public/common/page_zoom.h" 36 #include "content/public/common/page_zoom.h"
34 #include "content/public/common/url_constants.h" 37 #include "content/public/common/url_constants.h"
35 #include "extensions/browser/extension_registry.h" 38 #include "extensions/browser/extension_registry.h"
36 #include "extensions/common/permissions/api_permission.h" 39 #include "extensions/common/permissions/api_permission.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 GURL launch_url = 95 GURL launch_url =
93 extensions::AppLaunchInfo::GetLaunchWebURL(extension->get()); 96 extensions::AppLaunchInfo::GetLaunchWebURL(extension->get());
94 // Skip adding the launch URL if it is part of the web extent. 97 // Skip adding the launch URL if it is part of the web extent.
95 if (web_extent.MatchesURL(launch_url)) 98 if (web_extent.MatchesURL(launch_url))
96 continue; 99 continue;
97 site_settings::AddExceptionForHostedApp( 100 site_settings::AddExceptionForHostedApp(
98 launch_url.spec(), *extension->get(), exceptions); 101 launch_url.spec(), *extension->get(), exceptions);
99 } 102 }
100 } 103 }
101 104
105 // Retrieves the corresponding string, according to the following precedence
106 // order from highest to lowest priority:
107 // 1. Enterprise policy.
108 // 2. Extensions.
109 // 3. User-set per-origin setting.
110 // 4. Embargo.
111 // 5. User-set patterns.
112 // 6. User-set global default for a ContentSettingsType.
113 // 7. Chrome's built-in default.
114 std::string ConvertContentSettingSourceToString(
115 content_settings::SettingSource content_settings_source,
116 PermissionStatusSource permission_status_source) {
117 switch (content_settings_source) {
118 case content_settings::SETTING_SOURCE_POLICY:
119 return site_settings::kPolicyProviderId;
120 case content_settings::SETTING_SOURCE_EXTENSION:
121 return site_settings::kExtensionProviderId;
122
123 case content_settings::SETTING_SOURCE_NONE:
124 case content_settings::SETTING_SOURCE_USER:
125 // The above two sources fall into #3, #5 and #6.
126 case content_settings::SETTING_SOURCE_WHITELIST:
127 case content_settings::SETTING_SOURCE_SUPERVISED:
128 // These are not possible.
raymes 2017/06/20 23:42:36 Hmm, I think these may actually be possible. WHITE
Patti Lor 2017/06/21 06:36:37 Ah, OK, thanks for clarifying. I did some investig
raymes 2017/06/22 00:07:03 I think it's possible for geolocation/camera based
Patti Lor 2017/06/22 05:31:59 Oh ok, interesting. Thanks for the FYI.
129 break;
130 }
131
132 switch (permission_status_source) {
133 case PermissionStatusSource::UNSPECIFIED:
134 break;
135 case PermissionStatusSource::SAFE_BROWSING_BLACKLIST:
136 case PermissionStatusSource::KILL_SWITCH:
137 case PermissionStatusSource::MULTIPLE_DISMISSALS:
138 case PermissionStatusSource::MULTIPLE_IGNORES:
139 // The above four sources fall into #4.
140 // TODO(patricialor): Plumb this through to the Web UI.
141 return site_settings::kPreferencesSource;
142 }
raymes 2017/06/20 23:42:36 You've done a good job of this logic considering t
Patti Lor 2017/06/21 06:36:37 Ah, thanks for pointing that out. Fixed. I added a
143
144 return site_settings::kPreferencesSource;
145 }
146
147 ContentSetting GetContentSettingForOrigin(const GURL& origin,
148 ContentSettingsType content_type,
149 Profile* profile,
150 std::string* source_string) {
151 // TODO(patricialor): In future, PermissionManager should know about all
152 // content settings, not just the permissions, plus all the possible sources,
153 // and the calls to HostContentSettingsMap should be removed.
154 content_settings::SettingInfo info;
155 HostContentSettingsMap* map =
156 HostContentSettingsMapFactory::GetForProfile(profile);
157 std::unique_ptr<base::Value> value = map->GetWebsiteSetting(
158 origin, origin, content_type, std::string(), &info);
159
160 // Retrieve the content setting.
161 PermissionResult result(CONTENT_SETTING_DEFAULT,
162 PermissionStatusSource::UNSPECIFIED);
163 if (PermissionUtil::IsPermission(content_type)) {
164 result = PermissionManager::Get(profile)->GetPermissionStatus(
165 content_type, origin, origin);
166 } else {
167 DCHECK(value.get());
168 DCHECK_EQ(base::Value::Type::INTEGER, value->GetType());
169 result.content_setting =
170 content_settings::ValueToContentSetting(value.get());
171 }
172
173 // Retrieve the source of the content setting.
174 *source_string =
175 ConvertContentSettingSourceToString(info.source, result.source);
176 return result.content_setting;
177 }
178
102 } // namespace 179 } // namespace
103 180
104 181
105 SiteSettingsHandler::SiteSettingsHandler(Profile* profile) 182 SiteSettingsHandler::SiteSettingsHandler(Profile* profile)
106 : profile_(profile), observer_(this) { 183 : profile_(profile), observer_(this) {
107 } 184 }
108 185
109 SiteSettingsHandler::~SiteSettingsHandler() { 186 SiteSettingsHandler::~SiteSettingsHandler() {
110 } 187 }
111 188
(...skipping 24 matching lines...) Expand all
136 base::Unretained(this))); 213 base::Unretained(this)));
137 web_ui()->RegisterMessageCallback( 214 web_ui()->RegisterMessageCallback(
138 "getExceptionList", 215 "getExceptionList",
139 base::Bind(&SiteSettingsHandler::HandleGetExceptionList, 216 base::Bind(&SiteSettingsHandler::HandleGetExceptionList,
140 base::Unretained(this))); 217 base::Unretained(this)));
141 web_ui()->RegisterMessageCallback( 218 web_ui()->RegisterMessageCallback(
142 "resetCategoryPermissionForOrigin", 219 "resetCategoryPermissionForOrigin",
143 base::Bind(&SiteSettingsHandler::HandleResetCategoryPermissionForOrigin, 220 base::Bind(&SiteSettingsHandler::HandleResetCategoryPermissionForOrigin,
144 base::Unretained(this))); 221 base::Unretained(this)));
145 web_ui()->RegisterMessageCallback( 222 web_ui()->RegisterMessageCallback(
223 "getCategoryPermissionForOrigin",
224 base::Bind(&SiteSettingsHandler::HandleGetCategoryPermissionForOrigin,
225 base::Unretained(this)));
226 web_ui()->RegisterMessageCallback(
146 "setCategoryPermissionForOrigin", 227 "setCategoryPermissionForOrigin",
147 base::Bind(&SiteSettingsHandler::HandleSetCategoryPermissionForOrigin, 228 base::Bind(&SiteSettingsHandler::HandleSetCategoryPermissionForOrigin,
148 base::Unretained(this))); 229 base::Unretained(this)));
149 web_ui()->RegisterMessageCallback( 230 web_ui()->RegisterMessageCallback(
150 "getSiteDetails",
151 base::Bind(&SiteSettingsHandler::HandleGetSiteDetails,
152 base::Unretained(this)));
153 web_ui()->RegisterMessageCallback(
154 "isPatternValid", 231 "isPatternValid",
155 base::Bind(&SiteSettingsHandler::HandleIsPatternValid, 232 base::Bind(&SiteSettingsHandler::HandleIsPatternValid,
156 base::Unretained(this))); 233 base::Unretained(this)));
157 web_ui()->RegisterMessageCallback( 234 web_ui()->RegisterMessageCallback(
158 "updateIncognitoStatus", 235 "updateIncognitoStatus",
159 base::Bind(&SiteSettingsHandler::HandleUpdateIncognitoStatus, 236 base::Bind(&SiteSettingsHandler::HandleUpdateIncognitoStatus,
160 base::Unretained(this))); 237 base::Unretained(this)));
161 web_ui()->RegisterMessageCallback( 238 web_ui()->RegisterMessageCallback(
162 "fetchZoomLevels", 239 "fetchZoomLevels",
163 base::Bind(&SiteSettingsHandler::HandleFetchZoomLevels, 240 base::Bind(&SiteSettingsHandler::HandleFetchZoomLevels,
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 profile, primary_pattern, secondary_pattern, content_type, 571 profile, primary_pattern, secondary_pattern, content_type,
495 PermissionSourceUI::SITE_SETTINGS); 572 PermissionSourceUI::SITE_SETTINGS);
496 573
497 map->SetContentSettingCustomScope(primary_pattern, secondary_pattern, 574 map->SetContentSettingCustomScope(primary_pattern, secondary_pattern,
498 content_type, "", CONTENT_SETTING_DEFAULT); 575 content_type, "", CONTENT_SETTING_DEFAULT);
499 576
500 WebSiteSettingsUmaUtil::LogPermissionChange( 577 WebSiteSettingsUmaUtil::LogPermissionChange(
501 content_type, ContentSetting::CONTENT_SETTING_DEFAULT); 578 content_type, ContentSetting::CONTENT_SETTING_DEFAULT);
502 } 579 }
503 580
581 void SiteSettingsHandler::HandleGetCategoryPermissionForOrigin(
582 const base::ListValue* args) {
583 AllowJavascript();
584
585 CHECK_EQ(3U, args->GetSize());
586 const base::Value* callback_id;
587 CHECK(args->Get(0, &callback_id));
588 std::string type;
589 CHECK(args->GetString(1, &type));
590 std::string origin;
591 CHECK(args->GetString(2, &origin));
592
593 const GURL origin_url(origin);
594 ContentSettingsType content_type = static_cast<ContentSettingsType>(
595 static_cast<int>(site_settings::ContentSettingsTypeFromGroupName(type)));
596 std::string source_string = "";
597 ContentSetting content_setting = GetContentSettingForOrigin(
598 origin_url, content_type, profile_, &source_string);
599 std::string content_setting_string =
600 content_settings::ContentSettingToString(content_setting);
601
602 auto raw_site_exception = base::MakeUnique<base::DictionaryValue>();
603 raw_site_exception->SetString(site_settings::kEmbeddingOrigin, "");
raymes 2017/06/20 23:42:36 nit: I'm not sure if it matters, but we could just
Patti Lor 2017/06/21 06:36:37 Done.
604 raw_site_exception->SetBoolean(site_settings::kIncognito,
605 profile_->IsOffTheRecord());
606 raw_site_exception->SetString(site_settings::kOrigin, origin);
607 raw_site_exception->SetString(site_settings::kDisplayName, origin);
608 raw_site_exception->SetString(site_settings::kSetting,
609 content_setting_string);
610 raw_site_exception->SetString(site_settings::kSource, source_string);
611 // The remaining "embeddingDisplayName" field is handled later in Javascript.
612
613 ResolveJavascriptCallback(*callback_id, *raw_site_exception);
614 }
615
504 void SiteSettingsHandler::HandleSetCategoryPermissionForOrigin( 616 void SiteSettingsHandler::HandleSetCategoryPermissionForOrigin(
505 const base::ListValue* args) { 617 const base::ListValue* args) {
506 CHECK_EQ(5U, args->GetSize()); 618 CHECK_EQ(5U, args->GetSize());
507 std::string primary_pattern_string; 619 std::string primary_pattern_string;
508 CHECK(args->GetString(0, &primary_pattern_string)); 620 CHECK(args->GetString(0, &primary_pattern_string));
509 // TODO(dschuyler): Review whether |secondary_pattern_string| should be used. 621 // TODO(dschuyler): Review whether |secondary_pattern_string| should be used.
510 std::string secondary_pattern_string; 622 std::string secondary_pattern_string;
511 CHECK(args->GetString(1, &secondary_pattern_string)); 623 CHECK(args->GetString(1, &secondary_pattern_string));
512 std::string type; 624 std::string type;
513 CHECK(args->GetString(2, &type)); 625 CHECK(args->GetString(2, &type));
(...skipping 30 matching lines...) Expand all
544 PermissionUtil::ScopedRevocationReporter scoped_revocation_reporter( 656 PermissionUtil::ScopedRevocationReporter scoped_revocation_reporter(
545 profile, primary_pattern, secondary_pattern, content_type, 657 profile, primary_pattern, secondary_pattern, content_type,
546 PermissionSourceUI::SITE_SETTINGS); 658 PermissionSourceUI::SITE_SETTINGS);
547 659
548 map->SetContentSettingCustomScope(primary_pattern, secondary_pattern, 660 map->SetContentSettingCustomScope(primary_pattern, secondary_pattern,
549 content_type, "", setting); 661 content_type, "", setting);
550 662
551 WebSiteSettingsUmaUtil::LogPermissionChange(content_type, setting); 663 WebSiteSettingsUmaUtil::LogPermissionChange(content_type, setting);
552 } 664 }
553 665
554 void SiteSettingsHandler::HandleGetSiteDetails(
555 const base::ListValue* args) {
556 AllowJavascript();
557
558 CHECK_EQ(2U, args->GetSize());
559 const base::Value* callback_id;
560 CHECK(args->Get(0, &callback_id));
561 std::string site;
562 CHECK(args->GetString(1, &site));
563
564 // A subset of the ContentSettingsType enum that we show in the settings UI.
565 const ContentSettingsType kSettingsDetailTypes[] = {
566 CONTENT_SETTINGS_TYPE_COOKIES,
567 CONTENT_SETTINGS_TYPE_IMAGES,
568 CONTENT_SETTINGS_TYPE_JAVASCRIPT,
569 CONTENT_SETTINGS_TYPE_PLUGINS,
570 CONTENT_SETTINGS_TYPE_POPUPS,
571 CONTENT_SETTINGS_TYPE_GEOLOCATION,
572 CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
573 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
574 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
575 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS,
576 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
577 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,
578 CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA,
579 CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT,
580 };
581
582 // Create a list to be consistent with existing API, we are expecting a single
583 // element (or none).
584 std::unique_ptr<base::ListValue> exceptions(new base::ListValue);
585 for (size_t type = 0; type < arraysize(kSettingsDetailTypes); ++type) {
586 ContentSettingsType content_type = kSettingsDetailTypes[type];
587
588 HostContentSettingsMap* map =
589 HostContentSettingsMapFactory::GetForProfile(profile_);
590 const auto* extension_registry =
591 extensions::ExtensionRegistry::Get(profile_);
592 site_settings::GetExceptionsFromHostContentSettingsMap(
593 map, content_type, extension_registry, web_ui(), /*incognito=*/false,
594 /*filter=*/&site, exceptions.get());
595
596 if (profile_->HasOffTheRecordProfile()) {
597 Profile* incognito = profile_->GetOffTheRecordProfile();
598 map = HostContentSettingsMapFactory::GetForProfile(incognito);
599 extension_registry = extensions::ExtensionRegistry::Get(incognito);
600 site_settings::GetExceptionsFromHostContentSettingsMap(
601 map, content_type, extension_registry, web_ui(), /*incognito=*/true,
602 /*filter=*/&site, exceptions.get());
603 }
604 }
605
606 if (!exceptions->GetSize()) {
607 RejectJavascriptCallback(*callback_id, base::Value());
608 return;
609 }
610
611 // We only need a single response element.
612 const base::DictionaryValue* exception = nullptr;
613 exceptions->GetDictionary(0, &exception);
614 ResolveJavascriptCallback(*callback_id, *exception);
615 }
616
617 void SiteSettingsHandler::HandleIsPatternValid( 666 void SiteSettingsHandler::HandleIsPatternValid(
618 const base::ListValue* args) { 667 const base::ListValue* args) {
619 CHECK_EQ(2U, args->GetSize()); 668 CHECK_EQ(2U, args->GetSize());
620 const base::Value* callback_id; 669 const base::Value* callback_id;
621 CHECK(args->Get(0, &callback_id)); 670 CHECK(args->Get(0, &callback_id));
622 std::string pattern_string; 671 std::string pattern_string;
623 CHECK(args->GetString(1, &pattern_string)); 672 CHECK(args->GetString(1, &pattern_string));
624 673
625 ContentSettingsPattern pattern = 674 ContentSettingsPattern pattern =
626 ContentSettingsPattern::FromString(pattern_string); 675 ContentSettingsPattern::FromString(pattern_string);
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
749 origin = content::kUnreachableWebDataURL; 798 origin = content::kUnreachableWebDataURL;
750 } 799 }
751 800
752 content::HostZoomMap* host_zoom_map; 801 content::HostZoomMap* host_zoom_map;
753 host_zoom_map = content::HostZoomMap::GetDefaultForBrowserContext(profile_); 802 host_zoom_map = content::HostZoomMap::GetDefaultForBrowserContext(profile_);
754 double default_level = host_zoom_map->GetDefaultZoomLevel(); 803 double default_level = host_zoom_map->GetDefaultZoomLevel();
755 host_zoom_map->SetZoomLevelForHost(origin, default_level); 804 host_zoom_map->SetZoomLevelForHost(origin, default_level);
756 } 805 }
757 806
758 } // namespace settings 807 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698