File: 0003-util-apparmor-improve-log-messages.patch

package info (click to toggle)
dbus-broker 37-4
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 3,224 kB
  • sloc: ansic: 32,663; makefile: 146; sh: 56; python: 44
file content (39 lines) | stat: -rw-r--r-- 1,941 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
Author: Sebastian Reichel <sebastian.reichel@collabora.com>
Origin: https://github.com/bus1/dbus-broker/commit/7ba64f9e4d945c874663f6c53d42059bf15d6098
Forwarded: https://github.com/bus1/dbus-broker/pull/410
Description: util/apparmor: improve log messages
--- a/src/util/apparmor.c
+++ b/src/util/apparmor.c
@@ -480,7 +480,7 @@
                 bus_apparmor_log(
                         registry,
                         "apparmor=\"%s\" operation=\"dbus_bind\" "
-                        "bus=\"%s\" name=\"%s\"",
+                        "bus=\"%s\" name=\"%s\" mask=\"bind\"",
                         allow ? "ALLOWED" : "DENIED",
                         registry->bustype,
                         name
@@ -573,8 +573,9 @@
 
         if (src_audit) {
                 bus_apparmor_log(registry,
-                        "apparmor=\"%s\" bus=\"%s\" path=\"%s\" interface=\"%s\" method=\"%s\" "
-                        "label=\"%s\" peer_label=\"%s\"",
+                        "apparmor=\"%s\" operation=\"dbus_method_call\" "
+                        "bus=\"%s\" path=\"%s\" interface=\"%s\" method=\"%s\" "
+                        "mask=\"send\" label=\"%s\" peer_label=\"%s\"",
                         src_allow ? "ALLOWED" : "DENIED",
                         registry->bustype,
                         path,
@@ -587,8 +588,9 @@
 
         if (dst_audit) {
                 bus_apparmor_log(registry,
-                        "apparmor=\"%s\" bus=\"%s\" path=\"%s\" interface=\"%s\" method=\"%s\" "
-                        "label=\"%s\" peer_label=\"%s\"",
+                        "apparmor=\"%s\" operation=\"dbus_method_call\" "
+                        "bus=\"%s\" path=\"%s\" interface=\"%s\" method=\"%s\" "
+                        "mask=\"receive\" label=\"%s\" peer_label=\"%s\"",
                         dst_allow ? "ALLOWED" : "DENIED",
                         registry->bustype,
                         path,