46f3491c7d
* chore: bump chromium in DEPS to d5c9bf9e2a18fa508201a88e5803bec1d107b1ae * chore: bump chromium in DEPS to 45f1316afae33e52c92480b34bf4f7fe4a7db898 * update patches * WillCreateURLLoaderFactory now gets a ukm_source_id Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2346803 * ink_drop_visible_opacity -> GetInkDropVisibleOpacity Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2415368 * chore: bump chromium in DEPS to ddb5b6db5e35ab1a7b5adbd9f15373af6c35ea2a * 2418471: PDF Viewer update: Add missing aria-labels to various buttons. https://chromium-review.googlesource.com/c/chromium/src/+/2418471 * update printing.patch given print settings mojoification Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2409467 * update patches * content::BluetoothChooser::Event -> content::BluetoothChooserEvent Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2387901 * set_ink_drop_base_color -> SetInkDropBaseColor Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2419388 * chore: bump chromium in DEPS to ecf7c9ee830d4d85f300b461a2fa13aa40c79a4c * update patches * gfx::ConvertPointToPixel -> gfx::ConvertPointToPixels Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2418568 * remove ContentSettingsObserver::AllowStorage() Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2401847 * service_manager::kCrashDumpSignal -> kCrashDumpSignal Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2417073 * chore: bump chromium in DEPS to abdb7ebe5f8c8328b8f435283df90d0a3ecff7bd * chore: bump chromium in DEPS to 2a7e138ab1066534ceb2622e8a9d2c8ebf574215 * chore: bump chromium in DEPS to ab1884e75ced904e4276851eb4e1ad89919ca93b * chore: bump chromium in DEPS to a12413902380dcc2a73ac74d582328280a8af686 * Fixup printing patch https://chromium-review.googlesource.com/c/chromium/src/+/2428623 * Fixup OSR patch https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * Make ExtensionURLLoaderFactory always owned by its |receivers_|. https://chromium-review.googlesource.com/c/chromium/src/+/2357523 * Add deprecated_default_sources_assignment_filter variable https://chromium-review.googlesource.com/c/chromium/src/+/2416496 * Fixup patch indices * Remove several references to BrowserPlugin from content https://chromium-review.googlesource.com/c/chromium/src/+/2401031 * Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * Add DragOperation and AllowedDragOperations Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/2196167 * chore: bump chromium in DEPS to 378450342cf6aa160663d0ce3a178a11b570c25a * Fixup patch indices * Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * Add DragOperation and AllowedDragOperations Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/2196167 * 2426564: Remove global sources assignment filter value https://chromium-review.googlesource.com/c/chromium/src/+/2426564 * Fixup blink_local_frame.patch * [XProto] Remove a subset of ui/gfx/x/x11.h https://chromium-review.googlesource.com/c/chromium/src/+/2430328 * Fixup patch indices * Remove several references to BrowserPlugin from content https://chromium-review.googlesource.com/c/chromium/src/+/2401031 * Remove lossy ConvertSizeToPixel() methods https://chromium-review.googlesource.com/c/chromium/src/+/2419534 * serial: Use USB driver name to disambiguate ports https://chromium-review.googlesource.com/c/chromium/src/+/2413176 * Remove set_sources_filter import * Fix ModMask usage * [XProto] Remove usage of all Xlib headers https://chromium-review.googlesource.com/c/chromium/src/+/2392140 * [XProto] Remove usage of Xlib Visuals https://chromium-review.googlesource.com/c/chromium/src/+/2429933 * Skip Angle manifest file https://chromium-review.googlesource.com/c/angle/angle/+/2425197 * Add whole src\third_party\angle\.git directory This directory is needed in order to properly generate gen/angle/angle_commit.h * [libvpx] Fix HighBD config on Windows ARM64 https://chromium-review.googlesource.com/c/chromium/src/+/2437745 * update patches * fix: correct calling convention for Windows on Arm https://chromium-review.googlesource.com/c/v8/v8/+/2440717 * Add third_party/angle/.git to the archive before adding the rest of the source * fixup source caching on Windows * Fixup erroneous close paren * fixup for goma issues * This should work * chore: bump chromium roll manually https://chromium-review.googlesource.com/c/chromium/src/+/2435142 This landed the day after we paused roller-bot and may resolve the visibility test flakes that we're seeing. h/t to @jkleinsc for finding this with me. * chore: remove obsoleted cherry-pick fix for libvpx https://chromium-review.googlesource.com/c/chromium/src/+/2437745 * chore: remove obsoleted cherry-pick libvpx patch https://chromium-review.googlesource.com/c/chromium/src/+/2437745 * chore: re-export patches * chore: add tracer comment to visibility-stat-spec. The line numbers between the source and the CI runs don't seem to match up, so this temp tracer is to help track the source of that difference. * chore: bump chromium in DEPS to 7c2b8cc3b8638aee8abeb013042a6c1d15b2da6b * update patches * impl SortingLSH service Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2425327 * 2446525: [Flash] Remove some Flash APIs https://chromium-review.googlesource.com/c/chromium/src/+/2446525 * 2440974: Reland "Delete service_manager/embedder/switches.h" https://chromium-review.googlesource.com/c/chromium/src/+/2440974 * 2359402: Remove ContentBrowserClient::NonNetworkURLLoaderFactoryDeprecatedMap. https://chromium-review.googlesource.com/c/chromium/src/+/2359402 * 2250506: Implement tabs.removeCSS https://chromium-review.googlesource.com/c/chromium/src/+/2250506 * 2429143: Remove implicit-conversion-to-integer ConvertRectToPixel() methods. https://chromium-review.googlesource.com/c/chromium/src/+/2429143 * 2444430: Remove DataElementType::kBlob https://chromium-review.googlesource.com/c/chromium/src/+/2444430 * 2441964: Clean up WebView public API https://chromium-review.googlesource.com/c/chromium/src/+/2441964 * 2357523: Make ExtensionURLLoaderFactory always owned by its |receivers_|. https://chromium-review.googlesource.com/c/chromium/src/+/2357523 * 2461606: Use blink::mojom::PreferredColorScheme instead of blink::PreferredColorScheme https://chromium-review.googlesource.com/c/chromium/src/+/2461606 * 2461235: a11y inspect reorg: move PropertyFilter struct to a new location https://chromium-review.googlesource.com/c/chromium/src/+/2461235 * remove flash support * fix frame_host_manager patch * fix lint * remove flash info from docs * fix build * fix osr * chore: bump chromium in DEPS to 9269f9eb1d98d29564c2b2ab97f30c6e148c4e11 * fix visibilityState tests * 2463049: Replace all uses of web_pref::AutoplayPolicy with mojom::AutoplayPolicy https://chromium-review.googlesource.com/c/chromium/src/+/2463049 * update patches * fix tests harder * 2414921: Add Group and Ungroup functions to Tabs extension API https://chromium-review.googlesource.com/c/chromium/src/+/2414921 * more test fix * Remove all keyboard related usage of Xlib Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2436787 * fix linux build * 2453807: [XProto] Remove usage of Xlib error handling https://chromium-review.googlesource.com/c/chromium/src/+/2453807 * lint * fixup! 2453807: [XProto] Remove usage of Xlib error handling * disable CalculateNativeWinOcclusion on win ci * remove UploadBlob from docs * Update appveyor.yml Co-authored-by: Andy Locascio <andy@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
211 lines
6.9 KiB
C++
211 lines
6.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 <utility>
|
|
|
|
#include "base/base64.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "base/values.h"
|
|
#include "content/public/browser/device_service.h"
|
|
#include "mojo/public/cpp/bindings/pending_remote.h"
|
|
|
|
namespace electron {
|
|
|
|
constexpr char kPortNameKey[] = "name";
|
|
constexpr char kTokenKey[] = "token";
|
|
#if defined(OS_WIN)
|
|
constexpr char kDeviceInstanceIdKey[] = "device_instance_id";
|
|
#else
|
|
constexpr char kVendorIdKey[] = "vendor_id";
|
|
constexpr char kProductIdKey[] = "product_id";
|
|
constexpr char kSerialNumberKey[] = "serial_number";
|
|
#if defined(OS_MAC)
|
|
constexpr char kUsbDriverKey[] = "usb_driver";
|
|
#endif // defined(OS_MAC)
|
|
#endif // defined(OS_WIN)
|
|
|
|
std::string EncodeToken(const base::UnguessableToken& token) {
|
|
const uint64_t data[2] = {token.GetHighForSerialization(),
|
|
token.GetLowForSerialization()};
|
|
std::string buffer;
|
|
base::Base64Encode(
|
|
base::StringPiece(reinterpret_cast<const char*>(&data[0]), sizeof(data)),
|
|
&buffer);
|
|
return buffer;
|
|
}
|
|
|
|
base::UnguessableToken DecodeToken(base::StringPiece input) {
|
|
std::string buffer;
|
|
if (!base::Base64Decode(input, &buffer) ||
|
|
buffer.length() != sizeof(uint64_t) * 2) {
|
|
return base::UnguessableToken();
|
|
}
|
|
|
|
const uint64_t* data = reinterpret_cast<const uint64_t*>(buffer.data());
|
|
return base::UnguessableToken::Deserialize(data[0], data[1]);
|
|
}
|
|
|
|
base::Value PortInfoToValue(const device::mojom::SerialPortInfo& port) {
|
|
base::Value value(base::Value::Type::DICTIONARY);
|
|
if (port.display_name && !port.display_name->empty())
|
|
value.SetStringKey(kPortNameKey, *port.display_name);
|
|
else
|
|
value.SetStringKey(kPortNameKey, port.path.LossyDisplayName());
|
|
|
|
if (!SerialChooserContext::CanStorePersistentEntry(port)) {
|
|
value.SetStringKey(kTokenKey, EncodeToken(port.token));
|
|
return value;
|
|
}
|
|
|
|
#if defined(OS_WIN)
|
|
// Windows provides a handy device identifier which we can rely on to be
|
|
// sufficiently stable for identifying devices across restarts.
|
|
value.SetStringKey(kDeviceInstanceIdKey, port.device_instance_id);
|
|
#else
|
|
DCHECK(port.has_vendor_id);
|
|
value.SetIntKey(kVendorIdKey, port.vendor_id);
|
|
DCHECK(port.has_product_id);
|
|
value.SetIntKey(kProductIdKey, port.product_id);
|
|
DCHECK(port.serial_number);
|
|
value.SetStringKey(kSerialNumberKey, *port.serial_number);
|
|
|
|
#if defined(OS_MAC)
|
|
DCHECK(port.usb_driver_name && !port.usb_driver_name->empty());
|
|
value.SetStringKey(kUsbDriverKey, *port.usb_driver_name);
|
|
#endif // defined(OS_MAC)
|
|
#endif // defined(OS_WIN)
|
|
return value;
|
|
}
|
|
|
|
SerialChooserContext::SerialChooserContext() = default;
|
|
SerialChooserContext::~SerialChooserContext() = default;
|
|
|
|
void SerialChooserContext::GrantPortPermission(
|
|
const url::Origin& requesting_origin,
|
|
const url::Origin& embedding_origin,
|
|
const device::mojom::SerialPortInfo& port) {
|
|
base::Value value = PortInfoToValue(port);
|
|
port_info_.insert({port.token, value.Clone()});
|
|
|
|
ephemeral_ports_[{requesting_origin, embedding_origin}].insert(port.token);
|
|
}
|
|
|
|
bool SerialChooserContext::HasPortPermission(
|
|
const url::Origin& requesting_origin,
|
|
const url::Origin& embedding_origin,
|
|
const device::mojom::SerialPortInfo& port) {
|
|
auto it = ephemeral_ports_.find({requesting_origin, embedding_origin});
|
|
if (it != ephemeral_ports_.end()) {
|
|
const std::set<base::UnguessableToken> ports = it->second;
|
|
if (base::Contains(ports, port.token))
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
// 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;
|
|
|
|
#if defined(OS_WIN)
|
|
return !port.device_instance_id.empty();
|
|
#else
|
|
if (!port.has_vendor_id || !port.has_product_id || !port.serial_number ||
|
|
port.serial_number->empty()) {
|
|
return false;
|
|
}
|
|
|
|
#if defined(OS_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 // defined(OS_MAC)
|
|
|
|
return true;
|
|
#endif // defined(OS_WIN)
|
|
}
|
|
|
|
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) {
|
|
for (auto& observer : port_observer_list_)
|
|
observer.OnPortAdded(*port);
|
|
}
|
|
|
|
void SerialChooserContext::OnPortRemoved(
|
|
device::mojom::SerialPortInfoPtr port) {
|
|
for (auto& observer : port_observer_list_)
|
|
observer.OnPortRemoved(*port);
|
|
|
|
std::vector<std::pair<url::Origin, url::Origin>> revoked_url_pairs;
|
|
for (auto& map_entry : ephemeral_ports_) {
|
|
std::set<base::UnguessableToken>& ports = map_entry.second;
|
|
if (ports.erase(port->token) > 0) {
|
|
revoked_url_pairs.push_back(map_entry.first);
|
|
}
|
|
}
|
|
|
|
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());
|
|
}
|
|
|
|
void SerialChooserContext::OnPortManagerConnectionError() {
|
|
port_manager_.reset();
|
|
client_receiver_.reset();
|
|
|
|
port_info_.clear();
|
|
|
|
ephemeral_ports_.clear();
|
|
}
|
|
|
|
} // namespace electron
|