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

introspect: Split out DBusSenderChecker

Browse Source 
Restricting callers to a list of allowed senders is useful for
other D-Bus services as well, so split out the existing code
into a reusable class.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3943

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1970>
This commit is contained in:
Florian Müllner
2021-06-16 19:09:42 +02:00
committed by Marge Bot
parent d474781325
commit 2a3e297218
2 changed files with 60 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
js/misc/introspect.js
View File

@ -9,6 +9,7 @@ const APP_ALLOWLIST = [
const INTROSPECT_DBUS_API_VERSION = 3;
const { loadInterfaceXML } = imports.misc.fileUtils;
const { DBusSenderChecker } = imports.misc.util;
const IntrospectDBusIface = loadInterfaceXML('org.gnome.Shell.Introspect');
@ -43,14 +44,7 @@ var IntrospectService = class {
this._syncRunningApplications();
this._allowlistMap = new Map();
APP_ALLOWLIST.forEach(appName => {
Gio.DBus.watch_name(Gio.BusType.SESSION,
appName,
Gio.BusNameWatcherFlags.NONE,
(conn, name, owner) => this._allowlistMap.set(name, owner),
(conn, name) => this._allowlistMap.delete(name));
});
this._senderChecker = new DBusSenderChecker(APP_ALLOWLIST);
this._settings = St.Settings.get();
this._settings.connect('notify::enable-animations',
@ -67,10 +61,6 @@ var IntrospectService = class {
return app.get_windows().some(w => w.transient_for == null);
}
_isSenderAllowed(sender) {
return [...this._allowlistMap.values()].includes(sender);
}
_getSandboxedAppId(app) {
let ids = app.get_windows().map(w => w.get_sandboxed_app_id());
return ids.find(id => id != null);
@ -127,21 +117,9 @@ var IntrospectService = class {
type == Meta.WindowType.UTILITY;
}
_checkInvocation(invocation) {
if (global.context.unsafe_mode)
return;
if (this._isSenderAllowed(invocation.get_sender()))
return;
throw new GLib.Error(Gio.DBusError,
Gio.DBusError.ACCESS_DENIED,
'App introspection not allowed');
}
GetRunningApplicationsAsync(params, invocation) {
try {
this._checkInvocation(invocation);
this._senderChecker.checkInvocation(invocation);
} catch (e) {
invocation.return_gerror(e);
return;
@ -156,7 +134,7 @@ var IntrospectService = class {
let windowsList = {};
try {
this._checkInvocation(invocation);
this._senderChecker.checkInvocation(invocation);
} catch (e) {
invocation.return_gerror(e);
return;