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

Side by Side Diff: chrome/browser/extensions/api/hid/hid_device_manager.cc

Issue 258733002: Block some HID devices from chrome.hid. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test TODO Created 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/extensions/api/hid/hid_device_manager.h ('k') | device/hid/hid_usage_and_page.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 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/extensions/api/hid/hid_device_manager.h" 5 #include "chrome/browser/extensions/api/hid/hid_device_manager.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "device/hid/hid_service.h" 11 #include "device/hid/hid_service.h"
12 12
13 using device::HidService; 13 using device::HidService;
14 using device::HidUsageAndPage;
14 15
15 namespace extensions { 16 namespace extensions {
16 17
17 HidDeviceManager::HidDeviceManager(content::BrowserContext* context) 18 HidDeviceManager::HidDeviceManager(content::BrowserContext* context)
18 : next_resource_id_(0) {} 19 : next_resource_id_(0) {}
19 20
20 HidDeviceManager::~HidDeviceManager() {} 21 HidDeviceManager::~HidDeviceManager() {}
21 22
22 // static 23 // static
23 BrowserContextKeyedAPIFactory<HidDeviceManager>* 24 BrowserContextKeyedAPIFactory<HidDeviceManager>*
(...skipping 13 matching lines...) Expand all
37 base::ListValue* api_devices = new base::ListValue(); 38 base::ListValue* api_devices = new base::ListValue();
38 for (ResourceIdToDeviceIdMap::const_iterator device_iter = 39 for (ResourceIdToDeviceIdMap::const_iterator device_iter =
39 device_ids_.begin(); 40 device_ids_.begin();
40 device_iter != device_ids_.end(); 41 device_iter != device_ids_.end();
41 ++device_iter) { 42 ++device_iter) {
42 int resource_id = device_iter->first; 43 int resource_id = device_iter->first;
43 device::HidDeviceId device_id = device_iter->second; 44 device::HidDeviceId device_id = device_iter->second;
44 device::HidDeviceInfo device_info; 45 device::HidDeviceInfo device_info;
45 if (hid_service->GetDeviceInfo(device_id, &device_info)) { 46 if (hid_service->GetDeviceInfo(device_id, &device_info)) {
46 if (device_info.vendor_id == vendor_id && 47 if (device_info.vendor_id == vendor_id &&
47 device_info.product_id == product_id) { 48 device_info.product_id == product_id &&
49 IsDeviceAccessible(device_info)) {
48 api::hid::HidDeviceInfo api_device_info; 50 api::hid::HidDeviceInfo api_device_info;
49 api_device_info.device_id = resource_id; 51 api_device_info.device_id = resource_id;
50 api_device_info.vendor_id = device_info.vendor_id; 52 api_device_info.vendor_id = device_info.vendor_id;
51 api_device_info.product_id = device_info.product_id; 53 api_device_info.product_id = device_info.product_id;
52 for (std::vector<device::HidUsageAndPage>::const_iterator usage_iter = 54 for (std::vector<device::HidUsageAndPage>::const_iterator usage_iter =
53 device_info.usages.begin(); 55 device_info.usages.begin();
54 usage_iter != device_info.usages.end(); 56 usage_iter != device_info.usages.end();
55 ++usage_iter) { 57 ++usage_iter) {
56 api::hid::HidUsageAndPage* usage_and_page = 58 api::hid::HidUsageAndPage* usage_and_page =
57 new api::hid::HidUsageAndPage(); 59 new api::hid::HidUsageAndPage();
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 DCHECK_LT(next_resource_id_, std::numeric_limits<int>::max()); 109 DCHECK_LT(next_resource_id_, std::numeric_limits<int>::max());
108 new_id = next_resource_id_++; 110 new_id = next_resource_id_++;
109 } 111 }
110 new_resource_ids[device_info.device_id] = new_id; 112 new_resource_ids[device_info.device_id] = new_id;
111 new_device_ids[new_id] = device_info.device_id; 113 new_device_ids[new_id] = device_info.device_id;
112 } 114 }
113 device_ids_.swap(new_device_ids); 115 device_ids_.swap(new_device_ids);
114 resource_ids_.swap(new_resource_ids); 116 resource_ids_.swap(new_resource_ids);
115 } 117 }
116 118
119 // static
120 // TODO(rockot): Add some tests for this.
121 bool HidDeviceManager::IsDeviceAccessible(
122 const device::HidDeviceInfo& device_info) {
123 for (std::vector<device::HidUsageAndPage>::const_iterator iter =
124 device_info.usages.begin();
125 iter != device_info.usages.end(); ++iter) {
126 if (!IsUsageAccessible(*iter)) {
127 return false;
128 }
129 }
130 return true;
131 }
132
133 // static
134 bool HidDeviceManager::IsUsageAccessible(
135 const HidUsageAndPage& usage_and_page) {
136 if (usage_and_page.usage_page == HidUsageAndPage::kPageKeyboard)
137 return false;
138
139 if (usage_and_page.usage_page != HidUsageAndPage::kPageGenericDesktop)
140 return true;
141
142 uint16_t usage = usage_and_page.usage;
143 if (usage == HidUsageAndPage::kGenericDesktopPointer ||
144 usage == HidUsageAndPage::kGenericDesktopMouse ||
145 usage == HidUsageAndPage::kGenericDesktopKeyboard ||
146 usage == HidUsageAndPage::kGenericDesktopKeypad) {
147 return false;
148 }
149
150 if (usage >= HidUsageAndPage::kGenericDesktopSystemControl &&
151 usage <= HidUsageAndPage::kGenericDesktopSystemWarmRestart) {
152 return false;
153 }
154
155 if (usage >= HidUsageAndPage::kGenericDesktopSystemDock &&
156 usage <= HidUsageAndPage::kGenericDesktopSystemDisplaySwap) {
157 return false;
158 }
159
160 return true;
161 }
162
117 } // namespace extensions 163 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/hid/hid_device_manager.h ('k') | device/hid/hid_usage_and_page.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698