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

Side by Side Diff: chrome/browser/content_settings/permission_context_base.cc

Issue 1146403004: MidiPermissionContext::GetPermission() returns BLOCK for insecure origins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/content_settings/permission_context_base.h" 5 #include "chrome/browser/content_settings/permission_context_base.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/content_settings/permission_bubble_request_impl.h" 9 #include "chrome/browser/content_settings/permission_bubble_request_impl.h"
10 #include "chrome/browser/content_settings/permission_context_uma_util.h" 10 #include "chrome/browser/content_settings/permission_context_uma_util.h"
11 #include "chrome/browser/content_settings/permission_queue_controller.h" 11 #include "chrome/browser/content_settings/permission_queue_controller.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" 13 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "components/content_settings/core/browser/content_settings_utils.h" 15 #include "components/content_settings/core/browser/content_settings_utils.h"
16 #include "components/content_settings/core/browser/host_content_settings_map.h" 16 #include "components/content_settings/core/browser/host_content_settings_map.h"
17 #include "components/content_settings/core/common/permission_request_id.h" 17 #include "components/content_settings/core/common/permission_request_id.h"
18 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
20 #include "content/public/common/origin_util.h"
21 20
22 PermissionContextBase::PermissionContextBase( 21 PermissionContextBase::PermissionContextBase(
23 Profile* profile, 22 Profile* profile,
24 const ContentSettingsType permission_type) 23 const ContentSettingsType permission_type)
25 : profile_(profile), 24 : profile_(profile),
26 permission_type_(permission_type), 25 permission_type_(permission_type),
27 weak_factory_(this) { 26 weak_factory_(this) {
28 permission_queue_controller_.reset( 27 permission_queue_controller_.reset(
29 new PermissionQueueController(profile_, permission_type_)); 28 new PermissionQueueController(profile_, permission_type_));
30 } 29 }
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 << "Attempt to use " << content_settings::GetTypeName(permission_type_) 97 << "Attempt to use " << content_settings::GetTypeName(permission_type_)
99 << " from an invalid URL: " << requesting_origin 98 << " from an invalid URL: " << requesting_origin
100 << "," << embedding_origin 99 << "," << embedding_origin
101 << " (" << content_settings::GetTypeName(permission_type_) 100 << " (" << content_settings::GetTypeName(permission_type_)
102 << " is not supported in popups)"; 101 << " is not supported in popups)";
103 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, 102 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
104 false /* persist */, CONTENT_SETTING_BLOCK); 103 false /* persist */, CONTENT_SETTING_BLOCK);
105 return; 104 return;
106 } 105 }
107 106
108 // The Web MIDI SYSEX API is only available to secure origins.
109 if (permission_type_ == CONTENT_SETTINGS_TYPE_MIDI_SYSEX &&
110 !content::IsOriginSecure(requesting_origin)) {
111 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
112 false /* persist */, CONTENT_SETTING_BLOCK);
113 return;
114 }
115
116 ContentSetting content_setting = 107 ContentSetting content_setting =
117 profile_->GetHostContentSettingsMap() 108 profile_->GetHostContentSettingsMap()
118 ->GetContentSettingAndMaybeUpdateLastUsage( 109 ->GetContentSettingAndMaybeUpdateLastUsage(
119 requesting_origin, embedding_origin, permission_type_, 110 requesting_origin, embedding_origin, permission_type_,
120 std::string()); 111 std::string());
121 112
122 if (content_setting == CONTENT_SETTING_ALLOW || 113 if (content_setting == CONTENT_SETTING_ALLOW ||
123 content_setting == CONTENT_SETTING_BLOCK) { 114 content_setting == CONTENT_SETTING_BLOCK) {
124 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, 115 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
125 false /* persist */, content_setting); 116 false /* persist */, content_setting);
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin()); 234 DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin());
244 DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin()); 235 DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin());
245 DCHECK(content_setting == CONTENT_SETTING_ALLOW || 236 DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
246 content_setting == CONTENT_SETTING_BLOCK); 237 content_setting == CONTENT_SETTING_BLOCK);
247 238
248 profile_->GetHostContentSettingsMap()->SetContentSetting( 239 profile_->GetHostContentSettingsMap()->SetContentSetting(
249 ContentSettingsPattern::FromURLNoWildcard(requesting_origin), 240 ContentSettingsPattern::FromURLNoWildcard(requesting_origin),
250 ContentSettingsPattern::FromURLNoWildcard(embedding_origin), 241 ContentSettingsPattern::FromURLNoWildcard(embedding_origin),
251 permission_type_, std::string(), content_setting); 242 permission_type_, std::string(), content_setting);
252 } 243 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698