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

Side by Side Diff: chrome/browser/media/media_capture_devices_dispatcher.cc

Issue 483523006: Check all settings when checking mic and camera access (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/media/media_capture_devices_dispatcher.h" 5 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
6 6
7 #include "apps/app_window.h" 7 #include "apps/app_window.h"
8 #include "apps/app_window_registry.h" 8 #include "apps/app_window_registry.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/metrics/field_trial.h" 11 #include "base/metrics/field_trial.h"
12 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "base/prefs/scoped_user_pref_update.h" 13 #include "base/prefs/scoped_user_pref_update.h"
14 #include "base/sha1.h" 14 #include "base/sha1.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "chrome/browser/content_settings/content_settings_provider.h"
19 #include "chrome/browser/content_settings/host_content_settings_map.h"
20 #include "chrome/browser/extensions/extension_service.h"
18 #include "chrome/browser/media/desktop_streams_registry.h" 21 #include "chrome/browser/media/desktop_streams_registry.h"
19 #include "chrome/browser/media/media_stream_capture_indicator.h" 22 #include "chrome/browser/media/media_stream_capture_indicator.h"
23 #include "chrome/browser/media/media_stream_devices_util.h"
20 #include "chrome/browser/media/media_stream_infobar_delegate.h" 24 #include "chrome/browser/media/media_stream_infobar_delegate.h"
21 #include "chrome/browser/profiles/profile.h" 25 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/ui/browser.h" 26 #include "chrome/browser/ui/browser.h"
23 #include "chrome/browser/ui/browser_finder.h" 27 #include "chrome/browser/ui/browser_finder.h"
24 #include "chrome/browser/ui/browser_window.h" 28 #include "chrome/browser/ui/browser_window.h"
25 #include "chrome/browser/ui/screen_capture_notification_ui.h" 29 #include "chrome/browser/ui/screen_capture_notification_ui.h"
26 #include "chrome/browser/ui/simple_message_box.h" 30 #include "chrome/browser/ui/simple_message_box.h"
27 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" 31 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
28 #include "chrome/common/chrome_switches.h" 32 #include "chrome/common/chrome_switches.h"
29 #include "chrome/common/chrome_version_info.h" 33 #include "chrome/common/chrome_version_info.h"
30 #include "chrome/common/pref_names.h" 34 #include "chrome/common/pref_names.h"
31 #include "chrome/grit/generated_resources.h" 35 #include "chrome/grit/generated_resources.h"
32 #include "components/pref_registry/pref_registry_syncable.h" 36 #include "components/pref_registry/pref_registry_syncable.h"
33 #include "content/public/browser/browser_thread.h" 37 #include "content/public/browser/browser_thread.h"
34 #include "content/public/browser/desktop_media_id.h" 38 #include "content/public/browser/desktop_media_id.h"
35 #include "content/public/browser/media_capture_devices.h" 39 #include "content/public/browser/media_capture_devices.h"
36 #include "content/public/browser/notification_service.h" 40 #include "content/public/browser/notification_service.h"
37 #include "content/public/browser/notification_source.h" 41 #include "content/public/browser/notification_source.h"
38 #include "content/public/browser/notification_types.h" 42 #include "content/public/browser/notification_types.h"
39 #include "content/public/browser/render_frame_host.h" 43 #include "content/public/browser/render_frame_host.h"
40 #include "content/public/browser/render_process_host.h" 44 #include "content/public/browser/render_process_host.h"
41 #include "content/public/browser/web_contents.h" 45 #include "content/public/browser/web_contents.h"
42 #include "content/public/common/media_stream_request.h" 46 #include "content/public/common/media_stream_request.h"
47 #include "extensions/browser/extension_system.h"
43 #include "extensions/common/constants.h" 48 #include "extensions/common/constants.h"
44 #include "extensions/common/extension.h" 49 #include "extensions/common/extension.h"
45 #include "extensions/common/permissions/permissions_data.h" 50 #include "extensions/common/permissions/permissions_data.h"
46 #include "media/audio/audio_manager_base.h" 51 #include "media/audio/audio_manager_base.h"
47 #include "media/base/media_switches.h" 52 #include "media/base/media_switches.h"
48 #include "net/base/net_util.h" 53 #include "net/base/net_util.h"
49 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_types.h" 54 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_types.h"
50 #include "ui/base/l10n/l10n_util.h" 55 #include "ui/base/l10n/l10n_util.h"
51 56
52 #if defined(OS_CHROMEOS) 57 #if defined(OS_CHROMEOS)
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 window_list.begin(); 248 window_list.begin();
244 iter != window_list.end(); ++iter) { 249 iter != window_list.end(); ++iter) {
245 if ((*iter)->web_contents() == web_contents) 250 if ((*iter)->web_contents() == web_contents)
246 return (*iter)->GetNativeWindow(); 251 return (*iter)->GetNativeWindow();
247 } 252 }
248 253
249 return NULL; 254 return NULL;
250 } 255 }
251 #endif 256 #endif
252 257
258 const extensions::Extension* GetExtensionForOrigin(
259 Profile* profile,
260 const GURL& security_origin) {
261 if (!security_origin.SchemeIs(extensions::kExtensionScheme))
perkj_chrome 2014/08/28 15:09:40 Should this be CHECK( ?
Henrik Grunell 2014/08/29 07:59:09 No, it may or may not be an extension. If not, it'
262 return NULL;
263
264 ExtensionService* extensions_service =
265 extensions::ExtensionSystem::Get(profile)->extension_service();
266 const extensions::Extension* extension =
267 extensions_service->extensions()->GetByID(security_origin.host());
268 DCHECK(extension);
269 return extension;
270 }
271
253 } // namespace 272 } // namespace
254 273
255 MediaCaptureDevicesDispatcher::PendingAccessRequest::PendingAccessRequest( 274 MediaCaptureDevicesDispatcher::PendingAccessRequest::PendingAccessRequest(
256 const content::MediaStreamRequest& request, 275 const content::MediaStreamRequest& request,
257 const content::MediaResponseCallback& callback) 276 const content::MediaResponseCallback& callback)
258 : request(request), 277 : request(request),
259 callback(callback) { 278 callback(callback) {
260 } 279 }
261 280
262 MediaCaptureDevicesDispatcher::PendingAccessRequest::~PendingAccessRequest() {} 281 MediaCaptureDevicesDispatcher::PendingAccessRequest::~PendingAccessRequest() {}
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 } else if (extension && (extension->is_platform_app() || 383 } else if (extension && (extension->is_platform_app() ||
365 IsMediaRequestWhitelistedForExtension(extension))) { 384 IsMediaRequestWhitelistedForExtension(extension))) {
366 // For extensions access is approved based on extension permissions. 385 // For extensions access is approved based on extension permissions.
367 ProcessMediaAccessRequestFromPlatformAppOrExtension( 386 ProcessMediaAccessRequestFromPlatformAppOrExtension(
368 web_contents, request, callback, extension); 387 web_contents, request, callback, extension);
369 } else { 388 } else {
370 ProcessRegularMediaAccessRequest(web_contents, request, callback); 389 ProcessRegularMediaAccessRequest(web_contents, request, callback);
371 } 390 }
372 } 391 }
373 392
393 bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission(
394 content::BrowserContext* browser_context,
395 const GURL& security_origin,
396 content::MediaStreamType type) {
397 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
398 DCHECK(type == content::MEDIA_DEVICE_AUDIO_CAPTURE ||
399 type == content::MEDIA_DEVICE_VIDEO_CAPTURE);
400
401 Profile* profile = Profile::FromBrowserContext(browser_context);
402 const extensions::Extension* extension =
403 GetExtensionForOrigin(profile, security_origin);
404
405 if (extension && (extension->is_platform_app() ||
406 IsMediaRequestWhitelistedForExtension(extension))) {
407 return extension->permissions_data()->HasAPIPermission(
408 type == content::MEDIA_DEVICE_AUDIO_CAPTURE
409 ? extensions::APIPermission::kAudioCapture
410 : extensions::APIPermission::kVideoCapture);
411 } else {
perkj_chrome 2014/08/28 15:09:40 no need for else since you return above.
Henrik Grunell 2014/08/29 07:59:09 Done.
412 if (ShouldAlwaysAllowOrigin(profile, security_origin))
413 return true;
414
415 const char* policy_name = type == content::MEDIA_DEVICE_AUDIO_CAPTURE
416 ? prefs::kAudioCaptureAllowed
417 : prefs::kVideoCaptureAllowed;
418 const char* list_policy_name = type == content::MEDIA_DEVICE_AUDIO_CAPTURE
419 ? prefs::kAudioCaptureAllowedUrls
420 : prefs::kVideoCaptureAllowedUrls;
421 if (GetDevicePolicy(
422 profile, security_origin, policy_name, list_policy_name) ==
423 ALWAYS_ALLOW) {
424 return true;
425 }
426
427 if (profile->GetHostContentSettingsMap()->GetContentSetting(
428 security_origin,
perkj_chrome 2014/08/28 15:09:40 same parameter twice? Why ? please comment in code
Henrik Grunell 2014/08/29 07:59:09 Done.
429 security_origin,
430 type == content::MEDIA_DEVICE_AUDIO_CAPTURE
431 ? CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC
432 : CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
433 NO_RESOURCE_IDENTIFIER) == CONTENT_SETTING_ALLOW) {
434 return true;
435 }
436
437 return false;
438 }
439 }
440
374 void MediaCaptureDevicesDispatcher::ProcessDesktopCaptureAccessRequest( 441 void MediaCaptureDevicesDispatcher::ProcessDesktopCaptureAccessRequest(
375 content::WebContents* web_contents, 442 content::WebContents* web_contents,
376 const content::MediaStreamRequest& request, 443 const content::MediaStreamRequest& request,
377 const content::MediaResponseCallback& callback, 444 const content::MediaResponseCallback& callback,
378 const extensions::Extension* extension) { 445 const extensions::Extension* extension) {
379 content::MediaStreamDevices devices; 446 content::MediaStreamDevices devices;
380 scoped_ptr<content::MediaStreamUI> ui; 447 scoped_ptr<content::MediaStreamUI> ui;
381 448
382 if (request.video_type != content::MEDIA_DESKTOP_VIDEO_CAPTURE) { 449 if (request.video_type != content::MEDIA_DESKTOP_VIDEO_CAPTURE) {
383 callback.Run(devices, content::MEDIA_DEVICE_INVALID_STATE, ui.Pass()); 450 callback.Run(devices, content::MEDIA_DEVICE_INVALID_STATE, ui.Pass());
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
1015 1082
1016 void MediaCaptureDevicesDispatcher::SetTestAudioCaptureDevices( 1083 void MediaCaptureDevicesDispatcher::SetTestAudioCaptureDevices(
1017 const MediaStreamDevices& devices) { 1084 const MediaStreamDevices& devices) {
1018 test_audio_devices_ = devices; 1085 test_audio_devices_ = devices;
1019 } 1086 }
1020 1087
1021 void MediaCaptureDevicesDispatcher::SetTestVideoCaptureDevices( 1088 void MediaCaptureDevicesDispatcher::SetTestVideoCaptureDevices(
1022 const MediaStreamDevices& devices) { 1089 const MediaStreamDevices& devices) {
1023 test_video_devices_ = devices; 1090 test_video_devices_ = devices;
1024 } 1091 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698