![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 137.0.7107.0 * chore: bump chromium in DEPS to 137.0.7109.0 * chore: bump chromium in DEPS to 137.0.7111.0 * chore: bump chromium in DEPS to 137.0.7113.0 * 6384240: Remove double-declaration for accessibility on macOS |6384240
* 6422872: Remove unused includes in isolation_info_mojom_traits.h |6422872
* chore: update patches * 6400733: Avoid ipc_message_macros.h usage in some foo_param_traits_macros.h files |6400733
* chore: update patches * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: iwyu * refactor: prefer value initialization over memset() From the looks up upstream commits in base/, it looks like memset() could trigger `-Wunsafe-buffer-usage` warnings soon? Value initialization is more C++ish and less error-prone anyway, due to memset()'s easily swappable parameters. * refactor: NotifyIcon::InitIconData() returns a NOTIFYICONDATA This follows F.20 in the C++ Core Guidelines and also removes the need for memset() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - strcmp() * fixup! 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: bump chromium in DEPS to 137.0.7115.0 * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: update patches * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* fix: add pragma for MacSDK unsafe buffers | 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: bump chromium in DEPS to 137.0.7117.0 * chore: update patches * chore: update filesnames.libcxx.gni * 6431756: Replace SetOwnedByWidget() bool arg with a PassKey. |6431756
* 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* 6428345: Remove ExtensionService usage from ChromeExtensionRegistrarDelegate |6428345
* 6384315: Migrate extensions_enabled from ExtensionService to Registrar |6384315
* 6428749: [extensions] Refactor ExtensionService for AddNewAndUpdateExtension. |6428749
* chore: bump chromium in DEPS to 137.0.7119.0 * 6440290: corner-shape: support inset shadow |6440290
* 6429230: FSA: Move blocked paths to the PermissionContext class |6429230
* chore: update patches * chore: bump chromium in DEPS to 137.0.7121.0 * chore: update patches * fix: partially revert 6443473: Remove ItemDelete from the Mac version of AppleKeychain |6443473
* fix: update filenames.libcxx.gni * chore: bump chromium in DEPS to 137.0.7123.0 * chore: update patches * chore: "grandfather in" electron views too Lock further access to View::set_owned_by_client() |6448510
* chore: update feat_corner_smoothing_css_rule_and_blink_painting.patch corner-shape: support inset shadow |6440290
* refactor: grandfather in AutofillPopupView as a subclass of WidgetDelegateView Add a PassKey for std::make_unique<WidgetDelegateView>() |6442265
* Provide dbus appmenu information on Wayland |6405535
* [extensions] Move OnExtensionInstalled out of ExtensionService. |6443325
* refactor: grandfather in NativeWindowViews for delete callbacks 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: merge the four "grandfather" patches into one * [A11yPerformance] Remove IsAccessibilityAllowed() | 6404386: [A11yPerformance] Remove IsAccessibilityAllowed() |6404386
NB: the changes here are copied from the upstream changes in chrome/browser/ui/webui/accessibility/accessibility_ui.cc * 6420753: [PermissionOptions] Use PermissionDescriptorPtr in PermissionController |6420753
* 6429573: [accessibility] Move mode change out of AccessibilityNotificationWaiter |6429573
* chore: e patches all * 6419936: [win] Change ScreenWin public static methods to virtual |6419936
* 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - fprintf() - fputs() - snprintf() - vsnprintf() * fix: size conversion FTBFS on Win * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcscpy_s() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcsncpy_s() * chore: update mas_avoid_private_macos_api_usage.patch.patch 6394283: Remove double-declaration for accessibility on iOS |6394283
Lots of context shear in this commit but the only interesting part is: -+ return nullptr; ++ return {}; Which is needed because the return type is sometimes not a pointer. * chore: e patches all * chore: disable -Wmacro-redefined warning in electron_main_win.cc * chore: bump chromium in DEPS to 137.0.7123.5 * refactor: patch electron PermissionTypes into blink 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: e patches all * chore: remove the box_painter_base.cc part of feat_corner_smoothing_css_rule_and_blink_painting.patch as per code review @ https://github.com/electron/electron/pull/46482#pullrequestreview-2777338370 * test: enable window-smaller-than-64x64 test on Linux * chore: bump chromium in DEPS to 137.0.7124.1 * chore: bump chromium in DEPS to 137.0.7125.1 * chore: bump chromium in DEPS to 137.0.7127.3 * 6459201: [Extensions] Remove ExtensionSystem::FinishDelayedInstallationIfReady() |6459201
* 6454796: [Extensions] Move (most) registrar delayed install logic to //extensions |6454796
* chore: bump chromium in DEPS to 137.0.7128.1 * chore: e patches all * chore: node ./script/gen-libc++-filenames.js * [views] Gate DesktopWindowTreeHostWin::window_enlargement_ behind flag Refs6428649
* feat: allow opt-out animated_content_sampler. Refs6438681
* Trigger CI --------- 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: Charles Kerr <charles@charleskerr.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
172 lines
6.6 KiB
C++
172 lines
6.6 KiB
C++
// Copyright (c) 2016 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef ELECTRON_SHELL_BROWSER_ELECTRON_PERMISSION_MANAGER_H_
|
|
#define ELECTRON_SHELL_BROWSER_ELECTRON_PERMISSION_MANAGER_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "base/containers/id_map.h"
|
|
#include "base/functional/callback_forward.h"
|
|
#include "base/values.h"
|
|
#include "content/public/browser/permission_controller_delegate.h"
|
|
|
|
namespace content {
|
|
class WebContents;
|
|
}
|
|
|
|
namespace gin_helper {
|
|
class Dictionary;
|
|
} // namespace gin_helper
|
|
|
|
namespace v8 {
|
|
class Object;
|
|
template <typename T>
|
|
class Local;
|
|
} // namespace v8
|
|
|
|
namespace electron {
|
|
|
|
class ElectronBrowserContext;
|
|
|
|
class ElectronPermissionManager : public content::PermissionControllerDelegate {
|
|
public:
|
|
ElectronPermissionManager();
|
|
~ElectronPermissionManager() override;
|
|
|
|
// disable copy
|
|
ElectronPermissionManager(const ElectronPermissionManager&) = delete;
|
|
ElectronPermissionManager& operator=(const ElectronPermissionManager&) =
|
|
delete;
|
|
|
|
using USBProtectedClasses = std::vector<uint8_t>;
|
|
|
|
using StatusCallback =
|
|
base::OnceCallback<void(blink::mojom::PermissionStatus)>;
|
|
using StatusesCallback = base::OnceCallback<void(
|
|
const std::vector<blink::mojom::PermissionStatus>&)>;
|
|
using PairCallback = base::OnceCallback<void(base::Value::Dict)>;
|
|
using RequestHandler = base::RepeatingCallback<void(content::WebContents*,
|
|
blink::PermissionType,
|
|
StatusCallback,
|
|
const base::Value&)>;
|
|
using CheckHandler =
|
|
base::RepeatingCallback<bool(content::WebContents*,
|
|
blink::PermissionType,
|
|
const GURL& requesting_origin,
|
|
const base::Value&)>;
|
|
|
|
using DeviceCheckHandler =
|
|
base::RepeatingCallback<bool(const v8::Local<v8::Object>&)>;
|
|
|
|
using ProtectedUSBHandler = base::RepeatingCallback<USBProtectedClasses(
|
|
const v8::Local<v8::Object>&)>;
|
|
|
|
using BluetoothPairingHandler =
|
|
base::RepeatingCallback<void(gin_helper::Dictionary, PairCallback)>;
|
|
|
|
void RequestPermissionWithDetails(
|
|
blink::mojom::PermissionDescriptorPtr permission,
|
|
content::RenderFrameHost* render_frame_host,
|
|
const GURL& requesting_origin,
|
|
bool user_gesture,
|
|
base::Value::Dict details,
|
|
StatusCallback response_callback);
|
|
|
|
// Handler to dispatch permission requests in JS.
|
|
void SetPermissionRequestHandler(const RequestHandler& handler);
|
|
void SetPermissionCheckHandler(const CheckHandler& handler);
|
|
void SetDevicePermissionHandler(const DeviceCheckHandler& handler);
|
|
void SetProtectedUSBHandler(const ProtectedUSBHandler& handler);
|
|
void SetBluetoothPairingHandler(const BluetoothPairingHandler& handler);
|
|
|
|
void CheckBluetoothDevicePair(gin_helper::Dictionary details,
|
|
PairCallback pair_callback) const;
|
|
|
|
bool CheckPermissionWithDetails(blink::PermissionType permission,
|
|
content::RenderFrameHost* render_frame_host,
|
|
const GURL& requesting_origin,
|
|
base::Value::Dict details) const;
|
|
|
|
bool CheckDevicePermission(blink::PermissionType permission,
|
|
const url::Origin& origin,
|
|
const base::Value& object,
|
|
ElectronBrowserContext* browser_context) const;
|
|
|
|
void GrantDevicePermission(blink::PermissionType permission,
|
|
const url::Origin& origin,
|
|
const base::Value& object,
|
|
ElectronBrowserContext* browser_context) const;
|
|
|
|
void RevokeDevicePermission(blink::PermissionType permission,
|
|
const url::Origin& origin,
|
|
const base::Value& object,
|
|
ElectronBrowserContext* browser_context) const;
|
|
|
|
USBProtectedClasses CheckProtectedUSBClasses(
|
|
const USBProtectedClasses& classes) const;
|
|
|
|
protected:
|
|
void OnPermissionResponse(int request_id,
|
|
int permission_id,
|
|
blink::mojom::PermissionStatus status);
|
|
|
|
// content::PermissionControllerDelegate:
|
|
void RequestPermissions(
|
|
content::RenderFrameHost* render_frame_host,
|
|
const content::PermissionRequestDescription& request_description,
|
|
StatusesCallback callback) override;
|
|
void ResetPermission(blink::PermissionType permission,
|
|
const GURL& requesting_origin,
|
|
const GURL& embedding_origin) override;
|
|
blink::mojom::PermissionStatus GetPermissionStatus(
|
|
blink::PermissionType permission,
|
|
const GURL& requesting_origin,
|
|
const GURL& embedding_origin) override;
|
|
void RequestPermissionsFromCurrentDocument(
|
|
content::RenderFrameHost* render_frame_host,
|
|
const content::PermissionRequestDescription& request_description,
|
|
base::OnceCallback<
|
|
void(const std::vector<blink::mojom::PermissionStatus>&)> callback)
|
|
override;
|
|
content::PermissionResult GetPermissionResultForOriginWithoutContext(
|
|
blink::PermissionType permission,
|
|
const url::Origin& requesting_origin,
|
|
const url::Origin& embedding_origin) override;
|
|
blink::mojom::PermissionStatus GetPermissionStatusForCurrentDocument(
|
|
blink::PermissionType permission,
|
|
content::RenderFrameHost* render_frame_host,
|
|
bool should_include_device_status) override;
|
|
blink::mojom::PermissionStatus GetPermissionStatusForWorker(
|
|
blink::PermissionType permission,
|
|
content::RenderProcessHost* render_process_host,
|
|
const GURL& worker_origin) override;
|
|
blink::mojom::PermissionStatus GetPermissionStatusForEmbeddedRequester(
|
|
blink::PermissionType permission,
|
|
content::RenderFrameHost* render_frame_host,
|
|
const url::Origin& requesting_origin) override;
|
|
|
|
private:
|
|
class PendingRequest;
|
|
using PendingRequestsMap = base::IDMap<std::unique_ptr<PendingRequest>>;
|
|
|
|
void RequestPermissionsWithDetails(
|
|
content::RenderFrameHost* render_frame_host,
|
|
const content::PermissionRequestDescription& request_description,
|
|
base::Value::Dict details,
|
|
StatusesCallback callback);
|
|
|
|
RequestHandler request_handler_;
|
|
CheckHandler check_handler_;
|
|
DeviceCheckHandler device_permission_handler_;
|
|
ProtectedUSBHandler protected_usb_handler_;
|
|
BluetoothPairingHandler bluetooth_pairing_handler_;
|
|
|
|
PendingRequestsMap pending_requests_;
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_ELECTRON_PERMISSION_MANAGER_H_
|