From 6ada5561b97394c40812cfaada59a67a2e364ca5 Mon Sep 17 00:00:00 2001 From: Jamie Strandboge Date: Fri, 23 Feb 2018 16:04:50 +0000 Subject: [PATCH 1/2] interfaces/screen-inhibit-control: fix use of '.' in path in DBus rule --- interfaces/builtin/screen_inhibit_control.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/builtin/screen_inhibit_control.go b/interfaces/builtin/screen_inhibit_control.go index 4c518b440a8..7161dd2fd66 100644 --- a/interfaces/builtin/screen_inhibit_control.go +++ b/interfaces/builtin/screen_inhibit_control.go @@ -67,7 +67,7 @@ dbus (send) # API rule dbus (send) bus=session - path=/{,org/freedesktop/,org.gnome/}ScreenSaver + path=/{,org/freedesktop/,org/gnome/}ScreenSaver interface=org.freedesktop.ScreenSaver member={Inhibit,UnInhibit,SimulateUserActivity} peer=(label=unconfined), From 1bb9e4011fd1f7ffd05ecbe61f8e3fc95b4fb448 Mon Sep 17 00:00:00 2001 From: Jamie Strandboge Date: Fri, 23 Feb 2018 16:12:40 +0000 Subject: [PATCH 2/2] interfaces/network-status: fix use of '/' in interface in DBus rule --- interfaces/builtin/network_status.go | 2 +- interfaces/builtin/network_status_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/builtin/network_status.go b/interfaces/builtin/network_status.go index 9ef48cd39a1..2b2b3a83e88 100644 --- a/interfaces/builtin/network_status.go +++ b/interfaces/builtin/network_status.go @@ -81,7 +81,7 @@ const networkStatusConnectedPlugAppArmor = ` # Allow all access to NetworkingStatus service dbus (send) bus=system - interface=com.ubuntu.connectivity1.NetworkingStatus{,/**} + interface=com.ubuntu.connectivity1.NetworkingStatus{,*} path=/com/ubuntu/connectivity1/NetworkingStatus peer=(label=###SLOT_SECURITY_TAGS###), diff --git a/interfaces/builtin/network_status_test.go b/interfaces/builtin/network_status_test.go index 219ef63149d..d5fbdfaeeda 100644 --- a/interfaces/builtin/network_status_test.go +++ b/interfaces/builtin/network_status_test.go @@ -76,7 +76,7 @@ func (s *NetworkStatusSuite) TestAppArmorConnectedPlug(c *C) { c.Assert(spec.AddConnectedPlug(s.iface, s.plug, s.slot), IsNil) c.Assert(spec.SecurityTags(), DeepEquals, []string{"snap.consumer.app"}) c.Assert(spec.SnippetForTag("snap.consumer.app"), testutil.Contains, `peer=(label="snap.provider.app"`) - c.Assert(spec.SnippetForTag("snap.consumer.app"), testutil.Contains, "interface=com.ubuntu.connectivity1.NetworkingStatus{,/**}") + c.Assert(spec.SnippetForTag("snap.consumer.app"), testutil.Contains, "interface=com.ubuntu.connectivity1.NetworkingStatus{,*}") } func (s *NetworkStatusSuite) TestAppArmorConnectedSlot(c *C) {