mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-05 13:30:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

modules: set pipewire.access.portal.app_id in access & pulse-server

Browse source 
When detecting a access=flatpak application, set also
pipewire.access.portal.app_id, if determined
This commit is contained in:
Pauli Virtanen 2022-07-31 02:32:32 +03:00 • committed by Wim Taymans
parent 3730e54484
commit 0e12242a1b
2 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/modules/module-access.c
View file

@ -77,6 +77,9 @@
* on an external actor to update that property once permission is * on an external actor to update that property once permission is
* granted or rejected. * granted or rejected.
* *
* For connections from applications running inside Flatpak not mediated
* by a portal, the `access` module itself sets the `pipewire.access.portal.app_id`
* property to the Flatpak application ID.
* *
* ## Module Options * ## Module Options
* *
@ -194,6 +197,8 @@ context_check_access(void *data, struct pw_impl_client *client)
struct spa_dict_item items[2]; struct spa_dict_item items[2];
const struct pw_properties *props; const struct pw_properties *props;
const char *str, *access; const char *str, *access;
char *flatpak_app_id = NULL;
int nitems = 0;
int pid, res; int pid, res;
pid = -EINVAL; pid = -EINVAL;
@ -252,7 +257,7 @@ context_check_access(void *data, struct pw_impl_client *client)
(access = pw_properties_get(impl->properties, "access.force")) != NULL) (access = pw_properties_get(impl->properties, "access.force")) != NULL)
goto wait_permissions; goto wait_permissions;
res = pw_check_flatpak(pid, NULL, NULL); res = pw_check_flatpak(pid, &flatpak_app_id, NULL);
if (res != 0) { if (res != 0) {
if (res < 0) { if (res < 0) {
if (res == -EACCES) { if (res == -EACCES) {
@ -266,6 +271,8 @@ context_check_access(void *data, struct pw_impl_client *client)
pw_log_debug(" %p: flatpak client %p added", impl, client); pw_log_debug(" %p: flatpak client %p added", impl, client);
} }
access = "flatpak"; access = "flatpak";
items[nitems++] = SPA_DICT_ITEM_INIT("pipewire.access.portal.app_id",
flatpak_app_id);
goto wait_permissions; goto wait_permissions;
} }
@ -279,24 +286,28 @@ context_check_access(void *data, struct pw_impl_client *client)
granted: granted:
pw_log_info("%p: client %p '%s' access granted", impl, client, access); pw_log_info("%p: client %p '%s' access granted", impl, client, access);
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_ACCESS, access); items[nitems++] = SPA_DICT_ITEM_INIT(PW_KEY_ACCESS, access);
pw_impl_client_update_properties(client, &SPA_DICT_INIT(items, 1)); pw_impl_client_update_properties(client, &SPA_DICT_INIT(items, nitems));
permissions[0] = PW_PERMISSION_INIT(PW_ID_ANY, PW_PERM_ALL); permissions[0] = PW_PERMISSION_INIT(PW_ID_ANY, PW_PERM_ALL);
pw_impl_client_update_permissions(client, 1, permissions); pw_impl_client_update_permissions(client, 1, permissions);
return; goto done;
wait_permissions: wait_permissions:
pw_log_info("%p: client %p wait for '%s' permissions", pw_log_info("%p: client %p wait for '%s' permissions",
impl, client, access); impl, client, access);
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_ACCESS, access); items[nitems++] = SPA_DICT_ITEM_INIT(PW_KEY_ACCESS, access);
pw_impl_client_update_properties(client, &SPA_DICT_INIT(items, 1)); pw_impl_client_update_properties(client, &SPA_DICT_INIT(items, nitems));
return; goto done;
rejected: rejected:
pw_resource_error(pw_impl_client_get_core_resource(client), res, access); pw_resource_error(pw_impl_client_get_core_resource(client), res, access);
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_ACCESS, access); items[nitems++] = SPA_DICT_ITEM_INIT(PW_KEY_ACCESS, access);
pw_impl_client_update_properties(client, &SPA_DICT_INIT(items, 1)); pw_impl_client_update_properties(client, &SPA_DICT_INIT(items, nitems));
goto done;
done:
free(flatpak_app_id);
return; return;
} }

8
src/modules/module-protocol-pulse/server.c
View file

@ -418,14 +418,20 @@ on_connect(void *data, int fd, uint32_t mask)
client_access = server->client_access; client_access = server->client_access;
if (server->addr.ss_family == AF_UNIX) { if (server->addr.ss_family == AF_UNIX) {
char *app_id = NULL;
#ifdef SO_PRIORITY #ifdef SO_PRIORITY
val = 6; val = 6;
if (setsockopt(client_fd, SOL_SOCKET, SO_PRIORITY, &val, sizeof(val)) < 0) if (setsockopt(client_fd, SOL_SOCKET, SO_PRIORITY, &val, sizeof(val)) < 0)
pw_log_warn("setsockopt(SO_PRIORITY) failed: %m"); pw_log_warn("setsockopt(SO_PRIORITY) failed: %m");
#endif #endif
pid = get_client_pid(client, client_fd); pid = get_client_pid(client, client_fd);
if (pid != 0 && pw_check_flatpak(pid, NULL, NULL) == 1) if (pid != 0 && pw_check_flatpak(pid, &app_id, NULL) == 1) {
client_access = "flatpak"; client_access = "flatpak";
pw_properties_set(client->props, "pipewire.access.portal.app_id",
app_id);
}
free(app_id);
} }
else if (server->addr.ss_family == AF_INET || server->addr.ss_family == AF_INET6) { else if (server->addr.ss_family == AF_INET || server->addr.ss_family == AF_INET6) {