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

Side by Side Diff: chrome/browser/chromeos/login/ui/webui_login_view.cc

Issue 2696703006: Move media permission checking logic for ChromeOS login pages (Closed)
Patch Set: Move media permission checking logic for ChromeOS login pages Created 3 years, 10 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/chromeos/login/ui/webui_login_view.h" 5 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
6 6
7 #include "ash/common/focus_cycler.h" 7 #include "ash/common/focus_cycler.h"
8 #include "ash/common/system/status_area_widget_delegate.h" 8 #include "ash/common/system/status_area_widget_delegate.h"
9 #include "ash/common/system/tray/system_tray.h" 9 #include "ash/common/system/tray/system_tray.h"
10 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 21 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
22 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 22 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
23 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 23 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
24 #include "chrome/browser/chromeos/login/ui/preloaded_web_view.h" 24 #include "chrome/browser/chromeos/login/ui/preloaded_web_view.h"
25 #include "chrome/browser/chromeos/login/ui/preloaded_web_view_factory.h" 25 #include "chrome/browser/chromeos/login/ui/preloaded_web_view_factory.h"
26 #include "chrome/browser/chromeos/login/ui/proxy_settings_dialog.h" 26 #include "chrome/browser/chromeos/login/ui/proxy_settings_dialog.h"
27 #include "chrome/browser/chromeos/login/ui/web_contents_forced_title.h" 27 #include "chrome/browser/chromeos/login/ui/web_contents_forced_title.h"
28 #include "chrome/browser/chromeos/login/ui/web_contents_set_background_color.h" 28 #include "chrome/browser/chromeos/login/ui/web_contents_set_background_color.h"
29 #include "chrome/browser/chromeos/login/ui/webui_login_display.h" 29 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
30 #include "chrome/browser/chromeos/profiles/profile_helper.h" 30 #include "chrome/browser/chromeos/profiles/profile_helper.h"
31 #include "chrome/browser/chromeos/settings/cros_settings.h"
32 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 31 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
33 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" 32 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
34 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h" 33 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h"
35 #include "chrome/browser/password_manager/chrome_password_manager_client.h" 34 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
36 #include "chrome/browser/renderer_preferences_util.h" 35 #include "chrome/browser/renderer_preferences_util.h"
37 #include "chrome/browser/sessions/session_tab_helper.h" 36 #include "chrome/browser/sessions/session_tab_helper.h"
38 #include "chrome/browser/ui/ash/ash_util.h" 37 #include "chrome/browser/ui/ash/ash_util.h"
39 #include "chrome/browser/ui/ash/system_tray_client.h" 38 #include "chrome/browser/ui/ash/system_tray_client.h"
40 #include "chrome/browser/ui/autofill/chrome_autofill_client.h" 39 #include "chrome/browser/ui/autofill/chrome_autofill_client.h"
41 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 40 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
42 #include "chromeos/dbus/dbus_thread_manager.h" 41 #include "chromeos/dbus/dbus_thread_manager.h"
43 #include "chromeos/dbus/session_manager_client.h" 42 #include "chromeos/dbus/session_manager_client.h"
44 #include "chromeos/network/network_state.h" 43 #include "chromeos/network/network_state.h"
45 #include "chromeos/network/network_state_handler.h" 44 #include "chromeos/network/network_state_handler.h"
46 #include "chromeos/settings/cros_settings_names.h"
47 #include "components/content_settings/core/common/content_settings_pattern.h" 45 #include "components/content_settings/core/common/content_settings_pattern.h"
48 #include "components/password_manager/core/browser/password_manager.h" 46 #include "components/password_manager/core/browser/password_manager.h"
49 #include "components/web_modal/web_contents_modal_dialog_manager.h" 47 #include "components/web_modal/web_contents_modal_dialog_manager.h"
50 #include "content/public/browser/notification_service.h" 48 #include "content/public/browser/notification_service.h"
51 #include "content/public/browser/render_frame_host.h" 49 #include "content/public/browser/render_frame_host.h"
52 #include "content/public/browser/render_view_host.h" 50 #include "content/public/browser/render_view_host.h"
53 #include "content/public/browser/render_widget_host.h" 51 #include "content/public/browser/render_widget_host.h"
54 #include "content/public/browser/render_widget_host_view.h" 52 #include "content/public/browser/render_widget_host_view.h"
55 #include "content/public/browser/web_contents.h" 53 #include "content/public/browser/web_contents.h"
56 #include "content/public/browser/web_ui.h" 54 #include "content/public/browser/web_ui.h"
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 reverse ? ash::FocusCycler::BACKWARD : ash::FocusCycler::FORWARD); 553 reverse ? ash::FocusCycler::BACKWARD : ash::FocusCycler::FORWARD);
556 } 554 }
557 555
558 return true; 556 return true;
559 } 557 }
560 558
561 void WebUILoginView::RequestMediaAccessPermission( 559 void WebUILoginView::RequestMediaAccessPermission(
562 WebContents* web_contents, 560 WebContents* web_contents,
563 const content::MediaStreamRequest& request, 561 const content::MediaStreamRequest& request,
564 const content::MediaResponseCallback& callback) { 562 const content::MediaResponseCallback& callback) {
563 // Note: This is only needed for SAML logins.
565 MediaStreamDevicesController controller(web_contents, request, callback); 564 MediaStreamDevicesController controller(web_contents, request, callback);
566 if (!controller.IsAskingForAudio() && !controller.IsAskingForVideo()) 565 DCHECK(!controller.IsAskingForAudio() && !controller.IsAskingForVideo());
567 return;
568
569 if (controller.IsAskingForAudio()) {
570 controller.PermissionDenied();
571 return;
572 }
573
574 const CrosSettings* const settings = CrosSettings::Get();
575 if (!settings) {
576 controller.PermissionDenied();
577 return;
578 }
579
580 const base::Value* const raw_list_value =
581 settings->GetPref(kLoginVideoCaptureAllowedUrls);
582 if (!raw_list_value) {
583 controller.PermissionDenied();
584 return;
585 }
586
587 const base::ListValue* list_value;
588 CHECK(raw_list_value->GetAsList(&list_value));
589 for (const auto& base_value : *list_value) {
590 std::string value;
591 if (base_value->GetAsString(&value)) {
592 ContentSettingsPattern pattern =
593 ContentSettingsPattern::FromString(value);
594 if (pattern == ContentSettingsPattern::Wildcard()) {
595 LOG(WARNING) << "Ignoring wildcard URL pattern: " << value;
596 continue;
597 }
598 if (pattern.IsValid() && pattern.Matches(request.security_origin)) {
599 controller.PermissionGranted();
600 return;
601 }
602 }
603 }
604 controller.PermissionDenied();
605 } 566 }
606 567
607 bool WebUILoginView::CheckMediaAccessPermission( 568 bool WebUILoginView::CheckMediaAccessPermission(
608 content::WebContents* web_contents, 569 content::WebContents* web_contents,
609 const GURL& security_origin, 570 const GURL& security_origin,
610 content::MediaStreamType type) { 571 content::MediaStreamType type) {
611 return MediaCaptureDevicesDispatcher::GetInstance() 572 return MediaCaptureDevicesDispatcher::GetInstance()
612 ->CheckMediaAccessPermission(web_contents, security_origin, type); 573 ->CheckMediaAccessPermission(web_contents, security_origin, type);
613 } 574 }
614 575
(...skipping 16 matching lines...) Expand all
631 if (should_emit_login_prompt_visible_) { 592 if (should_emit_login_prompt_visible_) {
632 VLOG(1) << "Login WebUI >> login-prompt-visible"; 593 VLOG(1) << "Login WebUI >> login-prompt-visible";
633 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> 594 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
634 EmitLoginPromptVisible(); 595 EmitLoginPromptVisible();
635 } 596 }
636 597
637 webui_visible_ = true; 598 webui_visible_ = true;
638 } 599 }
639 600
640 } // namespace chromeos 601 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/saml/saml_browsertest.cc ('k') | chrome/browser/media/webrtc/media_permission.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698