Skip to content
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

interfaces/desktop: allow DBus access to plasmashell #13737

Merged
merged 3 commits into from
Mar 25, 2024
Merged

interfaces/desktop: allow DBus access to plasmashell #13737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d8278c
interfaces/desktop: allow DBus Notifications access to plasmashell
alexmurray Mar 20, 2024
6a3b221
interfaces/desktop-legacy: allow DBus StatusNotifierItem for plasmashell
alexmurray Mar 21, 2024
39cbc9a
interfaces/unity7: allow DBus access for plasmashell
alexmurray Mar 21, 2024
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
8 changes: 4 additions & 4 deletions interfaces/builtin/desktop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,14 @@ dbus (send)
path=/org/freedesktop/Notifications
interface=org.freedesktop.Notifications
member="{GetCapabilities,GetServerInformation,Notify,CloseNotification}"
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

dbus (receive)
bus=session
path=/org/freedesktop/Notifications
interface=org.freedesktop.Notifications
member={ActionInvoked,NotificationClosed,NotificationReplied}
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

# KDE Plasma's Inhibited property indicating "do not disturb" mode
# https://invent.kde.org/plasma/plasma-workspace/-/blob/master/libnotificationmanager/dbus/org.freedesktop.Notifications.xml#L42
Expand All @@ -197,14 +197,14 @@ dbus (send)
path=/org/freedesktop/Notifications
interface=org.freedesktop.DBus.Properties
member="Get{,All}"
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

dbus (receive)
bus=session
path=/org/freedesktop/Notifications
interface=org.freedesktop.DBus.Properties
member=PropertiesChanged
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

# DesktopAppInfo Launched
dbus (send)
Expand Down
12 changes: 6 additions & 6 deletions interfaces/builtin/desktop_legacy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,35 +302,35 @@ dbus (send)
path=/{StatusNotifierWatcher,org/ayatana/NotificationItem/*}
interface=org.kde.StatusNotifierWatcher
member=RegisterStatusNotifierItem
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

dbus (send)
bus=session
path=/{StatusNotifierItem,org/ayatana/NotificationItem/*}
interface=org.kde.StatusNotifierItem
member="New{AttentionIcon,Icon,IconThemePath,OverlayIcon,Status,Title,ToolTip}"
peer=(name=org.freedesktop.DBus, label=unconfined),
peer=(name=org.freedesktop.DBus, label="{plasmashell,unconfined}"),

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

dbus (send)
bus=session
path=/{StatusNotifierItem/menu,org/ayatana/NotificationItem/*/Menu}
interface=com.canonical.dbusmenu
member="{LayoutUpdated,ItemsPropertiesUpdated}"
peer=(name=org.freedesktop.DBus, label=unconfined),
peer=(name=org.freedesktop.DBus, label="{plasmashell,unconfined}"),

dbus (receive)
bus=session
path=/{StatusNotifierItem,StatusNotifierItem/menu,org/ayatana/NotificationItem/**}
interface={org.freedesktop.DBus.Properties,com.canonical.dbusmenu}
member={Get*,AboutTo*,Event*}
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

# notifications
dbus (send)
Expand Down Expand Up @@ -368,7 +368,7 @@ dbus (send)
path=/org/ayatana/NotificationItem/*
interface=org.kde.StatusNotifierItem
member=XAyatanaNew*
peer=(name=org.freedesktop.DBus, label=unconfined),
peer=(name=org.freedesktop.DBus, label="{plasmashell,unconfined}"),
`

const desktopLegacyConnectedPlugSecComp = `
Expand Down
32 changes: 16 additions & 16 deletions interfaces/builtin/unity7.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,35 +362,35 @@ dbus (send)
path=/{MenuBar{,/[0-9A-F]*},com/canonical/{menu/[0-9A-F]*,dbusmenu}}
interface=com.canonical.dbusmenu
member="{LayoutUpdated,ItemsPropertiesUpdated}"
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

dbus (receive)
bus=session
path=/{MenuBar{,/[0-9A-F]*},com/canonical/{menu/[0-9A-F]*,dbusmenu}}
interface="{com.canonical.dbusmenu,org.freedesktop.DBus.Properties}"
member=Get*
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

dbus (receive)
bus=session
path=/{MenuBar{,/[0-9A-F]*},com/canonical/{menu/[0-9A-F]*,dbusmenu}}
interface=com.canonical.dbusmenu
member="{AboutTo*,Event*}"
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

dbus (receive)
bus=session
path=/{MenuBar{,/[0-9A-F]*},com/canonical/{menu/[0-9A-F]*,dbusmenu}}
interface=org.freedesktop.DBus.Introspectable
member=Introspect
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

dbus (receive)
bus=session
path=/com/canonical/dbusmenu
interface=org.freedesktop.DBus.Properties
member=Get*
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

# app-indicators
dbus (send)
Expand Down Expand Up @@ -423,50 +423,50 @@ dbus (send)
path=/{StatusNotifierWatcher,org/ayatana/NotificationItem/*}
interface=org.kde.StatusNotifierWatcher
member=RegisterStatusNotifierItem
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

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

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

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

dbus (receive)
bus=session
path=/{StatusNotifierItem,StatusNotifierItem/menu,org/ayatana/NotificationItem/**}
interface={org.freedesktop.DBus.Properties,com.canonical.dbusmenu}
member={Get*,AboutTo*,Event*}
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

# notifications
dbus (send)
bus=session
path=/org/freedesktop/Notifications
interface=org.freedesktop.Notifications
member="{GetCapabilities,GetServerInformation,Notify,CloseNotification}"
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

dbus (receive)
bus=session
path=/org/freedesktop/Notifications
interface=org.freedesktop.Notifications
member={ActionInvoked,NotificationClosed,NotificationReplied}
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

# KDE Plasma's Inhibited property indicating "do not disturb" mode
# https://invent.kde.org/plasma/plasma-workspace/-/blob/master/libnotificationmanager/dbus/org.freedesktop.Notifications.xml#L42
Expand All @@ -475,21 +475,21 @@ dbus (send)
path=/org/freedesktop/Notifications
interface=org.freedesktop.DBus.Properties
member="Get{,All}"
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

dbus (receive)
bus=session
path=/org/freedesktop/Notifications
interface=org.freedesktop.DBus.Properties
member=PropertiesChanged
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

dbus (send)
bus=session
path=/org/ayatana/NotificationItem/*
interface=org.kde.StatusNotifierItem
member=XAyatanaNew*
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

# unity launcher
dbus (send)
Expand Down Expand Up @@ -591,7 +591,7 @@ dbus (receive)
path=/com/canonical/menu/[0-9]*
interface="{org.freedesktop.DBus.Properties,com.canonical.dbusmenu}"
member="{GetAll,GetLayout}"
peer=(label=unconfined),
peer=(label="{plasmashell,unconfined}"),

# Allow requesting interest in receiving media key events. This tells Gnome
# settings that our application should be notified when key events we are
Expand Down
Loading