mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 13:50:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pipewire: Use xdg-portal provided file descriptor

Browse source 
The documentation for `OpenPipeWireRemote()` says:
> Open a file descriptor to the PipeWire remote where the camera nodes
> are available. The file descriptor should be used to create a
> pw_core object, by using pw_context_connect_fd.

In `InitPipeWire()` we already successfully requested the FD, but then
went on and used the unrestricted default socket.
This does not matter in non-sandboxed environments, as the stream we
want to use is available from both FDs. In flatpak sandboxes, however,
this requires to give full Pipewire access to the application.

Fix this by simply using the right, restricted FD, and while on it,
also make sure to not leak it.

This change has already landed in downstream in Firefox, see
https://phabricator.services.mozilla.com/D122904
https://phabricator.services.mozilla.com/D124508

Bug: webrtc:13152
Change-Id: I3f8995c54c797e1a90a980f231e496a13cbe65b4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/230803
Reviewed-by: Joe Downing <joedow@chromium.org>
Commit-Queue: Joe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/heads/main@{#34983}
This commit is contained in:
Robert Mader 2021-09-06 19:33:17 +02:00 committed by WebRTC LUCI CQ
parent 7f876c8930
commit 593b4d550d
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS
View file

@ -88,6 +88,7 @@ Raman Budny <budnyjj@gmail.com>
Ramprakash Jelari <ennajelari@gmail.com> Ramprakash Jelari <ennajelari@gmail.com>
Riku Voipio <riku.voipio@linaro.org> Riku Voipio <riku.voipio@linaro.org>
Robert Bares <robert@bares.me> Robert Bares <robert@bares.me>
Robert Mader <robert.mader@posteo.de>
Robert Nagy <robert.nagy@gmail.com> Robert Nagy <robert.nagy@gmail.com>
Ryan Yoakum <ryoakum@skobalt.com> Ryan Yoakum <ryoakum@skobalt.com>
Sarah Thompson <sarah@telergy.com> Sarah Thompson <sarah@telergy.com>

6
modules/desktop_capture/linux/base_capturer_pipewire.cc
View file

@ -348,6 +348,10 @@ BaseCapturerPipeWire::~BaseCapturerPipeWire() {
g_object_unref(proxy_); g_object_unref(proxy_);
proxy_ = nullptr; proxy_ = nullptr;
} }
if (pw_fd_ != -1) {
close(pw_fd_);
}
} }
void BaseCapturerPipeWire::InitPortal() { void BaseCapturerPipeWire::InitPortal() {
@ -385,7 +389,7 @@ void BaseCapturerPipeWire::InitPipeWire() {
return; return;
} }
pw_core_ = pw_context_connect(pw_context_, nullptr, 0); pw_core_ = pw_context_connect_fd(pw_context_, pw_fd_, nullptr, 0);
if (!pw_core_) { if (!pw_core_) {
RTC_LOG(LS_ERROR) << "Failed to connect PipeWire context"; RTC_LOG(LS_ERROR) << "Failed to connect PipeWire context";
return; return;

1
modules/desktop_capture/linux/pipewire03.sigs
View file

@ -44,3 +44,4 @@ pw_loop * pw_thread_loop_get_loop(pw_thread_loop *loop);
void pw_context_destroy(pw_context *context); void pw_context_destroy(pw_context *context);
pw_context *pw_context_new(pw_loop *main_loop, pw_properties *props, size_t user_data_size); pw_context *pw_context_new(pw_loop *main_loop, pw_properties *props, size_t user_data_size);
pw_core * pw_context_connect(pw_context *context, pw_properties *properties, size_t user_data_size); pw_core * pw_context_connect(pw_context *context, pw_properties *properties, size_t user_data_size);
pw_core * pw_context_connect_fd(pw_context *context, int fd, pw_properties *properties, size_t user_data_size);