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

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

Issue 1842643004: Add --disable-webusb-security flag for testing existing devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Renamed and refactored FindInWebUsbAllowedOrigins. 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/usb/usb_chooser_bubble_controller.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h"
10 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/usb/usb_chooser_context.h" 12 #include "chrome/browser/usb/usb_chooser_context.h"
12 #include "chrome/browser/usb/usb_chooser_context_factory.h" 13 #include "chrome/browser/usb/usb_chooser_context_factory.h"
14 #include "chrome/common/chrome_switches.h"
13 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
14 #include "content/public/browser/render_frame_host.h" 16 #include "content/public/browser/render_frame_host.h"
15 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
16 #include "device/usb/public/interfaces/device.mojom.h" 18 #include "device/usb/public/interfaces/device.mojom.h"
17 19
18 using content::WebContents; 20 using content::WebContents;
19 using device::usb::WebUsbDescriptorSet; 21 using device::usb::WebUsbDescriptorSet;
20 using device::usb::WebUsbConfigurationSubsetPtr; 22 using device::usb::WebUsbConfigurationSubsetPtr;
21 using device::usb::WebUsbFunctionSubsetPtr; 23 using device::usb::WebUsbFunctionSubsetPtr;
22 24
23 namespace { 25 namespace {
24 26
25 bool FindOriginInDescriptorSet(const WebUsbDescriptorSet* set, 27 bool FindOriginInDescriptorSet(const WebUsbDescriptorSet* set,
26 const GURL& origin, 28 const GURL& origin,
27 const uint8_t* configuration_value, 29 const uint8_t* configuration_value,
28 const uint8_t* interface_number) { 30 const uint8_t* interface_number) {
31 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
32 switches::kDisableWebUsbSecurity))
33 return true;
34
29 if (!set) 35 if (!set)
30 return false; 36 return false;
31 for (size_t i = 0; i < set->origins.size(); ++i) 37 for (size_t i = 0; i < set->origins.size(); ++i)
32 if (origin.spec() == set->origins[i]) 38 if (origin.spec() == set->origins[i])
33 return true; 39 return true;
34 for (size_t i = 0; i < set->configurations.size(); ++i) { 40 for (size_t i = 0; i < set->configurations.size(); ++i) {
35 const WebUsbConfigurationSubsetPtr& config = set->configurations[i]; 41 const WebUsbConfigurationSubsetPtr& config = set->configurations[i];
36 if (configuration_value && 42 if (configuration_value &&
37 *configuration_value != config->configuration_value) 43 *configuration_value != config->configuration_value)
38 continue; 44 continue;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 bool WebUSBPermissionProvider::HasInterfacePermission( 108 bool WebUSBPermissionProvider::HasInterfacePermission(
103 uint8_t requested_interface, 109 uint8_t requested_interface,
104 uint8_t configuration_value, 110 uint8_t configuration_value,
105 const device::usb::DeviceInfo& device_info) const { 111 const device::usb::DeviceInfo& device_info) const {
106 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 112 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
107 return FindOriginInDescriptorSet( 113 return FindOriginInDescriptorSet(
108 device_info.webusb_allowed_origins.get(), 114 device_info.webusb_allowed_origins.get(),
109 render_frame_host_->GetLastCommittedURL().GetOrigin(), 115 render_frame_host_->GetLastCommittedURL().GetOrigin(),
110 &configuration_value, &requested_interface); 116 &configuration_value, &requested_interface);
111 } 117 }
OLDNEW
« no previous file with comments | « chrome/browser/usb/usb_chooser_bubble_controller.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698