feat: support Web Serial & WebUSB blocklists (#46600)
This commit is contained in:
parent
352a403efd
commit
a29e1170b9
10 changed files with 106 additions and 4 deletions
|
@ -8,9 +8,11 @@
|
|||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "base/command_line.h"
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/task/sequenced_task_runner.h"
|
||||
#include "base/values.h"
|
||||
#include "chrome/browser/usb/usb_blocklist.h"
|
||||
#include "components/content_settings/core/common/content_settings.h"
|
||||
#include "content/public/browser/device_service.h"
|
||||
#include "services/device/public/cpp/usb/usb_ids.h"
|
||||
|
@ -215,6 +217,12 @@ void UsbChooserContext::GrantDevicePermission(
|
|||
bool UsbChooserContext::HasDevicePermission(
|
||||
const url::Origin& origin,
|
||||
const device::mojom::UsbDeviceInfo& device_info) {
|
||||
bool blocklist_disabled =
|
||||
base::CommandLine::ForCurrentProcess()->HasSwitch(kDisableUSBBlocklist);
|
||||
if (!blocklist_disabled && UsbBlocklist::Get().IsExcluded(device_info)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
auto it = ephemeral_devices_.find(origin);
|
||||
if (it != ephemeral_devices_.end() && it->second.contains(device_info.guid)) {
|
||||
return true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue