mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 118.0.5951.0 * chore: bump chromium in DEPS to 118.0.5953.1 * chore: bump chromium in DEPS to 118.0.5955.1 * chore: bump chromium in DEPS to 118.0.5957.1 * chore: bump chromium in DEPS to 118.0.5959.1 * chore: bump chromium in DEPS to 118.0.5961.1 * chore: bump chromium in DEPS to 118.0.5963.1 * chore: bump chromium in DEPS to 118.0.5965.2 * chore: bump chromium in DEPS to 118.0.5967.1 * chore: bump chromium in DEPS to 118.0.5969.1 * chore: bump chromium in DEPS to 118.0.5971.1 * chore: bump chromium in DEPS to 118.0.5973.1 * chore: bump chromium in DEPS to 118.0.5975.1 * chore: bump chromium in DEPS to 118.0.5977.1 * chore: bump chromium in DEPS to 118.0.5979.1 * chore: bump chromium in DEPS to 118.0.5981.0 * chore: bump chromium in DEPS to 118.0.5981.1 * chore: bump chromium in DEPS to 118.0.5983.1 * chore: bump chromium in DEPS to 118.0.5985.1 * chore: bump chromium in DEPS to 118.0.5987.1 * chore: bump chromium in DEPS to 118.0.5989.1 * chore: bump chromium in DEPS to 118.0.5991.1 * chore: bump chromium in DEPS to 118.0.5993.1 * chore: bump chromium to 118.0.5975.0 (main) (#39531) * chore: bump chromium in DEPS to 118.0.5951.0 * chore: update printing.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4727894 No logic changes, but patch needed to be manually re-applied due to upstream code shear * chore: update port_autofill_colors_to_the_color_pipeline.patch No manual changes; patch applied with fuzz * chore: update patches * chore: bump chromium in DEPS to 118.0.5953.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5955.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5957.0 * chore: update patches * chore: include path of native_web_keyboard_event.h Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689 * chore: remove reference to eextensions/browser/notification-types.h Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4771627 * chore: update references to renamed upstream field NativeWebKeyboardEvent.skip_if_unhandled (formerly known as skip_in_browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689 Need a second pair of eyes on this commit. In particular the reference in content_converter.cc, skipInBrowser, seems to not be set or documented anywhere? Is this unused/vestigal code? * chore: sync signature of ElectronExtensionsBrowserClient::IsValidContext() to upstream change Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4784198 * chore: add auto_pip_setting_helper.[cc,h] to chromium_src build Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4688277 Exiting upstream code used by chromium_src now depends on this new upstream class * chore: bump chromium in DEPS to 118.0.5959.0 * chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: add_maximized_parameter_to_linuxui_getwindowframeprovider.patch manually adjust patch to minor upstream chagnes * chore: update patches * chore: bump chromium in DEPS to 118.0.5961.0 * chore: bump chromium in DEPS to 118.0.5963.0 * chore: update patches * 4780994: Rename various base files to "apple" since iOS uses them too https://chromium-review.googlesource.com/c/chromium/src/+/4780994 * Many files moved from `mac` -> `apple` This commit follows a handful of CLs that simply rename files/symbols to change `mac` to `apple` to signify their use across both macOS and iOS: - 4784010: Move scoped_nsautorelease_pool to base/apple, leave a forwarding header - 4790744: Move foundation_util to base/apple, leave a forwarding header - 4790741: Move scoped_cftypreref to base/apple, leave a forwarding header - 4787627: Move and rename macOS+iOS base/ files in PA to "apple" - 4780399: Move OSStatus logging to base/apple - 4787387: Remove forwarding headers - 4781113: Rename message_pump_mac to "apple" because iOS uses it too * fixup minor patch update error A function param got dropped from this patch somewhere earlier * chore: bump chromium in DEPS to 118.0.5965.2 * chore: update patches * 4799213: Move ScopedTypeRef and ScopedCFTypeRef into base::apple:: https://chromium-review.googlesource.com/c/chromium/src/+/4799213 * Fix removed include to BrowserContext In crrev.com/c/4767962 an include to BrowserContext was removed, which was necessary for compilation. This broke only for us because "chrome/browser/profiles/profile.h" includes that class, but we remove all references to profiles. * chore: bump chromium in DEPS to 118.0.5967.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5969.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5971.0 * chore: bump chromium in DEPS to 118.0.5973.0 * chore: update patches * 4772121: [OOPIF PDF] Replace PDFWebContentsHelper with PDFDocumentHelper https://chromium-review.googlesource.com/c/chromium/src/+/4772121 * 4811164: [Extensions] Do some cleanup in ChromeManagementAPIDelegate. https://chromium-review.googlesource.com/c/chromium/src/+/4811164 * 4809488: Remove duplicate dnd functionality between Web and Renderer prefs https://chromium-review.googlesource.com/c/chromium/src/+/4809488 Given that this is no longer an option of web preferences, we should consider deprecating this option and then removing it. * chore: bump chromium in DEPS to 118.0.5975.0 * chore: update patches * fixup! chore: add auto_pip_settings_helper.{cc|h} to chromium_src build * Reland "[windows] Remove RegKey::DeleteEmptyKey" Refs https://chromium-review.googlesource.com/c/chromium/src/+/4813255 * Ensure StrCat means StrCat Refs https://chromium-review.googlesource.com/c/chromium/src/+/1117180 * fixup! Remove RegKey::DeleteEmptyKey * Consistently reject large p and large q in DH Refs https://boringssl-review.googlesource.com/c/boringssl/+/62226 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> (cherry picked from commit89117fdd99) * chore: bump chromium to 118.0.5991.0 (main) (#39714) * chore: bump chromium in DEPS to 118.0.5982.0 * chore: bump chromium in DEPS to 118.0.5983.0 * chore: bump chromium in DEPS to 118.0.5985.0 * chore: bump chromium in DEPS to 118.0.5987.0 * chore: update v8 patches * chore: update chromium patches * chore: update patches * [PEPC] Add new structs to contain permission request data Refs https://chromium-review.googlesource.com/c/chromium/src/+/4756727 * Add ThumbnailCapturer interface Refs https://chromium-review.googlesource.com/c/chromium/src/+/4812256 * Reland "[ChromeRefresh2023] Update document pip windows for Chrome Refresh" Refs https://chromium-review.googlesource.com/c/chromium/src/+/4814275 * chore: bump chromium in DEPS to 118.0.5989.0 * chore: bump chromium in DEPS to 118.0.5991.0 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> (cherry picked from commitd9ba26273a) * fix: broken `chrome.scripting` compilation (#39725) fix: broken chrome.scripting impl after roll (cherry picked from commit54d8402a6c) * chore: bump chromium in DEPS to 118.0.5993.1 * chore: update patches * chore: bump chromium in DEPS to 118.0.5993.5 * test: use default timeout (cherry picked from commitcbc4980d69) --------- 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: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
173 lines
7.1 KiB
C++
173 lines
7.1 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.h"
|
|
#include "content/public/browser/permission_controller_delegate.h"
|
|
#include "gin/dictionary.h"
|
|
#include "shell/browser/electron_browser_context.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
|
|
namespace base {
|
|
class Value;
|
|
} // namespace base
|
|
|
|
namespace content {
|
|
class WebContents;
|
|
}
|
|
|
|
namespace electron {
|
|
|
|
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::PermissionType 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) 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;
|
|
SubscriptionId SubscribePermissionStatusChange(
|
|
blink::PermissionType permission,
|
|
content::RenderProcessHost* render_process_host,
|
|
content::RenderFrameHost* render_frame_host,
|
|
const GURL& requesting_origin,
|
|
base::RepeatingCallback<void(blink::mojom::PermissionStatus)> callback)
|
|
override;
|
|
void UnsubscribePermissionStatusChange(SubscriptionId id) 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_
|