isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util: Wait for initial name owners in DBusSenderCheck before checking

Browse Source 
Otherwise an allowed caller might get rejected if the call is right
after a gnome-shell restart and the watchers have not finished running
their callbacks yet.

Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4813
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2048>
This commit is contained in:
Sebastian Keller
2021-11-23 02:48:04 +01:00
committed by Marge Bot
parent 37271ffe70
commit 85609a232d
4 changed files with 65 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
js/ui/screenshot.js
View File

@ -37,7 +37,7 @@ var ScreenshotService = class {
Gio.DBus.session.own_name('org.gnome.Shell.Screenshot', Gio.BusNameOwnerFlags.REPLACE, null, null);
}
_createScreenshot(invocation, needsDisk = true, restrictCallers = true) {
async _createScreenshot(invocation, needsDisk = true, restrictCallers = true) {
let lockedDown = false;
if (needsDisk)
lockedDown = this._lockdownSettings.get_boolean('disable-save-to-disk');
@ -55,7 +55,7 @@ var ScreenshotService = class {
return null;
} else if (restrictCallers) {
try {
this._senderChecker.checkInvocation(invocation);
await this._senderChecker.checkInvocation(invocation);
} catch (e) {
invocation.return_gerror(e);
return null;
@ -200,7 +200,7 @@ var ScreenshotService = class {
"Invalid params");
return;
}
let screenshot = this._createScreenshot(invocation);
let screenshot = await this._createScreenshot(invocation);
if (!screenshot)
return;
@ -223,7 +223,7 @@ var ScreenshotService = class {
async ScreenshotWindowAsync(params, invocation) {
let [includeFrame, includeCursor, flash, filename] = params;
let screenshot = this._createScreenshot(invocation);
let screenshot = await this._createScreenshot(invocation);
if (!screenshot)
return;
@ -246,7 +246,7 @@ var ScreenshotService = class {
async ScreenshotAsync(params, invocation) {
let [includeCursor, flash, filename] = params;
let screenshot = this._createScreenshot(invocation);
let screenshot = await this._createScreenshot(invocation);
if (!screenshot)
return;
@ -269,7 +269,7 @@ var ScreenshotService = class {
async SelectAreaAsync(params, invocation) {
try {
this._senderChecker.checkInvocation(invocation);
await this._senderChecker.checkInvocation(invocation);
} catch (e) {
invocation.return_gerror(e);
return;
@ -289,9 +289,9 @@ var ScreenshotService = class {
}
}
FlashAreaAsync(params, invocation) {
async FlashAreaAsync(params, invocation) {
try {
this._senderChecker.checkInvocation(invocation);
await this._senderChecker.checkInvocation(invocation);
} catch (e) {
invocation.return_gerror(e);
return;
@ -311,7 +311,7 @@ var ScreenshotService = class {
}
async PickColorAsync(params, invocation) {
const screenshot = this._createScreenshot(invocation, false, false);
const screenshot = await this._createScreenshot(invocation, false, false);
if (!screenshot)
return;

44
js/ui/shellDBus.js
View File

@ -81,13 +81,14 @@ var GnomeShell = class {
/**
* Focus the overview's search entry
*
* @async
* @param {...any} params - method parameters
* @param {Gio.DBusMethodInvocation} invocation - the invocation
* @returns {void}
*/
FocusSearchAsync(params, invocation) {
async FocusSearchAsync(params, invocation) {
try {
this._senderChecker.checkInvocation(invocation);
await this._senderChecker.checkInvocation(invocation);
} catch (e) {
invocation.return_gerror(e);
return;
@ -100,13 +101,14 @@ var GnomeShell = class {
/**
* Show OSD with the specified parameters
*
* @async
* @param {...any} params - method parameters
* @param {Gio.DBusMethodInvocation} invocation - the invocation
* @returns {void}
*/
ShowOSDAsync([params], invocation) {
async ShowOSDAsync([params], invocation) {
try {
this._senderChecker.checkInvocation(invocation);
await this._senderChecker.checkInvocation(invocation);
} catch (e) {
invocation.return_gerror(e);
return;
@ -138,13 +140,14 @@ var GnomeShell = class {
/**
* Focus specified app in the overview's app grid
*
* @async
* @param {string} id - an application ID
* @param {Gio.DBusMethodInvocation} invocation - the invocation
* @returns {void}
*/
FocusAppAsync([id], invocation) {
async FocusAppAsync([id], invocation) {
try {
this._senderChecker.checkInvocation(invocation);
await this._senderChecker.checkInvocation(invocation);
} catch (e) {
invocation.return_gerror(e);
return;
@ -157,13 +160,14 @@ var GnomeShell = class {
/**
* Show the overview's app grid
*
* @async
* @param {...any} params - method parameters
* @param {Gio.DBusMethodInvocation} invocation - the invocation
* @returns {void}
*/
ShowApplicationsAsync(params, invocation) {
async ShowApplicationsAsync(params, invocation) {
try {
this._senderChecker.checkInvocation(invocation);
await this._senderChecker.checkInvocation(invocation);
} catch (e) {
invocation.return_gerror(e);
return;
@ -173,9 +177,9 @@ var GnomeShell = class {
invocation.return_value(null);
}
GrabAcceleratorAsync(params, invocation) {
async GrabAcceleratorAsync(params, invocation) {
try {
this._senderChecker.checkInvocation(invocation);
await this._senderChecker.checkInvocation(invocation);
} catch (e) {
invocation.return_gerror(e);
return;
@ -187,9 +191,9 @@ var GnomeShell = class {
invocation.return_value(GLib.Variant.new('(u)', [bindingAction]));
}
GrabAcceleratorsAsync(params, invocation) {
async GrabAcceleratorsAsync(params, invocation) {
try {
this._senderChecker.checkInvocation(invocation);
await this._senderChecker.checkInvocation(invocation);
} catch (e) {
invocation.return_gerror(e);
return;
@ -205,9 +209,9 @@ var GnomeShell = class {
invocation.return_value(GLib.Variant.new('(au)', [bindingActions]));
}
UngrabAcceleratorAsync(params, invocation) {
async UngrabAcceleratorAsync(params, invocation) {
try {
this._senderChecker.checkInvocation(invocation);
await this._senderChecker.checkInvocation(invocation);
} catch (e) {
invocation.return_gerror(e);
return;
@ -220,9 +224,9 @@ var GnomeShell = class {
invocation.return_value(GLib.Variant.new('(b)', [ungrabSucceeded]));
}
UngrabAcceleratorsAsync(params, invocation) {
async UngrabAcceleratorsAsync(params, invocation) {
try {
this._senderChecker.checkInvocation(invocation);
await this._senderChecker.checkInvocation(invocation);
} catch (e) {
invocation.return_gerror(e);
return;
@ -307,9 +311,9 @@ var GnomeShell = class {
this._grabbers.delete(name);
}
ShowMonitorLabelsAsync(params, invocation) {
async ShowMonitorLabelsAsync(params, invocation) {
try {
this._senderChecker.checkInvocation(invocation);
await this._senderChecker.checkInvocation(invocation);
} catch (e) {
invocation.return_gerror(e);
return;
@ -321,9 +325,9 @@ var GnomeShell = class {
invocation.return_value(null);
}
HideMonitorLabelsAsync(params, invocation) {
async HideMonitorLabelsAsync(params, invocation) {
try {
this._senderChecker.checkInvocation(invocation);
await this._senderChecker.checkInvocation(invocation);
} catch (e) {
invocation.return_gerror(e);
return;