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

Side by Side Diff: chrome/browser/usb/web_usb_permission_provider.cc

Issue 1382783002: Store USB device permissions in website settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Convert WebUSBPermissionStore to a PermissionContext. Created 5 years, 2 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/usb/web_usb_permission_provider.h" 5 #include "chrome/browser/usb/web_usb_permission_provider.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/usb/usb_permission_context.h"
10 #include "chrome/browser/usb/usb_permission_context_factory.h"
9 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
10 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
11 #include "content/public/browser/render_frame_host.h" 13 #include "content/public/browser/render_frame_host.h"
14 #include "content/public/browser/render_process_host.h"
12 #include "device/core/device_client.h" 15 #include "device/core/device_client.h"
13 16
14 using device::usb::WebUsbDescriptorSet; 17 using device::usb::WebUsbDescriptorSet;
15 using device::usb::WebUsbConfigurationSubsetPtr; 18 using device::usb::WebUsbConfigurationSubsetPtr;
16 using device::usb::WebUsbFunctionSubsetPtr; 19 using device::usb::WebUsbFunctionSubsetPtr;
17 20
18 namespace { 21 namespace {
19 22
20 bool FindOriginInDescriptorSet(const WebUsbDescriptorSet* set, 23 bool FindOriginInDescriptorSet(const WebUsbDescriptorSet* set,
21 const GURL& origin, 24 const GURL& origin,
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 bindings_.set_connection_error_handler(base::Bind( 83 bindings_.set_connection_error_handler(base::Bind(
81 &WebUSBPermissionProvider::OnConnectionError, base::Unretained(this))); 84 &WebUSBPermissionProvider::OnConnectionError, base::Unretained(this)));
82 bindings_.AddBinding(this, request.Pass()); 85 bindings_.AddBinding(this, request.Pass());
83 } 86 }
84 87
85 void WebUSBPermissionProvider::HasDevicePermission( 88 void WebUSBPermissionProvider::HasDevicePermission(
86 mojo::Array<device::usb::DeviceInfoPtr> requested_devices, 89 mojo::Array<device::usb::DeviceInfoPtr> requested_devices,
87 const HasDevicePermissionCallback& callback) { 90 const HasDevicePermissionCallback& callback) {
88 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 91 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
89 GURL origin = render_frame_host_->GetLastCommittedURL().GetOrigin(); 92 GURL origin = render_frame_host_->GetLastCommittedURL().GetOrigin();
93 Profile* profile = Profile::FromBrowserContext(
94 render_frame_host_->GetProcess()->GetBrowserContext());
95 UsbPermissionContext* permission_context =
96 UsbPermissionContextFactory::GetForProfile(profile);
90 97
91 mojo::Array<mojo::String> allowed_guids(0); 98 mojo::Array<mojo::String> allowed_guids(0);
92 for (size_t i = 0; i < requested_devices.size(); ++i) { 99 for (size_t i = 0; i < requested_devices.size(); ++i) {
93 const device::usb::DeviceInfoPtr& device = requested_devices[i]; 100 const device::usb::DeviceInfoPtr& device = requested_devices[i];
94 if (FindOriginInDescriptorSet(device->webusb_allowed_origins.get(), origin, 101 if (FindOriginInDescriptorSet(device->webusb_allowed_origins.get(), origin,
95 nullptr, nullptr) && 102 nullptr, nullptr) &&
96 EnableWebUsbOnAnyOrigin()) 103 (EnableWebUsbOnAnyOrigin() ||
104 permission_context->HasDevicePermission(origin, device->guid)))
97 allowed_guids.push_back(device->guid); 105 allowed_guids.push_back(device->guid);
98 } 106 }
99 callback.Run(allowed_guids.Pass()); 107 callback.Run(allowed_guids.Pass());
100 } 108 }
101 109
102 void WebUSBPermissionProvider::HasConfigurationPermission( 110 void WebUSBPermissionProvider::HasConfigurationPermission(
103 uint8_t requested_configuration_value, 111 uint8_t requested_configuration_value,
104 device::usb::DeviceInfoPtr device, 112 device::usb::DeviceInfoPtr device,
105 const HasInterfacePermissionCallback& callback) { 113 const HasInterfacePermissionCallback& callback) {
106 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 114 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
(...skipping 17 matching lines...) Expand all
124 132
125 void WebUSBPermissionProvider::Bind( 133 void WebUSBPermissionProvider::Bind(
126 mojo::InterfaceRequest<device::usb::PermissionProvider> request) { 134 mojo::InterfaceRequest<device::usb::PermissionProvider> request) {
127 bindings_.AddBinding(this, request.Pass()); 135 bindings_.AddBinding(this, request.Pass());
128 } 136 }
129 137
130 void WebUSBPermissionProvider::OnConnectionError() { 138 void WebUSBPermissionProvider::OnConnectionError() {
131 if (bindings_.empty()) 139 if (bindings_.empty())
132 delete this; 140 delete this;
133 } 141 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698