Skip to content

interfaces: allow Chromium StatusNotifierItem object paths in unity7 #17415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
clwsgruk wants to merge 1 commit into
base: master
Choose a base branch
from
+43 −4
Open

interfaces: allow Chromium StatusNotifierItem object paths in unity7 #17415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions interfaces/builtin/unity7.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,10 @@ dbus (bind)
bus=session
name=org.kde.StatusNotifierItem-[0-9]*,

dbus (bind)
bus=session
name=org.freedesktop.StatusNotifierItem-[0-9]*-[0-9]*,

dbus (send)
bus=session
path=/StatusNotifierWatcher
Expand All @@ -422,28 +426,28 @@ dbus (send)

dbus (send)
bus=session
path=/{StatusNotifierItem,org/ayatana/NotificationItem/*}
path=/{StatusNotifierItem,org/chromium/StatusNotifierItem/[0-9]*,org/ayatana/NotificationItem/*}
interface=org.kde.StatusNotifierItem
member="New{AttentionIcon,Icon,IconThemePath,OverlayIcon,Status,Title,ToolTip}"
peer=(label="{plasmashell,unconfined}"),

dbus (receive)
bus=session
path=/{StatusNotifierItem,org/ayatana/NotificationItem/*}
path=/{StatusNotifierItem,org/chromium/StatusNotifierItem/[0-9]*,org/ayatana/NotificationItem/*}
interface=org.kde.StatusNotifierItem
member={Activate,ContextMenu,Scroll,SecondaryActivate,ProvideXdgActivationToken,XAyatanaSecondaryActivate}
peer=(label="{plasmashell,unconfined}"),

dbus (send)
bus=session
path=/{StatusNotifierItem/menu,org/ayatana/NotificationItem/*/Menu}
path=/{StatusNotifierItem/menu,org/chromium/DbusMenu/[0-9]*,org/ayatana/NotificationItem/*/Menu}
interface=com.canonical.dbusmenu
member="{LayoutUpdated,ItemsPropertiesUpdated}"
peer=(label="{plasmashell,unconfined}"),

dbus (receive)
bus=session
path=/{StatusNotifierItem,StatusNotifierItem/menu,org/ayatana/NotificationItem/**}
path=/{StatusNotifierItem,StatusNotifierItem/menu,org/chromium/StatusNotifierItem/[0-9]*,org/chromium/DbusMenu/[0-9]*,org/ayatana/NotificationItem/**}
interface={org.freedesktop.DBus.Properties,com.canonical.dbusmenu}
member={Get*,AboutTo*,Event*}
peer=(label="{plasmashell,unconfined}"),
Expand Down
35 changes: 35 additions & 0 deletions interfaces/builtin/unity7_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,41 @@ func (s *Unity7InterfaceSuite) TestUsedSecuritySystems(c *C) {
c.Check(seccompSpec.SnippetForTag("snap.other-snap.app2"), testutil.Contains, "bind\n")
}

func (s *Unity7InterfaceSuite) TestAppIndicatorAppArmor(c *C) {
apparmorSpec := apparmor.NewSpecification(s.plug.AppSet())
err := apparmorSpec.AddConnectedPlug(s.iface, s.plug, s.slot)
c.Assert(err, IsNil)
snippet := apparmorSpec.SnippetForTag("snap.other-snap.app2")

c.Check(snippet, testutil.Contains, `dbus (bind)
bus=session
name=org.freedesktop.StatusNotifierItem-[0-9]*-[0-9]*,`)
c.Check(snippet, testutil.Contains, `dbus (send)
bus=session
path=/{StatusNotifierItem,org/chromium/StatusNotifierItem/[0-9]*,org/ayatana/NotificationItem/*}
interface=org.kde.StatusNotifierItem
member="New{AttentionIcon,Icon,IconThemePath,OverlayIcon,Status,Title,ToolTip}"
peer=(label="{plasmashell,unconfined}"),`)
c.Check(snippet, testutil.Contains, `dbus (receive)
bus=session
path=/{StatusNotifierItem,org/chromium/StatusNotifierItem/[0-9]*,org/ayatana/NotificationItem/*}
interface=org.kde.StatusNotifierItem
member={Activate,ContextMenu,Scroll,SecondaryActivate,ProvideXdgActivationToken,XAyatanaSecondaryActivate}
peer=(label="{plasmashell,unconfined}"),`)
c.Check(snippet, testutil.Contains, `dbus (send)
bus=session
path=/{StatusNotifierItem/menu,org/chromium/DbusMenu/[0-9]*,org/ayatana/NotificationItem/*/Menu}
interface=com.canonical.dbusmenu
member="{LayoutUpdated,ItemsPropertiesUpdated}"
peer=(label="{plasmashell,unconfined}"),`)
c.Check(snippet, testutil.Contains, `dbus (receive)
bus=session
path=/{StatusNotifierItem,StatusNotifierItem/menu,org/chromium/StatusNotifierItem/[0-9]*,org/chromium/DbusMenu/[0-9]*,org/ayatana/NotificationItem/**}
interface={org.freedesktop.DBus.Properties,com.canonical.dbusmenu}
member={Get*,AboutTo*,Event*}
peer=(label="{plasmashell,unconfined}"),`)
}

func (s *Unity7InterfaceSuite) TestInterfaces(c *C) {
c.Check(builtin.Interfaces(), testutil.DeepContains, s.iface)
}
Expand Down
Loading