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

Unified Diff: chrome/browser/chromeos/login/ui/webui_login_view.cc

Issue 1936903002: Allow SAML logins to use the webcam (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add comment to JS re: C++ permission check Created 4 years, 8 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 | « no previous file | chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/ui/webui_login_view.cc
diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.cc b/chrome/browser/chromeos/login/ui/webui_login_view.cc
index 27c42e222d8ea2beb060506ca9d9df5ef192b262..a60d8c3789a536dd8cfb51c480ee45a2a7a754b9 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc
@@ -9,6 +9,7 @@
#include "base/bind.h"
#include "base/callback.h"
#include "base/i18n/rtl.h"
+#include "base/logging.h"
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "base/trace_event/trace_event.h"
@@ -19,6 +20,7 @@
#include "chrome/browser/chromeos/login/ui/proxy_settings_dialog.h"
#include "chrome/browser/chromeos/login/ui/webui_login_display.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
#include "chrome/browser/media/media_capture_devices_dispatcher.h"
#include "chrome/browser/media/media_stream_devices_controller.h"
@@ -31,6 +33,8 @@
#include "chromeos/dbus/session_manager_client.h"
#include "chromeos/network/network_state.h"
#include "chromeos/network/network_state_handler.h"
+#include "chromeos/settings/cros_settings_names.h"
+#include "components/content_settings/core/common/content_settings_pattern.h"
#include "components/password_manager/core/browser/password_manager.h"
#include "components/web_modal/web_contents_modal_dialog_manager.h"
#include "content/public/browser/notification_service.h"
@@ -435,8 +439,42 @@ void WebUILoginView::RequestMediaAccessPermission(
const content::MediaStreamRequest& request,
const content::MediaResponseCallback& callback) {
MediaStreamDevicesController controller(web_contents, request, callback);
- if (controller.IsAskingForVideo() || controller.IsAskingForAudio())
- NOTREACHED() << "Media stream not allowed for WebUI";
+ if (controller.IsAskingForAudio() || !controller.IsAskingForVideo()) {
+ controller.PermissionDenied();
+ return;
+ }
+
+ const CrosSettings* const settings = CrosSettings::Get();
+ if (!settings) {
+ controller.PermissionDenied();
+ return;
+ }
+
+ const base::Value* const raw_list_value =
+ settings->GetPref(kLoginVideoCaptureAllowedUrls);
+ if (!raw_list_value) {
+ controller.PermissionDenied();
+ return;
+ }
+
+ const base::ListValue* list_value;
+ CHECK(raw_list_value->GetAsList(&list_value));
+ for (base::Value* base_value : *list_value) {
+ std::string value;
+ if (base_value->GetAsString(&value)) {
+ ContentSettingsPattern pattern =
+ ContentSettingsPattern::FromString(value);
+ if (pattern == ContentSettingsPattern::Wildcard()) {
+ LOG(WARNING) << "Ignoring wildcard URL pattern: " << value;
+ continue;
+ }
+ if (pattern.IsValid() && pattern.Matches(request.security_origin)) {
+ controller.PermissionGranted();
+ return;
+ }
+ }
+ }
+ controller.PermissionDenied();
}
bool WebUILoginView::CheckMediaAccessPermission(
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698