mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* chore: bump chromium in DEPS to 146.0.7652.0 * fix(patch-conflict): update mas_avoid_private_macos_api_usage context for constrainFrameRect method The upstream CL added a new constrainFrameRect:toScreen: method override to NativeWidgetMacNSWindow as part of headless mode window zoom implementation. The MAS patch's #endif for frameViewClassForStyleMask now correctly appears after that method, since constrainFrameRect is a public API override that doesn't need to be guarded. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7487666 * fix(patch-conflict): update printing.patch for base::DictValue rename Updated printing.patch to use the new base::DictValue type name instead of base::Value::Dict following Chromium's type renaming change. This affects CompleteUpdatePrintSettings() signature and related code. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * fix(patch-conflict): update accessibility_ui patch for base::DictValue/ListValue rename Updated adjust_accessibility_ui_for_electron.patch to use the new base::DictValue and base::ListValue type names instead of base::Value::Dict and base::Value::List following Chromium's type renaming change. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * chore: update patches * 6625736: Rename DURABLE_STORAGE to PERSISTENT_STORAGE for consistency | https://chromium-review.googlesource.com/c/chromium/src/+/6625736 * chore: bump chromium in DEPS to 146.0.7653.0 * chore: update patches * 7000847: add type tag to v8::External for gin_helper function templates The upstream gin function templates now use v8::ExternalPointerTypeTag for type safety when using v8::External. Updated Electron's forked gin_helper function template to use the same kGinInternalCallbackHolderBaseTag that Chromium's gin uses. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * fix(patch-update): extend V8 Object API deprecation patch for Node.js Extended the existing patch to cover additional files that use GetAlignedPointerFromInternalField and SetAlignedPointerInInternalField: - src/stream_base-inl.h - src/udp_wrap.cc - src/js_udp_wrap.cc - src/node_process_methods.cc - src/node_snapshotable.cc - src/base_object.cc These APIs now require an EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * 7000847: add type tag to v8::External calls in shared_texture Updated v8::External::New and v8::External::Value calls to use the kExternalPointerTypeTagDefault tag as required by the V8 API change that deprecates the tagless versions. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * 7508687: use ChildProcessId for file permission APIs The ChildProcessSecurityPolicy::CanReadFile and GrantReadFile APIs now require ChildProcessId instead of int. Updated to use GetID() instead of GetDeprecatedID() for these specific calls. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7508687 * 7000847: add type tag to v8::External calls in callback and osr_converter The v8::External API now requires an EmbedderPointerTypeTag parameter for both New() and Value() methods to improve V8 sandbox type safety. Updated calls in: - callback.cc: TranslatorHolder constructor and CallTranslator - osr_converter.cc: OffscreenSharedTextureValue converter Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7000847 * fixup! 7087956: [api] Promote deprecation of v8::Context and v8::Object API methods Extended the Node.js patch to cover histogram.cc which also uses SetAlignedPointerInInternalField and GetAlignedPointerFromInternalField APIs that now require the EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * chore: bump chromium in DEPS to 146.0.7655.0 * chore: update patches * 7509043: update WebSpellingMarker type for API change The upstream Chromium API changed - WebSpellingMarker was moved from a nested type within WebTextCheckClient to a standalone type in the blink namespace. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509043 * 7498491: update process_id to use OriginatingProcess type The upstream Chromium API changed - URLLoaderFactoryParams::process_id was changed from an integer to a union type network::OriginatingProcess that distinguishes between browser and renderer processes. - For browser process requests, use OriginatingProcess::browser() - For renderer process lookups, check !is_browser() and use renderer_process().value() to get the child_id Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7498491 * 5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception | https://chromium-review.googlesource.com/c/chromium/src/+/5710330 5710330 added a new NSNextStepFrame interface extension and implementations for NativeWidgetMacNSWindowTitledFrame and NativeWidgetMacNSWindowBorderlessFrame. These use private macOS APIs that are not available in Mac App Store builds. * chore: update patches * chore: bump chromium in DEPS to 146.0.7661.0 * chore: bump chromium in DEPS to 146.0.7663.0 * fix(patch-conflict): update accessibility_ui for string_view API change Upstream removed redundant std::string(default_api_type) conversion as part of a string_view optimization cleanup. Updated patch context to match. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7514107 * fix(patch-conflict): update service process launch options for sandbox API refactor Upstream removed content/common/sandbox_init_win.cc and content/public/common/sandbox_init_win.h, moving the functionality directly into ChildProcessLauncherHelper. Updated patch to call sandbox::policy::SandboxWin::StartSandboxedProcess directly with the LaunchOptions pointer instead of going through the removed helper. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528253 * fix(patch-conflict): update MAS safestorage for keychain API refactor Upstream refactored KeychainPassword::GetPassword() to use a new GetPasswordImpl() helper function with improved error tracking via base::expected<std::string, OSStatus>. Adapted patch to use the new GetPasswordImpl with the suffixed account name and handle migration from legacy accounts through the new API. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7516438 * chore: update patches * chore: bump chromium in DEPS to 146.0.7663.0 * fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: include new cookie exclusion reason https://chromium-review.googlesource.com/c/chromium/src/+/7486527 * fix: enable libc++ ABI flag for trivially copyable std::vector<bool> Required for changes introduced in the following CL https://chromium-review.googlesource.com/c/chromium/src/+/7513653 * fixup! fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: spellcheck not working in tests https://chromium-review.googlesource.com/c/chromium/src/+/7452579 * fix: cookie test failing due to multiple rejection reasons https://chromium-review.googlesource.com/c/chromium/src/+/7506629 * fix: macos sizing unmaximized window incorrectly https://chromium-review.googlesource.com/c/chromium/src/+/7487666 Changes to headless mode caused the unmaximized window to subtract the height of the menubar. * fix: skip tests for incompatible BoringSSL ML-DSA crypto https://boringssl-review.googlesource.com/c/boringssl/+/84929 * test: fix pseudonymization registration in utility process on Linux Ref: 7486913: Pass pseudonymization salt via shared memory at process launch | https://chromium-review.googlesource.com/c/chromium/src/+/7486913 * fix: restore MAS patch-outs Restores some `#if !IS_MAS_BUILD()` gates dropped in773054ad59* fixup! 7508687: use ChildProcessId for file permission APIs * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor * chore: add note about parallel upstream change * fixup! Merge remote-tracking branch 'origin/main' into roller/chromium/main * Revert "fixup! 7508687: use ChildProcessId for file permission APIs" This reverts commit05c43e4e5d. The _impl version has the signature, but not the public interface. :oof: * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org>
286 lines
9.9 KiB
C++
286 lines
9.9 KiB
C++
// Copyright 2019 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/serial/serial_chooser_context.h"
|
|
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <utility>
|
|
|
|
#include "base/base64.h"
|
|
#include "base/command_line.h"
|
|
#include "base/values.h"
|
|
#include "chrome/browser/serial/serial_blocklist.h"
|
|
#include "content/public/browser/device_service.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
#include "mojo/public/cpp/bindings/pending_remote.h"
|
|
#include "shell/browser/api/electron_api_session.h"
|
|
#include "shell/browser/electron_browser_context.h"
|
|
#include "shell/browser/electron_permission_manager.h"
|
|
#include "shell/browser/web_contents_permission_helper.h"
|
|
#include "shell/common/gin_converters/frame_converter.h"
|
|
#include "shell/common/gin_converters/serial_port_info_converter.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
std::string EncodeToken(const base::UnguessableToken& token) {
|
|
const uint64_t data[2] = {token.GetHighForSerialization(),
|
|
token.GetLowForSerialization()};
|
|
return base::Base64Encode(base::as_byte_span(data));
|
|
}
|
|
|
|
base::Value PortInfoToValue(const device::mojom::SerialPortInfo& port) {
|
|
base::DictValue value;
|
|
if (port.display_name && !port.display_name->empty()) {
|
|
value.Set(kPortNameKey, *port.display_name);
|
|
} else {
|
|
value.Set(kPortNameKey, port.path.LossyDisplayName());
|
|
}
|
|
|
|
if (!SerialChooserContext::CanStorePersistentEntry(port)) {
|
|
value.Set(kTokenKey, EncodeToken(port.token));
|
|
return base::Value(std::move(value));
|
|
}
|
|
|
|
if (port.bluetooth_service_class_id &&
|
|
port.bluetooth_service_class_id->IsValid()) {
|
|
value.Set(kBluetoothDevicePathKey, port.path.LossyDisplayName());
|
|
} else {
|
|
#if BUILDFLAG(IS_WIN)
|
|
// Windows provides a handy device identifier which we can rely on to be
|
|
// sufficiently stable for identifying devices across restarts.
|
|
value.Set(kDeviceInstanceIdKey, port.device_instance_id);
|
|
#else
|
|
CHECK(port.has_vendor_id);
|
|
value.Set(kVendorIdKey, port.vendor_id);
|
|
CHECK(port.has_product_id);
|
|
value.Set(kProductIdKey, port.product_id);
|
|
CHECK(port.serial_number);
|
|
value.Set(kSerialNumberKey, *port.serial_number);
|
|
#if BUILDFLAG(IS_MAC)
|
|
CHECK(port.usb_driver_name && !port.usb_driver_name->empty());
|
|
value.Set(kUsbDriverKey, *port.usb_driver_name);
|
|
#endif // BUILDFLAG(IS_MAC)
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
}
|
|
return base::Value(std::move(value));
|
|
}
|
|
|
|
} // namespace
|
|
|
|
SerialChooserContext::SerialChooserContext(ElectronBrowserContext* context)
|
|
: browser_context_(context) {}
|
|
|
|
SerialChooserContext::~SerialChooserContext() {
|
|
// Notify observers that the chooser context is about to be destroyed.
|
|
// Observers must remove themselves from the observer lists.
|
|
for (auto& observer : port_observer_list_) {
|
|
observer.OnSerialChooserContextShutdown();
|
|
DCHECK(!port_observer_list_.HasObserver(&observer));
|
|
}
|
|
}
|
|
|
|
void SerialChooserContext::GrantPortPermission(
|
|
const url::Origin& origin,
|
|
const device::mojom::SerialPortInfo& port,
|
|
content::RenderFrameHost* render_frame_host) {
|
|
port_info_.try_emplace(port.token, port.Clone());
|
|
|
|
if (CanStorePersistentEntry(port)) {
|
|
auto* permission_manager = static_cast<ElectronPermissionManager*>(
|
|
browser_context_->GetPermissionControllerDelegate());
|
|
permission_manager->GrantDevicePermission(blink::PermissionType::SERIAL,
|
|
origin, PortInfoToValue(port),
|
|
browser_context_);
|
|
return;
|
|
}
|
|
|
|
ephemeral_ports_[origin].insert(port.token);
|
|
}
|
|
|
|
bool SerialChooserContext::HasPortPermission(
|
|
const url::Origin& origin,
|
|
const device::mojom::SerialPortInfo& port,
|
|
content::RenderFrameHost* render_frame_host) {
|
|
bool blocklist_disabled = base::CommandLine::ForCurrentProcess()->HasSwitch(
|
|
kDisableSerialBlocklist);
|
|
if (!blocklist_disabled && SerialBlocklist::Get().IsExcluded(port)) {
|
|
return false;
|
|
}
|
|
|
|
auto it = ephemeral_ports_.find(origin);
|
|
if (it != ephemeral_ports_.end()) {
|
|
const std::set<base::UnguessableToken>& ports = it->second;
|
|
if (ports.contains(port.token))
|
|
return true;
|
|
}
|
|
|
|
if (!CanStorePersistentEntry(port))
|
|
return false;
|
|
|
|
auto* permission_manager = static_cast<ElectronPermissionManager*>(
|
|
browser_context_->GetPermissionControllerDelegate());
|
|
return permission_manager->CheckDevicePermission(
|
|
blink::PermissionType::SERIAL, origin, PortInfoToValue(port),
|
|
browser_context_);
|
|
}
|
|
|
|
void SerialChooserContext::RevokePortPermissionWebInitiated(
|
|
const url::Origin& origin,
|
|
const base::UnguessableToken& token,
|
|
content::RenderFrameHost* render_frame_host) {
|
|
auto it = port_info_.find(token);
|
|
if (it != port_info_.end()) {
|
|
auto* permission_manager = static_cast<ElectronPermissionManager*>(
|
|
browser_context_->GetPermissionControllerDelegate());
|
|
permission_manager->RevokeDevicePermission(
|
|
blink::PermissionType::SERIAL, origin, PortInfoToValue(*it->second),
|
|
browser_context_);
|
|
}
|
|
|
|
auto ephemeral = ephemeral_ports_.find(origin);
|
|
if (ephemeral != ephemeral_ports_.end()) {
|
|
std::set<base::UnguessableToken>& ports = ephemeral->second;
|
|
ports.erase(token);
|
|
}
|
|
|
|
auto* web_contents =
|
|
content::WebContents::FromRenderFrameHost(render_frame_host);
|
|
gin::WeakCell<api::Session>* session =
|
|
api::Session::FromBrowserContext(web_contents->GetBrowserContext());
|
|
if (session && session->Get()) {
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope scope(isolate);
|
|
auto details = gin_helper::Dictionary::CreateEmpty(isolate);
|
|
details.Set("port", it->second);
|
|
details.SetGetter("frame", render_frame_host);
|
|
details.Set("origin", origin.Serialize());
|
|
session->Get()->Emit("serial-port-revoked", details);
|
|
}
|
|
}
|
|
|
|
// static
|
|
bool SerialChooserContext::CanStorePersistentEntry(
|
|
const device::mojom::SerialPortInfo& port) {
|
|
// If there is no display name then the path name will be used instead. The
|
|
// path name is not guaranteed to be stable. For example, on Linux the name
|
|
// "ttyUSB0" is reused for any USB serial device. A name like that would be
|
|
// confusing to show in settings when the device is disconnected.
|
|
if (!port.display_name || port.display_name->empty())
|
|
return false;
|
|
|
|
const bool has_bluetooth = port.bluetooth_service_class_id &&
|
|
port.bluetooth_service_class_id->IsValid() &&
|
|
!port.path.empty();
|
|
if (has_bluetooth) {
|
|
return true;
|
|
}
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
return !port.device_instance_id.empty();
|
|
#else
|
|
const bool has_usb = port.has_vendor_id && port.has_product_id &&
|
|
port.serial_number && !port.serial_number->empty();
|
|
if (!has_usb) {
|
|
return false;
|
|
}
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
// The combination of the standard USB vendor ID, product ID and serial
|
|
// number properties should be enough to uniquely identify a device
|
|
// however recent versions of macOS include built-in drivers for common
|
|
// types of USB-to-serial adapters while their manufacturers still
|
|
// recommend installing their custom drivers. When both are loaded two
|
|
// IOSerialBSDClient instances are found for each device. Including the
|
|
// USB driver name allows us to distinguish between the two.
|
|
if (!port.usb_driver_name || port.usb_driver_name->empty())
|
|
return false;
|
|
#endif // BUILDFLAG(IS_MAC)
|
|
|
|
return true;
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
}
|
|
|
|
const device::mojom::SerialPortInfo* SerialChooserContext::GetPortInfo(
|
|
const base::UnguessableToken& token) {
|
|
DCHECK(is_initialized_);
|
|
auto it = port_info_.find(token);
|
|
return it == port_info_.end() ? nullptr : it->second.get();
|
|
}
|
|
|
|
device::mojom::SerialPortManager* SerialChooserContext::GetPortManager() {
|
|
EnsurePortManagerConnection();
|
|
return port_manager_.get();
|
|
}
|
|
|
|
void SerialChooserContext::AddPortObserver(PortObserver* observer) {
|
|
port_observer_list_.AddObserver(observer);
|
|
}
|
|
|
|
void SerialChooserContext::RemovePortObserver(PortObserver* observer) {
|
|
port_observer_list_.RemoveObserver(observer);
|
|
}
|
|
|
|
base::WeakPtr<SerialChooserContext> SerialChooserContext::AsWeakPtr() {
|
|
return weak_factory_.GetWeakPtr();
|
|
}
|
|
|
|
void SerialChooserContext::OnPortAdded(device::mojom::SerialPortInfoPtr port) {
|
|
if (!port_info_.contains(port->token))
|
|
port_info_.insert({port->token, port->Clone()});
|
|
|
|
for (auto& map_entry : ephemeral_ports_) {
|
|
std::set<base::UnguessableToken>& ports = map_entry.second;
|
|
ports.erase(port->token);
|
|
}
|
|
|
|
port_observer_list_.Notify(&PortObserver::OnPortAdded, *port);
|
|
}
|
|
|
|
void SerialChooserContext::OnPortRemoved(
|
|
device::mojom::SerialPortInfoPtr port) {
|
|
port_observer_list_.Notify(&PortObserver::OnPortRemoved, *port);
|
|
port_info_.erase(port->token);
|
|
}
|
|
|
|
void SerialChooserContext::EnsurePortManagerConnection() {
|
|
if (port_manager_)
|
|
return;
|
|
|
|
mojo::PendingRemote<device::mojom::SerialPortManager> manager;
|
|
content::GetDeviceService().BindSerialPortManager(
|
|
manager.InitWithNewPipeAndPassReceiver());
|
|
SetUpPortManagerConnection(std::move(manager));
|
|
}
|
|
|
|
void SerialChooserContext::SetUpPortManagerConnection(
|
|
mojo::PendingRemote<device::mojom::SerialPortManager> manager) {
|
|
port_manager_.Bind(std::move(manager));
|
|
port_manager_.set_disconnect_handler(
|
|
base::BindOnce(&SerialChooserContext::OnPortManagerConnectionError,
|
|
base::Unretained(this)));
|
|
|
|
port_manager_->SetClient(client_receiver_.BindNewPipeAndPassRemote());
|
|
port_manager_->GetDevices(base::BindOnce(&SerialChooserContext::OnGetDevices,
|
|
weak_factory_.GetWeakPtr()));
|
|
}
|
|
|
|
void SerialChooserContext::OnGetDevices(
|
|
std::vector<device::mojom::SerialPortInfoPtr> ports) {
|
|
for (auto& port : ports)
|
|
port_info_.try_emplace(port->token, std::move(port));
|
|
is_initialized_ = true;
|
|
}
|
|
|
|
void SerialChooserContext::OnPortManagerConnectionError() {
|
|
port_manager_.reset();
|
|
client_receiver_.reset();
|
|
|
|
port_info_.clear();
|
|
ephemeral_ports_.clear();
|
|
}
|
|
} // namespace electron
|