fdo-mirrors/wireplumber
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/wireplumber.git synced 2026-05-09 02:48:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'camera-portal-gate' into 'master'

Browse source 
apply-access: un-gate portal clients after permission setup

Closes #941

See merge request pipewire/wireplumber!824
This commit is contained in:
Charles 2026-04-29 13:19:00 +00:00
commit 369d30a1d5
1 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/scripts/client/apply-access.lua
View file

@ -8,6 +8,14 @@
log = Log.open_topic ("s-client")
-- Advertise portal client gate support to the PW daemon.
-- This is set once on our own client at script load time
-- so PW's core_hello can detect that a capable session manager is
-- connected, regardless of which portal client is being processed.
Core.update_properties {
["pipewire.access.portal.gate-supported"] = "true"
}
AsyncEventHook {
name = "client/apply-access",
after = { "client/find-config-access", "client/find-default-access" },
@ -60,6 +68,40 @@ AsyncEventHook {
client:attach_permission_manager (permission_manager)
log:info (client, string.format (
"Attached permission manager to client '%s'", app_name))
-- Handle portal client gating/ungating.
-- The PW daemon gates portal clients on fd handoff
-- (when an app connects via the stolen fd) by removing
-- PW_PERM_R from PW_ID_CORE and setting the property
-- pipewire.access.portal.gated to true. This makes
-- the client busy so the daemon stops reading from the
-- socket until permissions are set up properly.
--
-- two timing scenarios handled:
-- 1) gate is already set so ungate immediately.
-- 2) gate is set later (app connects after PermissionManager attached)
-- watch for the property change and ungate then.
local access = client:get_property ("pipewire.access")
if access == "portal" then
client:connect ("notify::properties", function (c)
local gated = c:get_property ("pipewire.access.portal.gated")
if gated == "true" then
c:update_permissions { [0] = "rwx" }
log:info (c, string.format (
"Ungated portal client '%s' (via property change)",
app_name))
end
end)
local gated = client:get_property (
"pipewire.access.portal.gated")
if gated == "true" then
client:update_permissions { [0] = "rwx" }
log:info (client, string.format (
"Ungated portal client '%s' (gate was already set)",
app_name))
end
end
transition:advance ()
end)
else