From fc309e9bf1a31730fcc3e97f1a70200b60d95b72 Mon Sep 17 00:00:00 2001 From: quentin Date: Thu, 9 May 2019 15:50:42 +0200 Subject: Blacklist ~/.dbus with nodbus --- src/firejail/dbus.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/firejail/dbus.c b/src/firejail/dbus.c index baa41e85e..cf60a9430 100644 --- a/src/firejail/dbus.c +++ b/src/firejail/dbus.c @@ -43,6 +43,12 @@ void dbus_session_disable(void) { free(path); free(env_var); + // blacklist the dbus-launch user directory + if (asprintf(&path, "%s/.dbus", cfg.homedir) == -1) + errExit("asprintf"); + disable_file_or_dir(path); + free(path); + // look for a possible abstract unix socket // --net=none -- cgit v1.2.3-54-g00ecf From 6fad6fce947e93c43d807f82b5d7265da83ea74d Mon Sep 17 00:00:00 2001 From: quentin Date: Thu, 9 May 2019 16:17:05 +0200 Subject: Fix overridden DBUS_SESSION_BUS_ADDRESS with nodbus --- src/firejail/dbus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/firejail/dbus.c b/src/firejail/dbus.c index cf60a9430..94d872ca5 100644 --- a/src/firejail/dbus.c +++ b/src/firejail/dbus.c @@ -29,7 +29,7 @@ void dbus_session_disable(void) { if (asprintf(&path, "/run/user/%d/bus", getuid()) == -1) errExit("asprintf"); char *env_var; - if (asprintf(&env_var, "DBUS_SESSION_BUS_ADDRESS=unix:path=%s", path) == -1) + if (asprintf(&env_var, "unix:path=%s", path) == -1) errExit("asprintf"); // set a new environment variable: DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user//bus -- cgit v1.2.3-54-g00ecf