cc01272a8d
* chore: bump chromium in DEPS to 95.0.4630.0 * 3133701: Fix chrome root store codegen for cross-compile builds. https://chromium-review.googlesource.com/c/chromium/src/+/3133701 * 49125: Include SHA512-256 in EVP_get_digestbyname and EVP_MD_do_all. https://boringssl-review.googlesource.com/c/boringssl/+/49125 * chore: fixup patch indices * 3131662: [Code Health] Remove ListValue::Append(Integer|Boolean) https://chromium-review.googlesource.com/c/chromium/src/+/3131662 * chore: bump chromium in DEPS to 95.0.4631.0 * chore: update patches * chore: bump chromium in DEPS to 95.0.4635.0 * chore: update patches * chore: bump chromium in DEPS to 95.0.4636.0 * chore: bump chromium in DEPS to 95.0.4637.0 * chore: update patches * refactor: move PlatformNotificationService into BrowserContext Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3137256 * refactor: ListValue::GetSize and ListValue::AppendString were removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3144540 * chore: bump chromium in DEPS to 95.0.4638.0 * chore: bump chromium in DEPS to 95.0.4638.4 * chore: bump chromium in DEPS to 96.0.4640.0 * chore: bump chromium in DEPS to 96.0.4641.0 * chore: bump chromium in DEPS to 96.0.4642.0 * chore: update patches Co-authored-by: Michaela Laurencin <mlaurencin@electronjs.org> * 3134756: Move extensions/browser/value_store to components/value_store. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3134756 * 3150092: [Autofill] Allow aligning Autofill suggestions to the field's center Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3150092 * chore: bump chromium in DEPS to 96.0.4643.0 * chore: update patches * chore: bump chromium in DEPS to 96.0.4644.0 * chore: update patches * chore: bump chromium in DEPS to 96.0.4645.0 * chore: update patches * chore: bump chromium in DEPS to 96.0.4646.0 * chore: bump chromium in DEPS to 96.0.4647.0 * chore: update patches Ref (for chromium): https://chromium-review.googlesource.com/c/chromium/src/+/3165772 * 3162087: Reland "Ensure Branch Target Identification is enabled for executable pages." Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3162087 * chore: update evert_add_inline_and_inline_origin_records_to_symbol_file.patch Xref: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3166678 Xref: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3166674 * chore: update Allocator construction Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3135195 Change RefCount::kAllowed/Disallowed semantics into BackupRefPtr::kEnabled/Disabled * chore: add UseConfigurablePool to v8::ArrayBuffer::Allocator invocation Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3090845 * chore: do not set network_context_params.context_name Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3155743 Remove name field from mojom::NetworkContext * fix: use ForEachRenderFrameHost to iterate frames. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3163336 New implementation partially cribbed from https://source.chromium.org/chromium/chromium/src/+/main:extensions/browser/script_executor.cc;drc=f894f106c6d5fac8e0b75158f622256e0f34f593;l=109 * [Blink Cleanup] Remove WebLocalFrame::RequestExecuteScriptAndReturnValue() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3149699 ExecuteJavaScript's RequestExecuteScript() new params are cribbed from https://chromium-review.googlesource.com/c/chromium/src/+/3149699/4/third_party/blink/renderer/core/frame/web_local_frame_impl.cc * Remove IsDescendantOf API on RenderFrameHost. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3165357 function is trivial to implement, so make a local copy in anon namespace * Rewrite IsDescendantOf check to check GetParentOrOuterDocument. https://chromium-review.googlesource.com/c/chromium/src/+/3160061 * Remove GetFramesInSubtree from RenderFrameHost https://chromium-review.googlesource.com/c/chromium/src/+/3163336 * fix: dump_syms for macOS * chore: update patches * [Code Health] Remove ListValue::AppendString and ListValue::GetSize https://chromium-review.googlesource.com/c/chromium/src/+/3144540 * fix: gn check https://chromium-review.googlesource.com/c/chromium/src/+/3163890 * fix: crash with Isolate::GetHeapCodeAndMetadataStatistics https://chromium-review.googlesource.com/c/v8/v8/+/3175820 * chore: update patches * chore: fix windows build * Add kPrintWithPostScriptType42Fonts feature. https://chromium-review.googlesource.com/c/chromium/src/+/3150776 * chore: update patches * chore: fix tests * ozone/x11: fix VA-API. https://chromium-review.googlesource.com/c/chromium/src/+/3141878 * Revert "ozone/x11: fix VA-API." This reverts commit 23e742acb1032bf4afc1a45e4bed38e42184fd01. * Reland "Make Ozone/X11 default." https://chromium-review.googlesource.com/c/chromium/src/+/3114071 * fixup Reland "Make Ozone/X11 default." * fixup Reland "Make Ozone/X11 default." for clipboard 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: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: VerteDinde <khammond@slack-corp.com> Co-authored-by: Michaela Laurencin <mlaurencin@electronjs.org> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
221 lines
8 KiB
C++
221 lines
8 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.
|
|
|
|
#include "shell/browser/web_contents_permission_helper.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "content/public/browser/browser_context.h"
|
|
#include "content/public/browser/render_process_host.h"
|
|
#include "shell/browser/electron_permission_manager.h"
|
|
#include "shell/browser/media/media_stream_devices_controller.h"
|
|
|
|
namespace {
|
|
|
|
std::string MediaStreamTypeToString(blink::mojom::MediaStreamType type) {
|
|
switch (type) {
|
|
case blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE:
|
|
return "audio";
|
|
case blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE:
|
|
return "video";
|
|
default:
|
|
return "unknown";
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
void MediaAccessAllowed(const content::MediaStreamRequest& request,
|
|
content::MediaResponseCallback callback,
|
|
bool allowed) {
|
|
MediaStreamDevicesController controller(request, std::move(callback));
|
|
if (allowed)
|
|
controller.TakeAction();
|
|
else
|
|
controller.Deny(blink::mojom::MediaStreamRequestResult::PERMISSION_DENIED);
|
|
}
|
|
|
|
void OnPointerLockResponse(content::WebContents* web_contents, bool allowed) {
|
|
if (web_contents) {
|
|
if (allowed)
|
|
web_contents->GotResponseToLockMouseRequest(
|
|
blink::mojom::PointerLockResult::kSuccess);
|
|
else
|
|
web_contents->GotResponseToLockMouseRequest(
|
|
blink::mojom::PointerLockResult::kPermissionDenied);
|
|
}
|
|
}
|
|
|
|
void OnPermissionResponse(base::OnceCallback<void(bool)> callback,
|
|
blink::mojom::PermissionStatus status) {
|
|
if (status == blink::mojom::PermissionStatus::GRANTED)
|
|
std::move(callback).Run(true);
|
|
else
|
|
std::move(callback).Run(false);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
WebContentsPermissionHelper::WebContentsPermissionHelper(
|
|
content::WebContents* web_contents)
|
|
: web_contents_(web_contents) {}
|
|
|
|
WebContentsPermissionHelper::~WebContentsPermissionHelper() = default;
|
|
|
|
void WebContentsPermissionHelper::RequestPermission(
|
|
content::PermissionType permission,
|
|
base::OnceCallback<void(bool)> callback,
|
|
bool user_gesture,
|
|
const base::DictionaryValue* details) {
|
|
auto* rfh = web_contents_->GetMainFrame();
|
|
auto* permission_manager = static_cast<ElectronPermissionManager*>(
|
|
web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
|
|
auto origin = web_contents_->GetLastCommittedURL();
|
|
permission_manager->RequestPermissionWithDetails(
|
|
permission, rfh, origin, false, details,
|
|
base::BindOnce(&OnPermissionResponse, std::move(callback)));
|
|
}
|
|
|
|
bool WebContentsPermissionHelper::CheckPermission(
|
|
content::PermissionType permission,
|
|
const base::DictionaryValue* details) const {
|
|
auto* rfh = web_contents_->GetMainFrame();
|
|
auto* permission_manager = static_cast<ElectronPermissionManager*>(
|
|
web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
|
|
auto origin = web_contents_->GetLastCommittedURL();
|
|
return permission_manager->CheckPermissionWithDetails(permission, rfh, origin,
|
|
details);
|
|
}
|
|
|
|
bool WebContentsPermissionHelper::CheckDevicePermission(
|
|
content::PermissionType permission,
|
|
const url::Origin& origin,
|
|
const base::Value* device,
|
|
content::RenderFrameHost* render_frame_host) const {
|
|
auto* permission_manager = static_cast<ElectronPermissionManager*>(
|
|
web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
|
|
return permission_manager->CheckDevicePermission(permission, origin, device,
|
|
render_frame_host);
|
|
}
|
|
|
|
void WebContentsPermissionHelper::GrantDevicePermission(
|
|
content::PermissionType permission,
|
|
const url::Origin& origin,
|
|
const base::Value* device,
|
|
content::RenderFrameHost* render_frame_host) const {
|
|
auto* permission_manager = static_cast<ElectronPermissionManager*>(
|
|
web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
|
|
permission_manager->GrantDevicePermission(permission, origin, device,
|
|
render_frame_host);
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestFullscreenPermission(
|
|
base::OnceCallback<void(bool)> callback) {
|
|
RequestPermission(
|
|
static_cast<content::PermissionType>(PermissionType::FULLSCREEN),
|
|
std::move(callback));
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestMediaAccessPermission(
|
|
const content::MediaStreamRequest& request,
|
|
content::MediaResponseCallback response_callback) {
|
|
auto callback = base::BindOnce(&MediaAccessAllowed, request,
|
|
std::move(response_callback));
|
|
|
|
base::DictionaryValue details;
|
|
auto media_types = std::make_unique<base::ListValue>();
|
|
if (request.audio_type ==
|
|
blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE) {
|
|
media_types->Append("audio");
|
|
}
|
|
if (request.video_type ==
|
|
blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE) {
|
|
media_types->Append("video");
|
|
}
|
|
details.SetList("mediaTypes", std::move(media_types));
|
|
|
|
// The permission type doesn't matter here, AUDIO_CAPTURE/VIDEO_CAPTURE
|
|
// are presented as same type in content_converter.h.
|
|
RequestPermission(content::PermissionType::AUDIO_CAPTURE, std::move(callback),
|
|
false, &details);
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestWebNotificationPermission(
|
|
base::OnceCallback<void(bool)> callback) {
|
|
RequestPermission(content::PermissionType::NOTIFICATIONS,
|
|
std::move(callback));
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestPointerLockPermission(
|
|
bool user_gesture) {
|
|
RequestPermission(
|
|
static_cast<content::PermissionType>(PermissionType::POINTER_LOCK),
|
|
base::BindOnce(&OnPointerLockResponse, web_contents_), user_gesture);
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestOpenExternalPermission(
|
|
base::OnceCallback<void(bool)> callback,
|
|
bool user_gesture,
|
|
const GURL& url) {
|
|
base::DictionaryValue details;
|
|
details.SetString("externalURL", url.spec());
|
|
RequestPermission(
|
|
static_cast<content::PermissionType>(PermissionType::OPEN_EXTERNAL),
|
|
std::move(callback), user_gesture, &details);
|
|
}
|
|
|
|
bool WebContentsPermissionHelper::CheckMediaAccessPermission(
|
|
const GURL& security_origin,
|
|
blink::mojom::MediaStreamType type) const {
|
|
base::DictionaryValue details;
|
|
details.SetString("securityOrigin", security_origin.spec());
|
|
details.SetString("mediaType", MediaStreamTypeToString(type));
|
|
// The permission type doesn't matter here, AUDIO_CAPTURE/VIDEO_CAPTURE
|
|
// are presented as same type in content_converter.h.
|
|
return CheckPermission(content::PermissionType::AUDIO_CAPTURE, &details);
|
|
}
|
|
|
|
bool WebContentsPermissionHelper::CheckSerialAccessPermission(
|
|
const url::Origin& embedding_origin) const {
|
|
base::DictionaryValue details;
|
|
details.SetString("securityOrigin", embedding_origin.GetURL().spec());
|
|
return CheckPermission(
|
|
static_cast<content::PermissionType>(PermissionType::SERIAL), &details);
|
|
}
|
|
|
|
bool WebContentsPermissionHelper::CheckHIDAccessPermission(
|
|
const url::Origin& embedding_origin) const {
|
|
base::DictionaryValue details;
|
|
details.SetString("securityOrigin", embedding_origin.GetURL().spec());
|
|
return CheckPermission(
|
|
static_cast<content::PermissionType>(PermissionType::HID), &details);
|
|
}
|
|
|
|
bool WebContentsPermissionHelper::CheckHIDDevicePermission(
|
|
const url::Origin& origin,
|
|
base::Value device,
|
|
content::RenderFrameHost* render_frame_host) const {
|
|
return CheckDevicePermission(
|
|
static_cast<content::PermissionType>(PermissionType::HID), origin,
|
|
&device, render_frame_host);
|
|
}
|
|
|
|
void WebContentsPermissionHelper::GrantHIDDevicePermission(
|
|
const url::Origin& origin,
|
|
base::Value device,
|
|
content::RenderFrameHost* render_frame_host) const {
|
|
return GrantDevicePermission(
|
|
static_cast<content::PermissionType>(PermissionType::HID), origin,
|
|
&device, render_frame_host);
|
|
}
|
|
|
|
WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsPermissionHelper)
|
|
|
|
} // namespace electron
|