59dd17f2cf
* chore: bump chromium in DEPS to 102.0.4975.0 * chore: bump chromium in DEPS to 102.0.4977.0 * chore: update patches * Remove parameter of OnGpuProcessCrashed() https://chromium-review.googlesource.com/c/chromium/src/+/3543396 * hid: Add exclusionFilters option to requestDevice https://chromium-review.googlesource.com/c/chromium/src/+/3478175 * chore: bump chromium in DEPS to 102.0.4979.0 * chore: bump chromium in DEPS to 102.0.4981.0 * chore: update patches * Deny notification/push permission for documents in non-standard StoragePartitions https://chromium-review.googlesource.com/c/chromium/src/+/3257305 * Improve FrameTreeNode tracking in URLLoaderNetworkContext https://chromium-review.googlesource.com/c/chromium/src/+/3341866 * fixup! Remove parameter of OnGpuProcessCrashed() * chore: fix lint * Reland "Use gfx::Insets[F]::TLBR() and gfx::Insets[F]::VH() in the rest of Chrome" https://chromium-review.googlesource.com/c/chromium/src/+/3554236 * chore: bump chromium in DEPS to 102.0.4983.0 * Ensure EyeDropperView does not access a destroyed window https://chromium-review.googlesource.com/c/chromium/src/+/3561542 * ci: don't delete dawn .git directory 83901: Adds a generated file with the dawn git hash encoded at build time. | https://dawn-review.googlesource.com/c/dawn/+/83901 * ci: update Windows toolchain 3550827: New toolchain for Windows 10 20348 SDK | https://chromium-review.googlesource.com/c/chromium/src/+/3550827 * chore: bump chromium in DEPS to 102.0.4985.0 * chore: update patches * chore: bump chromium in DEPS to 102.0.4987.0 * chore: update patches * 3563432: codehealth: remove uses of DictionaryValue in cbui/webui https://chromium-review.googlesource.com/c/chromium/src/+/3563432 * chore: update patches after rebase * Use gfx::Insets[F]::TLBR() and gfx::Insets[F]::VH() in the rest of Chrome https://chromium-review.googlesource.com/c/chromium/src/+/3554236 * 3565724: Preserve "proper method names" as-is in error.stack. https://chromium-review.googlesource.com/c/v8/v8/+/3565724 * chore: bump chromium in DEPS to 102.0.4989.0 * chore: update patches * fixup ci: don't delete dawn .git directory for Windows * 3560843: Remove multi-parameter version of gfx::Rect[F]::Inset() https://chromium-review.googlesource.com/c/chromium/src/+/3560843 * 3572711: Remove unused IDS_PDF_TOOLTIP_ROTATE_CW resource. https://chromium-review.googlesource.com/c/chromium/src/+/3572711 * 3572926: Reland "[Sysroot] Switch to Debian Bullseye stable" https://chromium-review.googlesource.com/c/chromium/src/+/3572926 * build: fixup sysroots with electron specific dependencies * fixup Remove multi-parameter version of gfx::Rect[F]::Inset() * fixup 3565724: Preserve "proper method names" as-is in error.stack. * fixup Remove multi-parameter version of gfx::Rect[F]::Inset() * test: add spec for navigator.hid.requestDevice({ exclusionFilters: [...] } * fixup 3565724: Preserve "proper method names" as-is in error.stack. * ci: use python3 to get the windows toolchain profile 3525960: Explicitly run everything with python3 | https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3525960 * chore: add diagnostic logging * fix: try calling process.crash() * chore: remove logging Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
177 lines
6.3 KiB
C++
177 lines
6.3 KiB
C++
// Copyright (c) 2021 Microsoft, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/hid/electron_hid_delegate.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "base/command_line.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
#include "services/device/public/cpp/hid/hid_switches.h"
|
|
#include "shell/browser/hid/hid_chooser_context.h"
|
|
#include "shell/browser/hid/hid_chooser_context_factory.h"
|
|
#include "shell/browser/hid/hid_chooser_controller.h"
|
|
#include "shell/browser/web_contents_permission_helper.h"
|
|
|
|
namespace {
|
|
|
|
electron::HidChooserContext* GetChooserContext(
|
|
content::RenderFrameHost* frame) {
|
|
auto* web_contents = content::WebContents::FromRenderFrameHost(frame);
|
|
auto* browser_context = web_contents->GetBrowserContext();
|
|
return electron::HidChooserContextFactory::GetForBrowserContext(
|
|
browser_context);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace electron {
|
|
|
|
ElectronHidDelegate::ElectronHidDelegate() = default;
|
|
|
|
ElectronHidDelegate::~ElectronHidDelegate() = default;
|
|
|
|
std::unique_ptr<content::HidChooser> ElectronHidDelegate::RunChooser(
|
|
content::RenderFrameHost* render_frame_host,
|
|
std::vector<blink::mojom::HidDeviceFilterPtr> filters,
|
|
std::vector<blink::mojom::HidDeviceFilterPtr> exclusion_filters,
|
|
content::HidChooser::Callback callback) {
|
|
electron::HidChooserContext* chooser_context =
|
|
GetChooserContext(render_frame_host);
|
|
if (!device_observation_.IsObserving())
|
|
device_observation_.Observe(chooser_context);
|
|
|
|
HidChooserController* controller = ControllerForFrame(render_frame_host);
|
|
if (controller) {
|
|
DeleteControllerForFrame(render_frame_host);
|
|
}
|
|
AddControllerForFrame(render_frame_host, std::move(filters),
|
|
std::move(exclusion_filters), std::move(callback));
|
|
|
|
// Return a nullptr because the return value isn't used for anything, eg
|
|
// there is no mechanism to cancel navigator.hid.requestDevice(). The return
|
|
// value is simply used in Chromium to cleanup the chooser UI once the serial
|
|
// service is destroyed.
|
|
return nullptr;
|
|
}
|
|
|
|
bool ElectronHidDelegate::CanRequestDevicePermission(
|
|
content::RenderFrameHost* render_frame_host) {
|
|
auto* web_contents =
|
|
content::WebContents::FromRenderFrameHost(render_frame_host);
|
|
auto* permission_helper =
|
|
WebContentsPermissionHelper::FromWebContents(web_contents);
|
|
return permission_helper->CheckHIDAccessPermission(
|
|
web_contents->GetMainFrame()->GetLastCommittedOrigin());
|
|
}
|
|
|
|
bool ElectronHidDelegate::HasDevicePermission(
|
|
content::RenderFrameHost* render_frame_host,
|
|
const device::mojom::HidDeviceInfo& device) {
|
|
auto* chooser_context = GetChooserContext(render_frame_host);
|
|
const auto& origin =
|
|
render_frame_host->GetMainFrame()->GetLastCommittedOrigin();
|
|
return chooser_context->HasDevicePermission(origin, device,
|
|
render_frame_host);
|
|
}
|
|
|
|
void ElectronHidDelegate::RevokeDevicePermission(
|
|
content::RenderFrameHost* render_frame_host,
|
|
const device::mojom::HidDeviceInfo& device) {
|
|
// TODO(jkleinsc) implement this for
|
|
// https://chromium-review.googlesource.com/c/chromium/src/+/3297868
|
|
}
|
|
|
|
device::mojom::HidManager* ElectronHidDelegate::GetHidManager(
|
|
content::RenderFrameHost* render_frame_host) {
|
|
auto* chooser_context = GetChooserContext(render_frame_host);
|
|
return chooser_context->GetHidManager();
|
|
}
|
|
|
|
void ElectronHidDelegate::AddObserver(
|
|
content::RenderFrameHost* render_frame_host,
|
|
Observer* observer) {
|
|
observer_list_.AddObserver(observer);
|
|
auto* chooser_context = GetChooserContext(render_frame_host);
|
|
if (!device_observation_.IsObserving())
|
|
device_observation_.Observe(chooser_context);
|
|
}
|
|
|
|
void ElectronHidDelegate::RemoveObserver(
|
|
content::RenderFrameHost* render_frame_host,
|
|
content::HidDelegate::Observer* observer) {
|
|
observer_list_.RemoveObserver(observer);
|
|
}
|
|
|
|
const device::mojom::HidDeviceInfo* ElectronHidDelegate::GetDeviceInfo(
|
|
content::RenderFrameHost* render_frame_host,
|
|
const std::string& guid) {
|
|
auto* chooser_context = GetChooserContext(render_frame_host);
|
|
return chooser_context->GetDeviceInfo(guid);
|
|
}
|
|
|
|
bool ElectronHidDelegate::IsFidoAllowedForOrigin(
|
|
content::RenderFrameHost* render_frame_host,
|
|
const url::Origin& origin) {
|
|
return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
|
switches::kDisableHidBlocklist);
|
|
}
|
|
|
|
void ElectronHidDelegate::OnDeviceAdded(
|
|
const device::mojom::HidDeviceInfo& device_info) {
|
|
for (auto& observer : observer_list_)
|
|
observer.OnDeviceAdded(device_info);
|
|
}
|
|
|
|
void ElectronHidDelegate::OnDeviceRemoved(
|
|
const device::mojom::HidDeviceInfo& device_info) {
|
|
for (auto& observer : observer_list_)
|
|
observer.OnDeviceRemoved(device_info);
|
|
}
|
|
|
|
void ElectronHidDelegate::OnDeviceChanged(
|
|
const device::mojom::HidDeviceInfo& device_info) {
|
|
for (auto& observer : observer_list_)
|
|
observer.OnDeviceChanged(device_info);
|
|
}
|
|
|
|
void ElectronHidDelegate::OnHidManagerConnectionError() {
|
|
device_observation_.Reset();
|
|
|
|
for (auto& observer : observer_list_)
|
|
observer.OnHidManagerConnectionError();
|
|
}
|
|
|
|
void ElectronHidDelegate::OnHidChooserContextShutdown() {
|
|
device_observation_.Reset();
|
|
}
|
|
|
|
HidChooserController* ElectronHidDelegate::ControllerForFrame(
|
|
content::RenderFrameHost* render_frame_host) {
|
|
auto mapping = controller_map_.find(render_frame_host);
|
|
return mapping == controller_map_.end() ? nullptr : mapping->second.get();
|
|
}
|
|
|
|
HidChooserController* ElectronHidDelegate::AddControllerForFrame(
|
|
content::RenderFrameHost* render_frame_host,
|
|
std::vector<blink::mojom::HidDeviceFilterPtr> filters,
|
|
std::vector<blink::mojom::HidDeviceFilterPtr> exclusion_filters,
|
|
content::HidChooser::Callback callback) {
|
|
auto* web_contents =
|
|
content::WebContents::FromRenderFrameHost(render_frame_host);
|
|
auto controller = std::make_unique<HidChooserController>(
|
|
render_frame_host, std::move(filters), std::move(exclusion_filters),
|
|
std::move(callback), web_contents, weak_factory_.GetWeakPtr());
|
|
controller_map_.insert(
|
|
std::make_pair(render_frame_host, std::move(controller)));
|
|
return ControllerForFrame(render_frame_host);
|
|
}
|
|
|
|
void ElectronHidDelegate::DeleteControllerForFrame(
|
|
content::RenderFrameHost* render_frame_host) {
|
|
controller_map_.erase(render_frame_host);
|
|
}
|
|
|
|
} // namespace electron
|