edu4rdshl/gnome-shell
1
0
Fork 0
mirror of https://github.com/edu4rdshl/gnome-shell.git synced 2026-07-17 23:24:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

accessDialog: Skip focus check for screenshot permissions

Browse source 
Screenshot is a special case compared to other permissions because
apps might want to hide themselves from the desktop when a screenshot
is about to be taken. In that case, this heuristic of checking if
the focus window corresponds to the application that is requesting
screenshot permissions becomes problematic.

Special case the screenshot permission to skip the focused window
check.

See also: https://github.com/flatpak/xdg-desktop-portal/pull/851
This commit is contained in:
Georges Basile Stavracas Neto 2022-08-07 22:55:37 -03:00
parent 1c7eb13caf
commit d6ebf826c0
1 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

30
js/ui/accessDialog.js
View file

@ -131,6 +131,31 @@ var AccessDialogDBus = class {
Gio.DBus.session.own_name('org.gnome.Shell.Portal', Gio.BusNameOwnerFlags.REPLACE, null, null);
}
_isFocusWindow(appId, options) {
const IGNORE_FOCUS_CHECK_ALLOWLIST = [
{
table: 'screenshot',
id: 'screenshot',
},
];
if (!appId)
return true;
if (options['permission']) {
const [table, id] = options['permission'].deep_unpack();
const skipFocusCheck = IGNORE_FOCUS_CHECK_ALLOWLIST.some(
permission => permission.table === table && permission.id === id);
if (skipFocusCheck)
return true;
}
// We probably want to use parentWindow and global.display.focus_window
// for this check in the future
return `${appId}.desktop` === this._windowTracker.focusApp.id;
}
AccessDialogAsync(params, invocation) {
if (this._accessDialog) {
invocation.return_error_literal(Gio.DBusError,
@ -140,9 +165,8 @@ var AccessDialogDBus = class {
}
let [handle, appId, parentWindow_, title, description, body, options] = params;
// We probably want to use parentWindow and global.display.focus_window
// for this check in the future
if (appId && `${appId}.desktop` !== this._windowTracker.focus_app.id) {
if (!this._isFocusWindow(appId, options)) {
invocation.return_error_literal(Gio.DBusError,
Gio.DBusError.ACCESS_DENIED,
'Only the focused app is allowed to show a system access dialog');