OLD | NEW |
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/web_usb_permission_store.h" |
9 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
10 #include "content/public/browser/browser_thread.h" | 11 #include "content/public/browser/browser_thread.h" |
11 #include "content/public/browser/render_frame_host.h" | 12 #include "content/public/browser/render_frame_host.h" |
| 13 #include "content/public/browser/render_process_host.h" |
12 #include "device/core/device_client.h" | 14 #include "device/core/device_client.h" |
13 | 15 |
14 using device::usb::WebUsbDescriptorSet; | 16 using device::usb::WebUsbDescriptorSet; |
15 using device::usb::WebUsbConfigurationSubsetPtr; | 17 using device::usb::WebUsbConfigurationSubsetPtr; |
16 using device::usb::WebUsbFunctionSubsetPtr; | 18 using device::usb::WebUsbFunctionSubsetPtr; |
17 | 19 |
18 namespace { | 20 namespace { |
19 | 21 |
20 bool FindOriginInDescriptorSet(const WebUsbDescriptorSet* set, | 22 bool FindOriginInDescriptorSet(const WebUsbDescriptorSet* set, |
21 const GURL& origin, | 23 const GURL& origin, |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 bindings_.set_connection_error_handler(base::Bind( | 82 bindings_.set_connection_error_handler(base::Bind( |
81 &WebUSBPermissionProvider::OnConnectionError, base::Unretained(this))); | 83 &WebUSBPermissionProvider::OnConnectionError, base::Unretained(this))); |
82 bindings_.AddBinding(this, request.Pass()); | 84 bindings_.AddBinding(this, request.Pass()); |
83 } | 85 } |
84 | 86 |
85 void WebUSBPermissionProvider::HasDevicePermission( | 87 void WebUSBPermissionProvider::HasDevicePermission( |
86 mojo::Array<device::usb::DeviceInfoPtr> requested_devices, | 88 mojo::Array<device::usb::DeviceInfoPtr> requested_devices, |
87 const HasDevicePermissionCallback& callback) { | 89 const HasDevicePermissionCallback& callback) { |
88 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 90 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
89 GURL origin = render_frame_host_->GetLastCommittedURL().GetOrigin(); | 91 GURL origin = render_frame_host_->GetLastCommittedURL().GetOrigin(); |
| 92 WebUSBPermissionStore* store = WebUSBPermissionStore::Get( |
| 93 render_frame_host_->GetProcess()->GetBrowserContext()); |
90 | 94 |
91 mojo::Array<mojo::String> allowed_guids(0); | 95 mojo::Array<mojo::String> allowed_guids(0); |
92 for (size_t i = 0; i < requested_devices.size(); ++i) { | 96 for (size_t i = 0; i < requested_devices.size(); ++i) { |
93 const device::usb::DeviceInfoPtr& device = requested_devices[i]; | 97 const device::usb::DeviceInfoPtr& device = requested_devices[i]; |
94 if (FindOriginInDescriptorSet(device->webusb_allowed_origins.get(), origin, | 98 if (FindOriginInDescriptorSet(device->webusb_allowed_origins.get(), origin, |
95 nullptr, nullptr) && | 99 nullptr, nullptr) && |
96 EnableWebUsbOnAnyOrigin()) | 100 (EnableWebUsbOnAnyOrigin() || |
| 101 store->HasDevicePermission(origin, device->guid))) |
97 allowed_guids.push_back(device->guid); | 102 allowed_guids.push_back(device->guid); |
98 } | 103 } |
99 callback.Run(allowed_guids.Pass()); | 104 callback.Run(allowed_guids.Pass()); |
100 } | 105 } |
101 | 106 |
102 void WebUSBPermissionProvider::HasConfigurationPermission( | 107 void WebUSBPermissionProvider::HasConfigurationPermission( |
103 uint8_t requested_configuration_value, | 108 uint8_t requested_configuration_value, |
104 device::usb::DeviceInfoPtr device, | 109 device::usb::DeviceInfoPtr device, |
105 const HasInterfacePermissionCallback& callback) { | 110 const HasInterfacePermissionCallback& callback) { |
106 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 111 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
(...skipping 17 matching lines...) Expand all Loading... |
124 | 129 |
125 void WebUSBPermissionProvider::Bind( | 130 void WebUSBPermissionProvider::Bind( |
126 mojo::InterfaceRequest<device::usb::PermissionProvider> request) { | 131 mojo::InterfaceRequest<device::usb::PermissionProvider> request) { |
127 bindings_.AddBinding(this, request.Pass()); | 132 bindings_.AddBinding(this, request.Pass()); |
128 } | 133 } |
129 | 134 |
130 void WebUSBPermissionProvider::OnConnectionError() { | 135 void WebUSBPermissionProvider::OnConnectionError() { |
131 if (bindings_.empty()) | 136 if (bindings_.empty()) |
132 delete this; | 137 delete this; |
133 } | 138 } |
OLD | NEW |