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

permissions: pass pw_permission struct around

Browse source 
Use a pw_permission struct to express permissions of object.
Improve client permissions, add/remove globals when permissions
are changed.
This commit is contained in:
Wim Taymans 2018-11-05 15:02:08 +01:00
parent f994b7eb70
commit eb0a561f8c
13 changed files with 282 additions and 320 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -110,6 +110,7 @@ core_check_access(void *data, struct pw_client *client)
{
struct impl *impl = data;
const struct ucred *ucred;
struct pw_permission permissions[1];
struct spa_dict_item items[2];
const char *str;
int res;
@ -128,7 +129,8 @@ core_check_access(void *data, struct pw_client *client)
if (res == 0)
goto granted;
if (res > 0)
res = EACCES;
res = -EACCES;
items[0] = SPA_DICT_ITEM_INIT("pipewire.access", "blacklisted");
goto blacklisted;
}
@ -162,7 +164,8 @@ core_check_access(void *data, struct pw_client *client)
granted:
pw_log_debug("module %p: client %p access granted", impl, client);
pw_client_set_permissions(client, PW_PERM_RWX);
permissions[0] = PW_PERMISSION_INIT(-1, PW_PERM_RWX);
pw_client_update_permissions(client, 1, permissions);
return;
wait_permissions:
@ -172,7 +175,6 @@ core_check_access(void *data, struct pw_client *client)
return;
blacklisted:
items[0] = SPA_DICT_ITEM_INIT("pipewire.access", "blacklisted");
pw_resource_error(pw_client_get_core_resource(client), 0, res, "blacklisted");
pw_client_update_properties(client, &SPA_DICT_INIT(items, 1));
return;

115
src/modules/module-protocol-native/protocol-native.c
View file

@ -64,22 +64,23 @@ static void core_marshal_client_update(void *object, const struct spa_dict *prop
pw_protocol_native_end_proxy(proxy, b);
}
static void core_marshal_permissions(void *object, const struct spa_dict *props)
static void core_marshal_permissions(void *object, uint32_t n_permissions,
const struct pw_permission *permissions)
{
struct pw_proxy *proxy = object;
struct spa_pod_builder *b;
int i, n_items;
int i;
b = pw_protocol_native_begin_proxy(proxy, PW_CORE_PROXY_METHOD_PERMISSIONS);
n_items = props ? props->n_items : 0;
spa_pod_builder_add(b, "[",
"i", n_permissions,
NULL);
spa_pod_builder_add(b, "[ i", n_items, NULL);
for (i = 0; i < n_items; i++) {
for (i = 0; i < n_permissions; i++) {
spa_pod_builder_add(b,
"s", props->items[i].key,
"s", props->items[i].value, NULL);
"i", permissions[i].id,
"i", permissions[i].permissions, NULL);
}
spa_pod_builder_add(b, "]", NULL);
@ -340,23 +341,25 @@ static int core_demarshal_client_update(void *object, void *data, size_t size)
static int core_demarshal_permissions(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_dict props;
struct spa_pod_parser prs;
uint32_t i;
struct pw_permission *permissions;
uint32_t i, n_permissions;
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, "[ i", &props.n_items, NULL) < 0)
if (spa_pod_parser_get(&prs, "[",
"i", &n_permissions, NULL) < 0)
return -EINVAL;
props.items = alloca(props.n_items * sizeof(struct spa_dict_item));
for (i = 0; i < props.n_items; i++) {
permissions = alloca(n_permissions * sizeof(struct pw_permission));
for (i = 0; i < n_permissions; i++) {
if (spa_pod_parser_get(&prs,
"s", &props.items[i].key,
"s", &props.items[i].value,
"i", &permissions[i].id,
"i", &permissions[i].permissions,
NULL) < 0)
return -EINVAL;
}
pw_resource_do(resource, struct pw_core_proxy_methods, permissions, 0, &props);
pw_resource_do(resource, struct pw_core_proxy_methods, permissions, 0,
n_permissions, permissions);
return 0;
}
@ -1017,24 +1020,23 @@ static int client_demarshal_info(void *object, void *data, size_t size)
return 0;
}
static void client_marshal_permissions(void *object, const struct spa_dict *dict)
static void client_marshal_permissions(void *object, uint32_t index, uint32_t n_permissions,
struct pw_permission *permissions)
{
struct pw_resource *resource = object;
struct spa_pod_builder *b;
uint32_t i, n_items;
uint32_t i;
b = pw_protocol_native_begin_resource(resource, PW_CLIENT_PROXY_EVENT_PERMISSIONS);
n_items = dict ? dict->n_items : 0;
spa_pod_builder_add(b,
"[",
"i", n_items, NULL);
"[ i", index,
"i", n_permissions, NULL);
for (i = 0; i < n_items; i++) {
for (i = 0; i < n_permissions; i++) {
spa_pod_builder_add(b,
"s", dict->items[i].key,
"s", dict->items[i].value, NULL);
"s", permissions[i].id,
"s", permissions[i].permissions, NULL);
}
spa_pod_builder_add(b, "]", NULL);
@ -1044,23 +1046,24 @@ static void client_marshal_permissions(void *object, const struct spa_dict *dict
static int client_demarshal_permissions(void *object, void *data, size_t size)
{
struct pw_proxy *proxy = object;
struct spa_dict props;
struct pw_permission *permissions;
struct spa_pod_parser prs;
uint32_t i;
uint32_t i, index, n_permissions;
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, "[ i", &props.n_items, NULL) < 0)
if (spa_pod_parser_get(&prs, "[ i", &index,
"i", &n_permissions, NULL) < 0)
return -EINVAL;
props.items = alloca(props.n_items * sizeof(struct spa_dict_item));
for (i = 0; i < props.n_items; i++) {
permissions = alloca(n_permissions * sizeof(struct pw_permission));
for (i = 0; i < n_permissions; i++) {
if (spa_pod_parser_get(&prs,
"s", &props.items[i].key,
"s", &props.items[i].value,
"i", &permissions[i].id,
"i", &permissions[i].permissions,
NULL) < 0)
return -EINVAL;
}
pw_proxy_notify(proxy, struct pw_client_proxy_events, permissions, 0, &props);
pw_proxy_notify(proxy, struct pw_client_proxy_events, permissions, 0, index, n_permissions, permissions);
return 0;
}
@ -1095,14 +1098,16 @@ static int client_demarshal_error(void *object, void *data, size_t size)
return 0;
}
static void client_marshal_get_permissions(void *object)
static void client_marshal_get_permissions(void *object, uint32_t index, uint32_t num)
{
struct pw_proxy *proxy = object;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_PROXY_METHOD_GET_PERMISSIONS);
spa_pod_builder_add_struct(b, "P", NULL);
spa_pod_builder_add_struct(b,
"i", index,
"i", num, NULL);
pw_protocol_native_end_proxy(proxy, b);
}
@ -1111,32 +1116,33 @@ static int client_demarshal_get_permissions(void *object, void *data, size_t siz
{
struct pw_resource *resource = object;
struct spa_pod_parser prs;
void *ptr;
uint32_t index, num;
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, "[P]", &ptr, NULL) < 0)
if (spa_pod_parser_get(&prs,
"[i", &index,
"i", &num, NULL) < 0)
return -EINVAL;
pw_resource_do(resource, struct pw_client_proxy_methods, get_permissions, 0);
pw_resource_do(resource, struct pw_client_proxy_methods, get_permissions, 0, index, num);
return 0;
}
static void client_marshal_update_permissions(void *object, const struct spa_dict *props)
static void client_marshal_update_permissions(void *object, uint32_t n_permissions,
const struct pw_permission *permissions)
{
struct pw_proxy *proxy = object;
struct spa_pod_builder *b;
int i, n_items;
int i;
b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_PROXY_METHOD_UPDATE_PERMISSIONS);
n_items = props ? props->n_items : 0;
spa_pod_builder_add(b, "[ i", n_permissions, NULL);
spa_pod_builder_add(b, "[ i", n_items, NULL);
for (i = 0; i < n_items; i++) {
for (i = 0; i < n_permissions; i++) {
spa_pod_builder_add(b,
"s", props->items[i].key,
"s", props->items[i].value, NULL);
"i", permissions[i].id,
"i", permissions[i].permissions, NULL);
}
spa_pod_builder_add(b, "]", NULL);
@ -1146,23 +1152,24 @@ static void client_marshal_update_permissions(void *object, const struct spa_dic
static int client_demarshal_update_permissions(void *object, void *data, size_t size)
{
struct pw_resource *resource = object;
struct spa_dict props;
struct pw_permission *permissions;
struct spa_pod_parser prs;
uint32_t i;
uint32_t i, n_permissions;
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, "[ i", &props.n_items, NULL) < 0)
if (spa_pod_parser_get(&prs, "[ i", &n_permissions, NULL) < 0)
return -EINVAL;
props.items = alloca(props.n_items * sizeof(struct spa_dict_item));
for (i = 0; i < props.n_items; i++) {
permissions = alloca(n_permissions * sizeof(struct pw_permission));
for (i = 0; i < n_permissions; i++) {
if (spa_pod_parser_get(&prs,
"s", &props.items[i].key,
"s", &props.items[i].value,
"i", &permissions[i].id,
"i", &permissions[i].permissions,
NULL) < 0)
return -EINVAL;
}
pw_resource_do(resource, struct pw_client_proxy_methods, update_permissions, 0, &props);
pw_resource_do(resource, struct pw_client_proxy_methods, update_permissions, 0,
n_permissions, permissions);
return 0;
}