Add dbus filter options

The options --dbus-user.talk, --dbus-user.own, --dbus-system.talk, and
--dbus-system.own control which names can be accessed and owned on the user and
system buses.

1 files changed, 62 insertions, 6 deletions

diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 14533ce08..9bfd2ff1c 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -438,9 +438,11 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
         }
         else if (strncmp("dbus-user ", ptr, 10) == 0) {
                 ptr += 10;
-                if (strcmp("allow", ptr) == 0) {
-                        arg_dbus_user = DBUS_POLICY_ALLOW;
-                } else if (strcmp("filter", ptr) == 0) {
+                if (strcmp("filter", ptr) == 0) {
+                        if (arg_dbus_user == DBUS_POLICY_BLOCK) {
+                                fprintf(stderr, "Error: Cannot relax dbus-user policy, it is already set to block\n");
+                                exit(1);
+                        }
                         arg_dbus_user = DBUS_POLICY_FILTER;
                 } else if (strcmp("none", ptr) == 0) {
                         arg_dbus_user = DBUS_POLICY_BLOCK;
@@ -450,11 +452,39 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                 }
                 return 0;
         }
+        else if (strncmp(ptr, "dbus-user.talk ", 15) == 0) {
+                if (arg_dbus_user == DBUS_POLICY_ALLOW) {
+                        fprintf(stderr, "Session DBus filtering (dbus-user filter) is "
+                                                        "required for dbus-user.talk rules\n");
+                        exit(1);
+                }
+
+                if (!dbus_check_name(ptr + 15)) {
+                        printf("Invalid dbus-user.talk name: %s\n", ptr + 15);
+                        exit(1);
+                }
+                return 1;
+        }
+        else if (strncmp(ptr, "dbus-user.own ", 14) == 0) {
+                if (arg_dbus_user == DBUS_POLICY_ALLOW) {
+                        fprintf(stderr, "Session DBus filtering (dbus-user filter) is "
+                                                        "required for dbus-user.own rules\n");
+                        exit(1);
+                }
+
+                if (!dbus_check_name(ptr + 14)) {
+                        fprintf(stderr, "Invalid dbus-user.own name: %s\n", ptr + 14);
+                        exit(1);
+                }
+                return 1;
+        }
         else if (strncmp("dbus-system ", ptr, 12) == 0) {
                 ptr += 12;
-                if (strcmp("allow", ptr) == 0) {
-                        arg_dbus_system = DBUS_POLICY_ALLOW;
-                } else if (strcmp("filter", ptr) == 0) {
+                if (strcmp("filter", ptr) == 0) {
+                        if (arg_dbus_system == DBUS_POLICY_BLOCK) {
+                                fprintf(stderr, "Error: Cannot relax dbus-system policy, it is already set to block\n");
+                                exit(1);
+                        }
                         arg_dbus_system = DBUS_POLICY_FILTER;
                 } else if (strcmp("none", ptr) == 0) {
                         arg_dbus_system = DBUS_POLICY_BLOCK;
@@ -464,6 +494,32 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                 }
                 return 0;
         }
+        else if (strncmp(ptr, "dbus-system.talk ", 17) == 0) {
+                if (arg_dbus_system == DBUS_POLICY_ALLOW) {
+                        fprintf(stderr, "System DBus filtering (dbus-system filter) is "
+                                                        "required for dbus-system.talk rules\n");
+                        exit(1);
+                }
+
+                if (!dbus_check_name(ptr + 17)) {
+                        fprintf(stderr, "Invalid dbus-system.talk name: %s\n", ptr + 17);
+                        exit(1);
+                }
+                return 1;
+        }
+        else if (strncmp(ptr, "dbus-system.own ", 16) == 0) {
+                if (arg_dbus_system == DBUS_POLICY_ALLOW) {
+                        fprintf(stderr, "System DBus filtering (dbus-system filter) is "
+                                                        "required for dbus-system.own rules\n");
+                        exit(1);
+                }
+
+                if (!dbus_check_name(ptr + 16)) {
+                        fprintf(stderr, "Invalid dbus-system.own name: %s\n", ptr + 16);
+                        exit(1);
+                }
+                return 1;
+        }
         else if (strcmp(ptr, "nou2f") == 0) {
                 arg_nou2f = 1;
                 return 0;