e86d1cba75
* chore: bump chromium in DEPS to 104.0.5096.0 * 3651284: Use the entry settings object for window.open navigation https://chromium-review.googlesource.com/c/chromium/src/+/3651284 * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 * 3642842: Window Placement: Prototype Fullscreen Capability Delegation - Part 2 https://chromium-review.googlesource.com/c/chromium/src/+/3642842 * 3652785: [sandbox] Enable sandboxed pointers on sanitizer builds https://chromium-review.googlesource.com/c/v8/v8/+/3652785 * 3611967: webhid: Migrate HidDelegate to use BrowserContext and Origin https://chromium-review.googlesource.com/c/chromium/src/+/3611967 * 3665762: Remove RenderFrameHost::IsRenderFrameCreated from //content/. https://chromium-review.googlesource.com/c/chromium/src/+/3665762 * 3659375: Fold x509_util_ios and most of x509_util_mac into x509_util_apple https://chromium-review.googlesource.com/c/chromium/src/+/3659375 * 3656234: [CodeHealth] Remove uses of base::ListValue::Append() (Final, take 2) https://chromium-review.googlesource.com/c/chromium/src/+/3656234 * chore: update patch indices * chore: fix lint * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 * webhid: Migrate HidDelegate to use BrowserContext and Origin This is a temporary fix for https://chromium-review.googlesource.com/c/chromium/src/+/3611967 to get the build compiling, but we need to either patch around https://chromium-review.googlesource.com/c/chromium/src/+/3611967 or move our device permissioning to BrowserContext * chore: fix lint * build: run electron/script/gen-libc++-filenames.js fixes gn check * chore: bump chromium in DEPS to 104.0.5098.0 * chore: disable flaking tests * 3682394: Change pipes surrounding code references in comments to backticks https://chromium-review.googlesource.com/c/chromium/src/+/3682394 * 3652749: Delete GLRenderer and related classes https://chromium-review.googlesource.com/c/chromium/src/+/3652749 * chore: fixup patch indices * 3671199: Remove ContentMainDelegate::PostFieldTrialInitialization https://chromium-review.googlesource.com/c/chromium/src/+/3671199 * 3607963: hid: Do not exclude HID device with no collections https://chromium-review.googlesource.com/c/chromium/src/+/3607963 * refactor: use ElectronBrowserContext instead of WebContents to persist devices due to changes like https://chromium-review.googlesource.com/c/chromium/src/+/3611967, we can no longer use WebContents to store device permissions so this commit moves device permission storage to live in memory in ElectronBrowserContext instead. * 3557253: Deprecate some signature checks https://chromium-review.googlesource.com/c/v8/v8/+/3557253 * chore: bump chromium in DEPS to 104.0.5100.0 * 3680781: Add policy for Renderer App Container. https://chromium-review.googlesource.com/c/chromium/src/+/3680781 * chore: update patch indices * 3675465: Update NetLog network service API to use mojom::DictionaryValue. https://chromium-review.googlesource.com/c/chromium/src/+/3675465 * chore: bump chromium in DEPS to 104.0.5102.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5103.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5104.0 * chore: update patches * fix: add patch for DCHECK in fullscreen test * build: fix nan build * build: make the nan spec runner work on macOS * chore: bump chromium in DEPS to 104.0.5106.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5108.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5110.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5112.0 * chore: bump chromium in DEPS to 105.0.5113.0 * chore: bump chromium in DEPS to 105.0.5115.0 * chore: bump chromium in DEPS to 105.0.5117.0 * chore: update patches * chore: update libcpp patch * 3693745: Delete base::LowerCaseEqualsASCII() Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3693745 * 3669226: Remove printing PostTask usage of IO thread Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3669226 * 3687395: Remove DictionaryValue::HasKey(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3687395 * 3691014: Prevent unsafe narrowing: ui/accessibility, part 2 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3691014 * 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560567 * 3684873: [Bluetooth][Win/Linux] Add bluetooth pair confirmation prompt https://chromium-review.googlesource.com/c/chromium/src/+/3684873 * chore: bump chromium in DEPS to 105.0.5119.0 * chore: missing includes in desktop_notification_controller * chore: update patches * 3685951: Reland "Make sure screen object is created once in tests." https://chromium-review.googlesource.com/c/chromium/src/+/3685951 * fixup: Reland "Make sure screen object is created once in tests." * 3646014: [API] Deprecate LegacyOOMErrorCallback Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3646014 * chore: bump chromium in DEPS to 105.0.5121.0 * chore: update patches * 3699085: [cleanup] update PrintBackend::EnumeratePrinters to use reference Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3699085 * chore: bump chromium in DEPS to 105.0.5123.0 * chore: update patches * chore: bump chromium in DEPS to 105.0.5125.0 * chore: update patches * 3630082: [sandbox] Also enable the sandbox outside of Chromium builds Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3630082 * chore: bump chromium in DEPS to 105.0.5127.0 * chore: update patches * chore: bump chromium in DEPS to 105.0.5129.0 * chore: update patches * 3703741: Remove WebContents::GetMainFrame. https://chromium-review.googlesource.com/c/chromium/src/+/3703741 * chore: update patches * fixup! 3703741: Remove WebContents::GetMainFrame. * fix lint * more lint * chore: document breaking change * 3687671: [v8] Freeze flags after initialization https://chromium-review.googlesource.com/c/chromium/src/+/3687671 * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. * use the v8 allocator for node serdes * chore: update patches * remove faulty non-v8-sandbox-compatible code * make NodeArrayBufferAllocator use the v8 allocator under the hood * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. * fix build on windows * 3691954: [Reland][Extensions Bindings] Validate arguments sent to API events https://chromium-review.googlesource.com/c/chromium/src/+/3691954 * chore: remove deprecated AccessorSignatures https://github.com/nodejs/nan/pull/941 * Update patches/chromium/notification_provenance.patch Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * remove chore_expose_v8_initialization_isolate_callbacks.patch * add link to nodejs/nan#941 * 52026: Do not allow md4 or md5 based signatures in X.509 certificates. https://boringssl-review.googlesource.com/c/boringssl/+/52026 * chore: update patches * disable nan buffer-test * disable sandboxed pointers for now * force sandboxed pointers off * improve node allocation patch * restore accidentally dropped node crypto test patch Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Jeremy Rose <japthorp@slack-corp.com>
195 lines
6.1 KiB
C++
195 lines
6.1 KiB
C++
// Copyright (c) 2020 Microsoft, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/serial/serial_chooser_controller.h"
|
|
|
|
#include <algorithm>
|
|
#include <utility>
|
|
|
|
#include "base/bind.h"
|
|
#include "base/files/file_path.h"
|
|
#include "base/strings/stringprintf.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "shell/browser/api/electron_api_session.h"
|
|
#include "shell/browser/serial/serial_chooser_context.h"
|
|
#include "shell/browser/serial/serial_chooser_context_factory.h"
|
|
#include "shell/common/gin_converters/callback_converter.h"
|
|
#include "shell/common/gin_converters/content_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "ui/base/l10n/l10n_util.h"
|
|
|
|
namespace gin {
|
|
|
|
template <>
|
|
struct Converter<device::mojom::SerialPortInfoPtr> {
|
|
static v8::Local<v8::Value> ToV8(
|
|
v8::Isolate* isolate,
|
|
const device::mojom::SerialPortInfoPtr& port) {
|
|
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.Set("portId", port->token.ToString());
|
|
dict.Set("portName", port->path.BaseName().LossyDisplayName());
|
|
if (port->display_name && !port->display_name->empty()) {
|
|
dict.Set("displayName", *port->display_name);
|
|
}
|
|
if (port->has_vendor_id) {
|
|
dict.Set("vendorId", base::StringPrintf("%u", port->vendor_id));
|
|
}
|
|
if (port->has_product_id) {
|
|
dict.Set("productId", base::StringPrintf("%u", port->product_id));
|
|
}
|
|
if (port->serial_number && !port->serial_number->empty()) {
|
|
dict.Set("serialNumber", *port->serial_number);
|
|
}
|
|
#if BUILDFLAG(IS_MAC)
|
|
if (port->usb_driver_name && !port->usb_driver_name->empty()) {
|
|
dict.Set("usbDriverName", *port->usb_driver_name);
|
|
}
|
|
#elif BUILDFLAG(IS_WIN)
|
|
if (!port->device_instance_id.empty()) {
|
|
dict.Set("deviceInstanceId", port->device_instance_id);
|
|
}
|
|
#endif
|
|
return gin::ConvertToV8(isolate, dict);
|
|
}
|
|
};
|
|
|
|
} // namespace gin
|
|
|
|
namespace electron {
|
|
|
|
SerialChooserController::SerialChooserController(
|
|
content::RenderFrameHost* render_frame_host,
|
|
std::vector<blink::mojom::SerialPortFilterPtr> filters,
|
|
content::SerialChooser::Callback callback,
|
|
content::WebContents* web_contents,
|
|
base::WeakPtr<ElectronSerialDelegate> serial_delegate)
|
|
: WebContentsObserver(web_contents),
|
|
filters_(std::move(filters)),
|
|
callback_(std::move(callback)),
|
|
serial_delegate_(serial_delegate),
|
|
render_frame_host_id_(render_frame_host->GetGlobalId()) {
|
|
origin_ = web_contents->GetPrimaryMainFrame()->GetLastCommittedOrigin();
|
|
|
|
chooser_context_ = SerialChooserContextFactory::GetForBrowserContext(
|
|
web_contents->GetBrowserContext())
|
|
->AsWeakPtr();
|
|
DCHECK(chooser_context_);
|
|
chooser_context_->GetPortManager()->GetDevices(base::BindOnce(
|
|
&SerialChooserController::OnGetDevices, weak_factory_.GetWeakPtr()));
|
|
}
|
|
|
|
SerialChooserController::~SerialChooserController() {
|
|
RunCallback(/*port=*/nullptr);
|
|
if (chooser_context_) {
|
|
chooser_context_->RemovePortObserver(this);
|
|
}
|
|
}
|
|
|
|
api::Session* SerialChooserController::GetSession() {
|
|
if (!web_contents()) {
|
|
return nullptr;
|
|
}
|
|
return api::Session::FromBrowserContext(web_contents()->GetBrowserContext());
|
|
}
|
|
|
|
void SerialChooserController::OnPortAdded(
|
|
const device::mojom::SerialPortInfo& port) {
|
|
ports_.push_back(port.Clone());
|
|
api::Session* session = GetSession();
|
|
if (session) {
|
|
session->Emit("serial-port-added", port.Clone(), web_contents());
|
|
}
|
|
}
|
|
|
|
void SerialChooserController::OnPortRemoved(
|
|
const device::mojom::SerialPortInfo& port) {
|
|
const auto it = std::find_if(
|
|
ports_.begin(), ports_.end(),
|
|
[&port](const auto& ptr) { return ptr->token == port.token; });
|
|
if (it != ports_.end()) {
|
|
api::Session* session = GetSession();
|
|
if (session) {
|
|
session->Emit("serial-port-removed", port.Clone(), web_contents());
|
|
}
|
|
ports_.erase(it);
|
|
}
|
|
}
|
|
|
|
void SerialChooserController::OnPortManagerConnectionError() {
|
|
// TODO(nornagon/jkleinsc): report event
|
|
}
|
|
|
|
void SerialChooserController::OnDeviceChosen(const std::string& port_id) {
|
|
if (port_id.empty()) {
|
|
RunCallback(/*port=*/nullptr);
|
|
} else {
|
|
const auto it =
|
|
std::find_if(ports_.begin(), ports_.end(), [&port_id](const auto& ptr) {
|
|
return ptr->token.ToString() == port_id;
|
|
});
|
|
if (it != ports_.end()) {
|
|
auto* rfh = content::RenderFrameHost::FromID(render_frame_host_id_);
|
|
chooser_context_->GrantPortPermission(origin_, *it->get(), rfh);
|
|
RunCallback(it->Clone());
|
|
} else {
|
|
RunCallback(/*port=*/nullptr);
|
|
}
|
|
}
|
|
}
|
|
|
|
void SerialChooserController::OnGetDevices(
|
|
std::vector<device::mojom::SerialPortInfoPtr> ports) {
|
|
// Sort ports by file paths.
|
|
std::sort(ports.begin(), ports.end(),
|
|
[](const auto& port1, const auto& port2) {
|
|
return port1->path.BaseName() < port2->path.BaseName();
|
|
});
|
|
|
|
for (auto& port : ports) {
|
|
if (FilterMatchesAny(*port))
|
|
ports_.push_back(std::move(port));
|
|
}
|
|
|
|
bool prevent_default = false;
|
|
api::Session* session = GetSession();
|
|
if (session) {
|
|
prevent_default =
|
|
session->Emit("select-serial-port", ports_, web_contents(),
|
|
base::AdaptCallbackForRepeating(base::BindOnce(
|
|
&SerialChooserController::OnDeviceChosen,
|
|
weak_factory_.GetWeakPtr())));
|
|
}
|
|
if (!prevent_default) {
|
|
RunCallback(/*port=*/nullptr);
|
|
}
|
|
}
|
|
|
|
bool SerialChooserController::FilterMatchesAny(
|
|
const device::mojom::SerialPortInfo& port) const {
|
|
if (filters_.empty())
|
|
return true;
|
|
|
|
for (const auto& filter : filters_) {
|
|
if (filter->has_vendor_id &&
|
|
(!port.has_vendor_id || filter->vendor_id != port.vendor_id)) {
|
|
continue;
|
|
}
|
|
if (filter->has_product_id &&
|
|
(!port.has_product_id || filter->product_id != port.product_id)) {
|
|
continue;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
void SerialChooserController::RunCallback(
|
|
device::mojom::SerialPortInfoPtr port) {
|
|
if (callback_) {
|
|
std::move(callback_).Run(std::move(port));
|
|
}
|
|
}
|
|
|
|
} // namespace electron
|