diff options
Diffstat (limited to 'src/core/permission_manager_qt.cpp')
| -rw-r--r-- | src/core/permission_manager_qt.cpp | 233 |
1 files changed, 113 insertions, 120 deletions
diff --git a/src/core/permission_manager_qt.cpp b/src/core/permission_manager_qt.cpp index a1727bda3..b6e727ef8 100644 --- a/src/core/permission_manager_qt.cpp +++ b/src/core/permission_manager_qt.cpp @@ -6,9 +6,9 @@ #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/permission_controller.h" -#include "content/public/browser/permission_type.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_view_host.h" +#include "third_party/blink/public/common/permissions/permission_utils.h" #include "type_conversion.h" #include "web_contents_delegate_qt.h" @@ -16,44 +16,47 @@ namespace QtWebEngineCore { -static ProfileAdapter::PermissionType toQt(content::PermissionType type) +static ProfileAdapter::PermissionType toQt(blink::PermissionType type) { switch (type) { - case content::PermissionType::GEOLOCATION: + case blink::PermissionType::GEOLOCATION: return ProfileAdapter::GeolocationPermission; - case content::PermissionType::AUDIO_CAPTURE: + case blink::PermissionType::AUDIO_CAPTURE: return ProfileAdapter::AudioCapturePermission; - case content::PermissionType::VIDEO_CAPTURE: + case blink::PermissionType::VIDEO_CAPTURE: return ProfileAdapter::VideoCapturePermission; - case content::PermissionType::CLIPBOARD_READ_WRITE: - return ProfileAdapter::ClipboardRead; - case content::PermissionType::CLIPBOARD_SANITIZED_WRITE: - return ProfileAdapter::ClipboardWrite; - case content::PermissionType::NOTIFICATIONS: + // We treat these both as read/write since we do not currently have a + // ClipboardSanitizedWrite feature. + case blink::PermissionType::CLIPBOARD_READ_WRITE: + case blink::PermissionType::CLIPBOARD_SANITIZED_WRITE: + return ProfileAdapter::ClipboardReadWrite; + case blink::PermissionType::NOTIFICATIONS: return ProfileAdapter::NotificationPermission; - case content::PermissionType::ACCESSIBILITY_EVENTS: - case content::PermissionType::CAMERA_PAN_TILT_ZOOM: - case content::PermissionType::WINDOW_PLACEMENT: + case blink::PermissionType::LOCAL_FONTS: + return ProfileAdapter::LocalFontsPermission; + case blink::PermissionType::ACCESSIBILITY_EVENTS: + case blink::PermissionType::CAMERA_PAN_TILT_ZOOM: + case blink::PermissionType::WINDOW_MANAGEMENT: return ProfileAdapter::UnsupportedPermission; - case content::PermissionType::MIDI_SYSEX: - case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: - case content::PermissionType::MIDI: - case content::PermissionType::DURABLE_STORAGE: - case content::PermissionType::BACKGROUND_SYNC: - case content::PermissionType::SENSORS: - case content::PermissionType::PAYMENT_HANDLER: - case content::PermissionType::BACKGROUND_FETCH: - case content::PermissionType::IDLE_DETECTION: - case content::PermissionType::PERIODIC_BACKGROUND_SYNC: - case content::PermissionType::WAKE_LOCK_SCREEN: - case content::PermissionType::WAKE_LOCK_SYSTEM: - case content::PermissionType::NFC: - case content::PermissionType::AR: - case content::PermissionType::VR: - case content::PermissionType::STORAGE_ACCESS_GRANT: - case content::PermissionType::LOCAL_FONTS: - case content::PermissionType::DISPLAY_CAPTURE: - case content::PermissionType::NUM: + case blink::PermissionType::MIDI_SYSEX: + case blink::PermissionType::PROTECTED_MEDIA_IDENTIFIER: + case blink::PermissionType::MIDI: + case blink::PermissionType::DURABLE_STORAGE: + case blink::PermissionType::BACKGROUND_SYNC: + case blink::PermissionType::SENSORS: + case blink::PermissionType::PAYMENT_HANDLER: + case blink::PermissionType::BACKGROUND_FETCH: + case blink::PermissionType::IDLE_DETECTION: + case blink::PermissionType::PERIODIC_BACKGROUND_SYNC: + case blink::PermissionType::WAKE_LOCK_SCREEN: + case blink::PermissionType::WAKE_LOCK_SYSTEM: + case blink::PermissionType::NFC: + case blink::PermissionType::AR: + case blink::PermissionType::VR: + case blink::PermissionType::STORAGE_ACCESS_GRANT: + case blink::PermissionType::DISPLAY_CAPTURE: + case blink::PermissionType::TOP_LEVEL_STORAGE_ACCESS: + case blink::PermissionType::NUM: LOG(INFO) << "Unexpected unsupported permission type: " << static_cast<int>(type); break; } @@ -65,6 +68,8 @@ static bool canRequestPermissionFor(ProfileAdapter::PermissionType type) switch (type) { case ProfileAdapter::GeolocationPermission: case ProfileAdapter::NotificationPermission: + case ProfileAdapter::ClipboardReadWrite: + case ProfileAdapter::LocalFontsPermission: return true; default: break; @@ -84,6 +89,20 @@ static blink::mojom::PermissionStatus toBlink(ProfileAdapter::PermissionState re } } +static blink::mojom::PermissionStatus getStatusFromSettings(blink::PermissionType type, WebEngineSettings *settings) +{ + switch (type) { + case blink::PermissionType::CLIPBOARD_READ_WRITE: + case blink::PermissionType::CLIPBOARD_SANITIZED_WRITE: + if (settings->testAttribute(QWebEngineSettings::JavascriptCanPaste) + && settings->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard)) + return blink::mojom::PermissionStatus::GRANTED; + return blink::mojom::PermissionStatus::ASK; + default: + return blink::mojom::PermissionStatus::ASK; + } +} + PermissionManagerQt::PermissionManagerQt() : m_requestIdCount(0) { @@ -130,7 +149,7 @@ void PermissionManagerQt::permissionRequestReply(const QUrl &url, ProfileAdapter bool answerable = true; std::vector<blink::mojom::PermissionStatus> result; result.reserve(it->types.size()); - for (content::PermissionType permission : it->types) { + for (blink::PermissionType permission : it->types) { const ProfileAdapter::PermissionType permissionType = toQt(permission); if (permissionType == ProfileAdapter::UnsupportedPermission) { result.push_back(blink::mojom::PermissionStatus::DENIED); @@ -163,49 +182,12 @@ bool PermissionManagerQt::checkPermission(const QUrl &origin, ProfileAdapter::Pe return m_permissions.contains(key) && m_permissions[key]; } -void PermissionManagerQt::RequestPermission(content::PermissionType permission, - content::RenderFrameHost *frameHost, - const GURL& requesting_origin, - bool /*user_gesture*/, - base::OnceCallback<void(blink::mojom::PermissionStatus)> callback) +void PermissionManagerQt::RequestPermissions(content::RenderFrameHost *frameHost, + const content::PermissionRequestDescription &requestDescription, + base::OnceCallback<void(const std::vector<blink::mojom::PermissionStatus>&)> callback) { - if (requesting_origin.is_empty()) { - std::move(callback).Run(blink::mojom::PermissionStatus::DENIED); - return; - } - - WebContentsDelegateQt *contentsDelegate = static_cast<WebContentsDelegateQt *>( - content::WebContents::FromRenderFrameHost(frameHost)->GetDelegate()); - Q_ASSERT(contentsDelegate); - - ProfileAdapter::PermissionType permissionType = toQt(permission); - if (permissionType == ProfileAdapter::ClipboardRead) { - WebEngineSettings *settings = contentsDelegate->webEngineSettings(); - if (settings->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard) - && settings->testAttribute(QWebEngineSettings::JavascriptCanPaste)) - std::move(callback).Run(blink::mojom::PermissionStatus::GRANTED); - else - std::move(callback).Run(blink::mojom::PermissionStatus::DENIED); - return; - } else if (!canRequestPermissionFor(permissionType)) { - std::move(callback).Run(blink::mojom::PermissionStatus::DENIED); - return; - } - - int request_id = ++m_requestIdCount; - auto requestOrigin = toQt(requesting_origin); - m_requests.push_back({ request_id, permissionType, requestOrigin, std::move(callback) }); - contentsDelegate->requestFeaturePermission(permissionType, requestOrigin); -} - -void PermissionManagerQt::RequestPermissions(const std::vector<content::PermissionType> &permissions, - content::RenderFrameHost *frameHost, - const GURL &requesting_origin, - bool /*user_gesture*/, - base::OnceCallback<void(const std::vector<blink::mojom::PermissionStatus> &)> callback) -{ - if (requesting_origin.is_empty()) { - std::move(callback).Run(std::vector<blink::mojom::PermissionStatus>(permissions.size(), blink::mojom::PermissionStatus::DENIED)); + if (requestDescription.requesting_origin.is_empty()) { + std::move(callback).Run(std::vector<content::PermissionStatus>(requestDescription.permissions.size(), blink::mojom::PermissionStatus::DENIED)); return; } @@ -214,23 +196,21 @@ void PermissionManagerQt::RequestPermissions(const std::vector<content::Permissi Q_ASSERT(contentsDelegate); bool answerable = true; - std::vector<blink::mojom::PermissionStatus> result; - result.reserve(permissions.size()); - for (content::PermissionType permission : permissions) { + std::vector<content::PermissionStatus> result; + result.reserve(requestDescription.permissions.size()); + for (blink::PermissionType permission : requestDescription.permissions) { const ProfileAdapter::PermissionType permissionType = toQt(permission); - if (permissionType == ProfileAdapter::UnsupportedPermission) + if (permissionType == ProfileAdapter::UnsupportedPermission) { result.push_back(blink::mojom::PermissionStatus::DENIED); - else if (permissionType == ProfileAdapter::ClipboardRead) { - WebEngineSettings *settings = contentsDelegate->webEngineSettings(); - if (settings->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard) - && settings->testAttribute(QWebEngineSettings::JavascriptCanPaste)) - result.push_back(blink::mojom::PermissionStatus::GRANTED); - else - result.push_back(blink::mojom::PermissionStatus::DENIED); - } else { + continue; + } + + auto status = getStatusFromSettings(permission, contentsDelegate->webEngineSettings()); + if (status == blink::mojom::PermissionStatus::ASK) { answerable = false; break; - } + } else + result.push_back(status); } if (answerable) { std::move(callback).Run(result); @@ -238,17 +218,25 @@ void PermissionManagerQt::RequestPermissions(const std::vector<content::Permissi } int request_id = ++m_requestIdCount; - auto requestOrigin = toQt(requesting_origin); - m_multiRequests.push_back({ request_id, permissions, requestOrigin, std::move(callback) }); - for (content::PermissionType permission : permissions) { + auto requestOrigin = toQt(requestDescription.requesting_origin); + m_multiRequests.push_back({ request_id, requestDescription.permissions, requestOrigin, std::move(callback) }); + for (blink::PermissionType permission : requestDescription.permissions) { const ProfileAdapter::PermissionType permissionType = toQt(permission); if (canRequestPermissionFor(permissionType)) contentsDelegate->requestFeaturePermission(permissionType, requestOrigin); } } +void PermissionManagerQt::RequestPermissionsFromCurrentDocument(content::RenderFrameHost *frameHost, + const content::PermissionRequestDescription &requestDescription, + base::OnceCallback<void(const std::vector<blink::mojom::PermissionStatus>&)> callback) +{ + + RequestPermissions(frameHost, requestDescription, std::move(callback)); +} + blink::mojom::PermissionStatus PermissionManagerQt::GetPermissionStatus( - content::PermissionType permission, + blink::PermissionType permission, const GURL& requesting_origin, const GURL& /*embedding_origin*/) { @@ -264,51 +252,56 @@ blink::mojom::PermissionStatus PermissionManagerQt::GetPermissionStatus( return blink::mojom::PermissionStatus::DENIED; } -blink::mojom::PermissionStatus PermissionManagerQt::GetPermissionStatusForFrame( - content::PermissionType permission, - content::RenderFrameHost *render_frame_host, - const GURL &requesting_origin) +blink::mojom::PermissionStatus PermissionManagerQt::GetPermissionStatusForCurrentDocument( + blink::PermissionType permission, + content::RenderFrameHost *render_frame_host) { - if (permission == content::PermissionType::CLIPBOARD_READ_WRITE || - permission == content::PermissionType::CLIPBOARD_SANITIZED_WRITE) { + if (permission == blink::PermissionType::CLIPBOARD_READ_WRITE || + permission == blink::PermissionType::CLIPBOARD_SANITIZED_WRITE) { WebContentsDelegateQt *delegate = static_cast<WebContentsDelegateQt *>( content::WebContents::FromRenderFrameHost(render_frame_host)->GetDelegate()); - if (!delegate->webEngineSettings()->testAttribute( - QWebEngineSettings::JavascriptCanAccessClipboard)) - return blink::mojom::PermissionStatus::DENIED; - if (permission == content::PermissionType::CLIPBOARD_READ_WRITE - && !delegate->webEngineSettings()->testAttribute( - QWebEngineSettings::JavascriptCanPaste)) - return blink::mojom::PermissionStatus::DENIED; - return blink::mojom::PermissionStatus::GRANTED; + Q_ASSERT(delegate); + auto status = getStatusFromSettings(permission, delegate->webEngineSettings()); + if (status != blink::mojom::PermissionStatus::ASK) + return status; } return GetPermissionStatus( permission, - requesting_origin, - render_frame_host->GetLastCommittedOrigin().GetURL()); -} - -blink::mojom::PermissionStatus PermissionManagerQt::GetPermissionStatusForCurrentDocument( - content::PermissionType permission, - content::RenderFrameHost *render_frame_host) -{ - return GetPermissionStatusForFrame( - permission, - render_frame_host, + render_frame_host->GetLastCommittedOrigin().GetURL(), render_frame_host->GetLastCommittedOrigin().GetURL()); } blink::mojom::PermissionStatus PermissionManagerQt::GetPermissionStatusForWorker( - content::PermissionType permission, + blink::PermissionType permission, content::RenderProcessHost *render_process_host, const GURL &url) { return GetPermissionStatus(permission, url, url); } +blink::mojom::PermissionStatus PermissionManagerQt::GetPermissionStatusForEmbeddedRequester( + blink::PermissionType permission, + content::RenderFrameHost *render_frame_host, + const url::Origin &requesting_origin) +{ + return GetPermissionStatus(permission, requesting_origin.GetURL(), + render_frame_host->GetLastCommittedOrigin().GetURL()); +} + +content::PermissionResult PermissionManagerQt::GetPermissionResultForOriginWithoutContext( + blink::PermissionType permission, + const url::Origin &requesting_origin, + const url::Origin &embedding_origin) +{ + blink::mojom::PermissionStatus status = + GetPermissionStatus(permission, requesting_origin.GetURL(), embedding_origin.GetURL()); + + return content::PermissionResult(status, content::PermissionStatusSource::UNSPECIFIED); +} + void PermissionManagerQt::ResetPermission( - content::PermissionType permission, + blink::PermissionType permission, const GURL& requesting_origin, const GURL& /*embedding_origin*/) { @@ -321,7 +314,7 @@ void PermissionManagerQt::ResetPermission( } content::PermissionControllerDelegate::SubscriptionId PermissionManagerQt::SubscribePermissionStatusChange( - content::PermissionType permission, + blink::PermissionType permission, content::RenderProcessHost * /*render_process_host*/, content::RenderFrameHost * /* render_frame_host */, const GURL& requesting_origin, |