Hi Linux-bluetooth,
Subsystems (4)
cover Hi Linux-bluetooth,
From: Yun-Hao Chung <[email protected]>
This series is to add a new method |SetServiceAllowList| in D-Bus API to control what services can be connected by specifying UUID allow list. Users can query a device property |IsBlockedByPolicy| to tell if some of the services are currently restricted. Since we plan to add more methods to limit different bluetooth functionalities, we also introduce a new interface for this purpose. This series has been tested via sending commands with dbus-send manually on chromebook octopus and eve.
Thanks,
Howard
Howard Chung (7):
doc: add description of SetServiceAllowList
lib: add hash functions for bt_uuid_t
core: add AdminPolicy Interface
input/hog: block connection by policy
audio: Remove Media1 interface when a2dp source disallowed
core: add properties IsBlockedByPolicy and ServiceAllowList
core: store ServiceAllowList into settings
Sonny Sasaka (1):
core: Initialize uuid_str_arr to NULL
Makefile.am | 3 +- doc/admin_policy-api.txt | 34 +++++ doc/device-api.txt | 7 + lib/uuid.c | 21 +++ lib/uuid.h | 3 + profiles/audio/a2dp.c | 2 + profiles/audio/avrcp.c | 3 + profiles/input/hog.c | 22 +++ src/adapter.c | 148 +++++++++++++++++++- src/adapter.h | 5 + src/admin_policy.c | 292 +++++++++++++++++++++++++++++++++++++++ src/admin_policy.h | 23 +++ src/device.c | 79 ++++++++++- src/device.h | 2 + src/profile.c | 39 ++++++ src/profile.h | 5 + src/service.c | 21 +++ src/service.h | 1 + 18 files changed, 705 insertions(+), 5 deletions(-) create mode 100644 doc/admin_policy-api.txt create mode 100644 src/admin_policy.c create mode 100644 src/admin_policy.h
Signature · 1 line
2.31.0.291.g576ba9dcdaf-goog
PATCH 1/8 doc: add description of SetServiceAllowList
This adds description of SetServiceAllowList.
---
doc/admin_policy-api.txt | 34 ++++++++++++++++++++++++++++++++++ doc/device-api.txt | 7 +++++++ 2 files changed, 41 insertions(+) create mode 100644 doc/admin_policy-api.txt
doc/admin_policy-api.txt new file +34 -0
@@ -0,0 +1,34 @@ +BlueZ D-Bus Adapter API description +*********************************** + + +Adapter hierarchy +================= + +Service org.bluez +Interface org.bluez.AdminPolicy1 +Object path [variable prefix]/{hci0,hci1,...} + +Methods void SetServiceAllowList(array{string} UUIDs) [experimental] + + This method sets the service allowlist by specifying + service UUIDs. + + When SetServiceAllowList is called, bluez will first + disconnect all the pending/existing connections and + block future incoming and outgoing connections to + the service in UUIDs for all of the clients once it + finished. + + Any subsequent calls to this method will supersede any + previously set allowlist values. Calling this method + with an empty array will allow any service UUIDs to be + used. + + Possible errors: org.bluez.Error.InvalidArguments + org.bluez.Error.Failed + + +Properties array{string} ServiceAllowList [readonly, experimental] + + Current value of service allow list.
doc/device-api.txt +7 -0
@@ -272,3 +272,10 @@ Properties string Address [readonly] Example: <Transport Discovery> <Organization Flags...> 0x26 0x01 0x01... + + bool IsBlockedByPolicy [readonly, experimental] + + Indicate whether or not this device is blocked by admin + policy. This would be true if any of its auto-connect + service does not exist in the ServiceAllowList under + org.bluez.AdminPolicy1.
Signature · 1 line
2.31.0.291.g576ba9dcdaf-goog
PATCH 2/8 lib: add hash functions for bt_uuid_t
In reply to Howard ChungThis adds function GHashFunc and GEqualFunc for bt_uuid_t. With these functions, we can add uuids into a GHashTable with bt_uuid_t format.
---
lib/uuid.c | 21 +++++++++++++++++++++ lib/uuid.h | 3 +++ 2 files changed, 24 insertions(+)
lib/uuid.c +21 -0
@@ -16,6 +16,7 @@#include <string.h> #include <stdlib.h> #include <errno.h> +#include <glib.h> #include "lib/bluetooth.h" #include "uuid.h"
@@ -120,6 +121,26 @@ int bt_uuid_cmp(const bt_uuid_t *uuid1, const bt_uuid_t *uuid2)return bt_uuid128_cmp (&u1, &u2); } +guint bt_uuid_hash (gconstpointer key) +{ +const bt_uuid_t *uuid = key; +bt_uuid_t uuid_128; +uint64_t *val; + +bt_uuid_to_uuid128 (uuid, &uuid_128); + val = (uint64_t *)&uuid_128.value.u128; + +return g_int64_hash (val) ^g_int64_hash (val+1 ); +} + +gboolean bt_uuid_equal (gconstpointer v1,gconstpointer v2) +{ +const bt_uuid_t *uuid1 = v1; +const bt_uuid_t *uuid2 = v2; + +return bt_uuid_cmp (uuid1, uuid2) ==0 ; +} +/* * convert the UUID to string, copying a maximum of n characters. */
lib/uuid.h +3 -0
@@ -17,6 +17,7 @@ extern "C" {#endif #include <stdint.h> +#include <glib.h> #define GENERIC_AUDIO_UUID "00001203-0000-1000-8000-00805f9b34fb"
@@ -167,6 +168,8 @@ int bt_uuid128_create(bt_uuid_t *btuuid, uint128_t value);int bt_uuid_cmp (const bt_uuid_t *uuid1,const bt_uuid_t *uuid2);void bt_uuid_to_uuid128 (const bt_uuid_t *src,bt_uuid_t *dst); +guint bt_uuid_hash (gconstpointer key); +gboolean bt_uuid_equal (gconstpointer v1,gconstpointer v2);#define MAX_LEN_UUID_STR 37
Signature · 1 line
2.31.0.291.g576ba9dcdaf-goog
PATCH 3/8 core: add AdminPolicy Interface
In reply to Howard ChungThis patch adds a new interface org.bluez.AdminPolicy for Administrator to have better control on Bluetooth behaviors.
This patch also adds a method SetServiceAllowlist under AdminPolicy to only allow incoming and outgoing connections to the service in the allowlist for all of the clients.
For existing connections, bluez will send disconnect request to all of them in case some of them are not allowed by the policy.
For outgoing connections, services not in the allowlist would be removed from its pending list when trying to connect.
For incoming connections, profiles not in the allowlist would be unregistered when policy is set and would be re-registered when policy is relaxed.
For GATT profiles, if it is a system defined profile, e.g. HoG, we disallow the connection if any of its mandatory service is not in the allowlist. Since each profile defines different mandatory services, we'll handle it profile by profile in the future patches. If this is not a system defined profile, we only accept its service connection if it is in allowlist.
---
Makefile.am | 3 +- src/adapter.c | 45 ++++++++- src/adapter.h | 4 + src/admin_policy.c | 240 +++++++++++++++++++++++++++++++++++++++++++++ src/admin_policy.h | 23 +++++ src/device.c | 51 +++++++++- src/device.h | 1 + src/profile.c | 39 ++++++++ src/profile.h | 5 + src/service.c | 21 ++++ src/service.h | 1 + 11 files changed, 428 insertions(+), 5 deletions(-) create mode 100644 src/admin_policy.c create mode 100644 src/admin_policy.h
Makefile.am +2 -1
@@ -297,7 +297,8 @@ src_bluetoothd_SOURCES = $(builtin_sources) \ src/dbus-common.c src/dbus-common.h \ src/eir.h src/eir.c \ src/adv_monitor.h src/adv_monitor.c \ - src/battery.h src/battery.c + src/battery.h src/battery.c \ + src/admin_policy.h src/admin_policy.c src_bluetoothd_LDADD = lib/libbluetooth-internal.la \ gdbus/libgdbus-internal.la \ src/libshared-glib.la \
src/adapter.c +44 -1
87 lines not on this page · raw message
src/adapter.h +4 -0
@@ -97,6 +97,8 @@ void adapter_service_remove(struct btd_adapter *adapter, uint32_t handle);struct agent *adapter_get_agent (struct btd_adapter *adapter); +bool btd_adapter_uuid_is_allowed (struct btd_adapter *adapter,const char *uuid); +struct btd_adapter *btd_adapter_ref (struct btd_adapter *adapter);void btd_adapter_unref (struct btd_adapter *adapter);
@@ -240,3 +242,5 @@ enum kernel_features { };bool btd_has_kernel_features (uint32_t feature); +void btd_adapter_disconnect_all_devices (struct btd_adapter *adapter); +void btd_adapter_refresh_is_blocked_by_policy (struct btd_adapter *adapter);
src/admin_policy.c new file +240 -0
240 lines not on this page · raw message
src/admin_policy.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* +* BlueZ - Bluetooth protocol stack for Linux +* +* Copyright (C) 2021 Google LLC +* +* +*/ + +#include <glib.h> + +struct btd_adapter ; +struct btd_admin_policy ; + +struct btd_admin_policy *btd_admin_policy_create (struct btd_adapter *adapter); +void btd_admin_policy_destroy (struct btd_admin_policy *admin_policy); +GHashTable *btd_admin_policy_allowlist_get ( +struct btd_admin_policy *admin_policy); +void btd_admin_policy_allowlist_set (struct btd_admin_policy *admin_policy, +GHashTable *uuids); +bool btd_admin_policy_uuid_is_allowed (struct btd_admin_policy *admin_policy, +const char *uuid_str);
src/device.c +48 -3
89 lines not on this page · raw message
src/device.h +1 -0
@@ -175,5 +175,6 @@ uint32_t btd_device_get_current_flags(struct btd_device *dev);void btd_device_flags_changed (struct btd_device *dev,uint32_t supported_flags,uint32_t current_flags); +void btd_device_update_is_blocked_by_policy (struct btd_device *dev);void btd_device_init (void );void btd_device_cleanup (void );
src/profile.c +39 -0
@@ -2559,6 +2559,45 @@ bool btd_profile_remove_custom_prop(const char *uuid, const char *name)return false; } +static void update_profile_policy (struct btd_profile *p, +struct btd_adapter *adapter) +{ +bool is_blocked; + + is_blocked = !btd_adapter_uuid_is_allowed (adapter, p->remote_uuid); + +if (!is_blocked && p->is_blocked_by_policy) { + p->is_blocked_by_policy = false; +adapter_add_profile (adapter, p); + +info ("service %s is allowed by policy" , p->remote_uuid); + + }else if (is_blocked && !p->is_blocked_by_policy) { + p->is_blocked_by_policy = true; +adapter_remove_profile (adapter, p); + +info ("service %s is blocked by policy" , p->remote_uuid); + } +} + +void btd_profile_policy_update (struct btd_adapter *adapter) +{ +GSList *l; + +for (l = profiles; l; l = l->next) { +struct btd_profile *p = l->data; + +update_profile_policy (p, adapter); + } + +for (l = ext_profiles; l; l = l->next) { +struct ext_profile *ext_p = l->data; +struct btd_profile *p = &ext_p->p; + +update_profile_policy (p, adapter); + } +} +void btd_profile_init (void ) { g_dbus_register_interface(btd_get_dbus_connection(),
src/profile.h +5 -0
@@ -28,6 +28,8 @@ struct btd_profile {*/ bool external; +bool is_blocked_by_policy; +int (*device_probe) (struct btd_service *service);void (*device_remove) (struct btd_service *service);
@@ -40,6 +42,8 @@ struct btd_profile { struct btd_adapter *adapter);void (*adapter_remove) (struct btd_profile *p,struct btd_adapter *adapter); + +bool (*mandatory_services_are_allowed)(struct btd_service *service); }; void btd_profile_foreach(void (*func)(struct btd_profile *p, void *data),
@@ -63,6 +67,7 @@ bool btd_profile_add_custom_prop(const char *uuid, const char *type,btd_profile_prop_get get, void *user_data);bool btd_profile_remove_custom_prop (const char *uuid,const char *name); +void btd_profile_policy_update (struct btd_adapter *adapter);void btd_profile_init (void );void btd_profile_cleanup (void );
src/service.c +21 -0
@@ -166,6 +166,20 @@ void service_remove(struct btd_service *service)btd_service_unref (service); } +bool btd_service_is_blocked_by_policy (struct btd_service *service) +{ +struct btd_adapter *adapter; + +if (!service->profile->mandatory_services_are_allowed) { + adapter =device_get_adapter (service->device); + +return !btd_adapter_uuid_is_allowed (adapter, + service->profile->remote_uuid); + } + +return !service->profile->mandatory_services_are_allowed (service); +} +int service_accept (struct btd_service *service) {char addr[18 ];
@@ -186,6 +200,13 @@ int service_accept(struct btd_service *service)if (!service->profile->accept)return -ENOSYS ; +if (btd_service_is_blocked_by_policy (service)) { +info ("service %s is blocked by policy" , + service->profile->remote_uuid); + +return -ECONNABORTED ; + } + err = service->profile->accept (service);if (!err) goto done;
src/service.h +1 -0
@@ -35,6 +35,7 @@ struct btd_service *service_create(struct btd_device *device,int service_probe (struct btd_service *service);void service_remove (struct btd_service *service); +bool btd_service_is_blocked_by_policy (struct btd_service *service);int service_accept (struct btd_service *service);int service_set_connecting (struct btd_service *service);
Signature · 1 line
2.31.0.291.g576ba9dcdaf-goog
PATCH 4/8 input/hog: block connection by policy
In reply to Howard ChungThis blocks HoG connection if ServiceAllowList is set and some of the mandatory services are not in the allowlist.
---
profiles/input/hog.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
profiles/input/hog.c +22 -0
@@ -168,6 +168,27 @@ static void hog_remove(struct btd_service *service)hog_device_free (dev); } +static bool mandatory_services_are_allowed (struct btd_service *service) +{ +static const char *const mandatory_uuids[] = {DEVICE_INFORMATION_UUID , +BATTERY_UUID ,HOG_UUID ,NULL }; +struct btd_device *device =btd_service_get_device (service); +struct btd_adapter *adapter =device_get_adapter (device); +struct btd_profile *p =btd_service_get_profile (service); + +int i; + +for (i =0 ; mandatory_uuids[i] !=NULL ; i++) { +if (!btd_adapter_uuid_is_allowed (adapter, mandatory_uuids[i])) { +DBG ("mandatory service %s is blocked by policy" , + mandatory_uuids[i]); +return false; + } + } + +return true; +} +static int hog_accept (struct btd_service *service) {struct hog_device *dev =btd_service_get_user_data (service);
@@ -221,6 +242,7 @@ static struct btd_profile hog_profile = { .accept = hog_accept, .disconnect = hog_disconnect, .auto_connect = true, + .mandatory_services_are_allowed = mandatory_services_are_allowed, };static int hog_init (void )
Signature · 1 line
2.31.0.291.g576ba9dcdaf-goog
PATCH 5/8 audio: Remove Media1 interface when a2dp source disallowed
In reply to Howard ChungWhen A2DP source profile is not allowed by policy, we remove the a2dp_server and everything inside the object, which also release all MediaEndpoints and MediaPlayer. When admin re-allowed A2DP source profile, although we recreate the a2dp_server, clients are not able to know they can register their endpoint and player now.
This patch handle this case by unregistering Media1 interface when we remove a2dp_server, and register it back when a2dp_source is allowed.
---
profiles/audio/a2dp.c | 2 ++ profiles/audio/avrcp.c | 3 +++ 2 files changed, 5 insertions(+)
profiles/audio/a2dp.c +2 -0
@@ -3275,6 +3275,7 @@ static int a2dp_source_server_probe(struct btd_profile *p, {struct a2dp_server *server; +media_register (adapter);DBG ("path %s" ,adapter_get_path (adapter)); server =find_server (servers, adapter);
@@ -3315,6 +3316,7 @@ static void a2dp_source_server_remove(struct btd_profile *p,return ;a2dp_server_unregister (server); +media_unregister (adapter); } static int a2dp_sink_server_probe(struct btd_profile *p,
profiles/audio/avrcp.c +3 -0
@@ -4735,6 +4735,8 @@ static void avrcp_controller_server_remove(struct btd_profile *p,if (server->tg_record_id ==0 )avrcp_server_unregister (server); + +media_unregister (adapter); } static int avrcp_controller_server_probe(struct btd_profile *p,
@@ -4745,6 +4747,7 @@ static int avrcp_controller_server_probe(struct btd_profile *p,DBG ("path %s" ,adapter_get_path (adapter)); +media_register (adapter); server =find_server (servers, adapter);if (server !=NULL ) goto done;
Signature · 1 line
2.31.0.291.g576ba9dcdaf-goog
PATCH 6/8 core: add properties IsBlockedByPolicy and ServiceAllowList
In reply to Howard ChungThis adds IsBlockedByPolicy to indicate if the remote device is currently blocked by policy.
ServiceAllowlist is also introduced to indicate the current service allowlist.
---
src/admin_policy.c | 57 +++++++++++++++++++++++++++++++++++++++++++--- src/device.c | 32 ++++++++++++++++++++++++-- src/device.h | 1 + 3 files changed, 85 insertions(+), 5 deletions(-)
src/admin_policy.c +54 -3
@@ -118,8 +118,13 @@ void btd_admin_policy_allowlist_set(struct btd_admin_policy *admin_policy,*/ btd_profile_policy_update (admin_policy->adapter); -/* Update auto-connect status to all devices */ +/* Update auto-connect and IsBlockedByPolicy status to all devices */ btd_adapter_refresh_is_blocked_by_policy (admin_policy->adapter); + +g_dbus_emit_property_changed (btd_get_dbus_connection (), +adapter_get_path (admin_policy->adapter), +ADMIN_POLICY_INTERFACE , +"ServiceAllowList" ); } static DBusMessage *set_service_allowlist(DBusConnection *conn,
@@ -201,6 +206,51 @@ static struct btd_admin_policy *admin_policy_new(struct btd_adapter *adapter)return admin_policy; } +static void append_uuid_set (gpointer key,gpointer value,gpointer user_data) +{ +const bt_uuid_t *uuid = key; +DBusMessageIter *entry = user_data; +char uuid_str[MAX_LEN_UUID_STR ]; +const char *uuid_str_ptr = uuid_str; + +bt_uuid_to_string (uuid, uuid_str,MAX_LEN_UUID_STR ); +dbus_message_iter_append_basic (entry,DBUS_TYPE_STRING , &uuid_str_ptr); +} + +static gboolean +property_get_service_allowlist (const GDBusPropertyTable *property, +DBusMessageIter *iter,void *user_data) +{ +struct btd_admin_policy *admin_policy = user_data; +DBusMessageIter entry; + +dbus_message_iter_open_container (iter,DBUS_TYPE_ARRAY , +DBUS_TYPE_STRING_AS_STRING , &entry); + +g_hash_table_foreach (admin_policy->allowed_uuid_set, append_uuid_set, + &entry); + +dbus_message_iter_close_container (iter, &entry); + +return TRUE; +} + +static gboolean +property_exists_service_allowlist (const GDBusPropertyTable *property, +void *user_data) +{ +struct btd_admin_policy *admin_policy = user_data; + +return admin_policy->allowed_uuid_set !=NULL ? TRUE : FALSE; +} + +static const GDBusPropertyTable admin_policy_properties[] = { + {"ServiceAllowList" ,"as" , property_get_service_allowlist,NULL , + property_exists_service_allowlist, +G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, + { } +}; +struct btd_admin_policy *btd_admin_policy_create (struct btd_adapter *adapter) {struct btd_admin_policy *admin_policy;
@@ -212,8 +262,9 @@ struct btd_admin_policy *btd_admin_policy_create(struct btd_adapter *adapter)if (!g_dbus_register_interface (btd_get_dbus_connection (),adapter_get_path (admin_policy->adapter),ADMIN_POLICY_INTERFACE , - admin_policy_methods,NULL ,NULL , - admin_policy,NULL )) { + admin_policy_methods,NULL , + admin_policy_properties, admin_policy, +NULL )) {btd_error (admin_policy->adapter_id,"Failed to register " ADMIN_POLICY_INTERFACE );
src/device.c +30 -2
@@ -265,6 +265,7 @@ struct btd_device {gboolean auto_connect;gboolean disable_auto_connect;gboolean general_connect; +gboolean is_blocked_by_policy;bool legacy;int8_t rssi;
@@ -1470,6 +1471,18 @@ static gboolean dev_property_wake_allowed_exist(return device_get_wake_support (device); } +static gboolean +dev_property_get_is_blocked_by_policy (const GDBusPropertyTable *property, +DBusMessageIter *iter,void *data) +{ +struct btd_device *device = data; +dbus_bool_t is_blocked = device->is_blocked_by_policy; + +dbus_message_iter_append_basic (iter,DBUS_TYPE_BOOLEAN , &is_blocked); + +return TRUE; +} +static bool disconnect_all (gpointer user_data) {struct btd_device *device = user_data;
@@ -1929,6 +1942,16 @@ static int service_prio_cmp(gconstpointer a, gconstpointer b)return p2->priority - p1->priority; } +static void refresh_is_blocked_by_policy (struct btd_device *dev,bool value) +{ +if (value == dev->is_blocked_by_policy) +return ; + + dev->is_blocked_by_policy = value; +g_dbus_emit_property_changed (dbus_conn, dev->path, +DEVICE_INTERFACE ,"IsBlockedByPolicy" ); +} +void btd_device_update_is_blocked_by_policy (struct btd_device *dev) {struct btd_adapter *adapter = dev->adapter;
@@ -1936,6 +1959,7 @@ void btd_device_update_is_blocked_by_policy(struct btd_device *dev)struct btd_profile *profile;GSList *l;bool auto_connect = false; +bool is_blocked = false;/* If service discover is ongoing, let the service discover complete * callback call this function.
@@ -1950,13 +1974,16 @@ void btd_device_update_is_blocked_by_policy(struct btd_device *dev)if (!profile->auto_connect)continue ; -if (profile->accept && - !btd_service_is_blocked_by_policy (service)) +if (btd_service_is_blocked_by_policy (service)) + is_blocked = true; +else if (profile->accept) auto_connect = true; }if (!dev->disable_auto_connect)device_set_auto_connect (dev, auto_connect); + +refresh_is_blocked_by_policy (dev, is_blocked); }static GSList *create_pending_list (struct btd_device *dev,const char *uuid)
@@ -2994,6 +3021,7 @@ static const GDBusPropertyTable device_properties[] = { {"WakeAllowed" ,"b" , dev_property_get_wake_allowed, dev_property_set_wake_allowed, dev_property_wake_allowed_exist }, + { "IsBlockedByPolicy", "b", dev_property_get_is_blocked_by_policy}, { } };
src/device.h +1 -0
@@ -74,6 +74,7 @@ void device_set_service_data(struct btd_device *dev, GSList *list, bool duplicate);void device_set_data (struct btd_device *dev,GSList *list,bool duplicate); +void btd_device_update_is_blocked_by_policy (struct btd_device *dev);void device_probe_profile (gpointer a,gpointer b);void device_remove_profile (gpointer a,gpointer b);struct btd_adapter *device_get_adapter (struct btd_device *device);
Signature · 1 line
2.31.0.291.g576ba9dcdaf-goog
PATCH 7/8 core: store ServiceAllowList into settings
In reply to Howard ChungThis implements the logics of storing ServiceAllowList when the value changed and restoring ServiceAllowList when adapter initialized.
The stored information would look like:
ServiceAllowList=$UUID128_STRING1;$UUID128_STRING2......
---
src/adapter.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ src/adapter.h | 1 + src/admin_policy.c | 1 + 3 files changed, 105 insertions(+)
src/adapter.c +103 -0
@@ -473,13 +473,19 @@ uint8_t btd_adapter_get_address_type(struct btd_adapter *adapter)return adapter->bdaddr_type; } +static char **create_uuid_string_allowlist (GHashTable *allowed_uuid_set, +guint *num_of_uuid);static void store_adapter_info (struct btd_adapter *adapter) {GKeyFile *key_file; +GHashTable *allowed_uuid_set;char filename[PATH_MAX ];char *str;gsize length =0 ;gboolean discoverable; +char **uuid_str_arr; +guint num_of_uuid =0 ; +int i; key_file =g_key_file_new ();
@@ -508,15 +514,36 @@ static void store_adapter_info(struct btd_adapter *adapter)snprintf (filename,PATH_MAX ,STORAGEDIR "/%s/settings" ,btd_adapter_get_storage_dir (adapter)); +if (adapter->admin_policy) { + allowed_uuid_set =btd_admin_policy_allowlist_get ( + adapter->admin_policy); + uuid_str_arr =create_uuid_string_allowlist (allowed_uuid_set, + &num_of_uuid); +g_key_file_set_string_list (key_file,"Policy" , +"ServiceAllowList" , + (const char *const *)uuid_str_arr, num_of_uuid); + }create_file (filename,0600 ); + str =g_key_file_to_data (key_file, &length,NULL );g_file_set_contents (filename, str, length,NULL );g_free (str); +for (i =0 ; i < num_of_uuid; i++) +g_free (uuid_str_arr[i]); + +g_free (uuid_str_arr); +g_key_file_free (key_file); } +void btd_adapter_store_adapter_info (struct btd_adapter *adapter) +{ +if (adapter) +store_adapter_info (adapter); +} +static void trigger_pairable_timeout (struct btd_adapter *adapter);static void adapter_start (struct btd_adapter *adapter);static void adapter_stop (struct btd_adapter *adapter);
@@ -3509,6 +3536,32 @@ void btd_adapter_refresh_is_blocked_by_policy(struct btd_adapter *adapter) NULL); } +static char **create_uuid_string_allowlist (GHashTable *allowed_uuid_set, +guint *num_of_uuid) +{ +int i; +gpointer *uuids; +char **uuid_str_allowlist; +bt_uuid_t *uuid; + + uuids =g_hash_table_get_keys_as_array (allowed_uuid_set, num_of_uuid); + uuid_str_allowlist =g_try_malloc_n (*num_of_uuid,sizeof (char *)); + +if (!uuid_str_allowlist && !num_of_uuid) { +error ("Failed to allocate memory for uuid_str_allowlist" ); +return NULL ; + } + +for (i =0 ; i < *num_of_uuid; i++) { + uuid = uuids[i]; + uuid_str_allowlist[i] =g_try_malloc (MAX_LEN_UUID_STR ); +bt_uuid_to_string (uuid, uuid_str_allowlist[i], +MAX_LEN_UUID_STR ); + } + +return uuid_str_allowlist; +} +static const GDBusMethodTable adapter_methods[] = { {GDBUS_ASYNC_METHOD ("StartDiscovery" ,NULL ,NULL , start_discovery) }, { GDBUS_METHOD("SetDiscoveryFilter",
@@ -6265,12 +6318,42 @@ static void fix_storage(struct btd_adapter *adapter)textfile_del (filename,"converted" ); } +static GHashTable *uuid_list_to_uuid_set (gchar **uuids,gsize num_of_uuid) +{ +int i; +bt_uuid_t *uuid; +GHashTable *uuid_set =g_hash_table_new_full (bt_uuid_hash, + bt_uuid_equal, g_free,NULL ); + +if (!uuid_set) +return NULL ; + +for (i =0 ; i < num_of_uuid; i++) { + uuid =g_try_malloc (sizeof (*uuid)); + +if (!uuid ||bt_string_to_uuid (uuid, *uuids)) + goto failed; + +g_hash_table_add (uuid_set, uuid); + uuids++; + } + +return uuid_set; + +failed: +g_hash_table_destroy (uuid_set); +return NULL ; +} +static void load_config (struct btd_adapter *adapter) {GKeyFile *key_file;char filename[PATH_MAX ];struct stat st; +GHashTable *uuid_set;GError *gerr =NULL ; +gchar **uuids =NULL ; +gsize num_of_uuid; key_file =g_key_file_new ();
@@ -6320,6 +6403,23 @@ static void load_config(struct btd_adapter *adapter) gerr =NULL ; } +if (adapter->admin_policy) { + uuids =g_key_file_get_string_list (key_file,"Policy" , +"ServiceAllowList" , &num_of_uuid, &gerr); + +if (gerr) { + uuids =NULL ; + num_of_uuid =0 ; +g_error_free (gerr); + gerr =NULL ; + } + + uuid_set =uuid_list_to_uuid_set (uuids, num_of_uuid); +if (uuid_set) +btd_admin_policy_allowlist_set (adapter->admin_policy, + uuid_set); + } +g_key_file_free (key_file); }
@@ -8761,6 +8861,9 @@ load:load_defaults (adapter);load_devices (adapter); +/* Update IsBlockedByPolicy on devices */ +g_slist_foreach (adapter->devices, update_device_is_blocked_by_policy, +NULL );/* restore Service Changed CCC value for bonded devices */ btd_gatt_database_restore_svc_chng_ccc (adapter->database);
src/adapter.h +1 -0
@@ -90,6 +90,7 @@ const char *adapter_get_path(struct btd_adapter *adapter);const bdaddr_t *btd_adapter_get_address (struct btd_adapter *adapter);uint8_t btd_adapter_get_address_type (struct btd_adapter *adapter);const char *btd_adapter_get_storage_dir (struct btd_adapter *adapter); +void btd_adapter_store_adapter_info (struct btd_adapter *adapter);int adapter_set_name (struct btd_adapter *adapter,const char *name);int adapter_service_add (struct btd_adapter *adapter,sdp_record_t *rec);
src/admin_policy.c +1 -0
@@ -154,6 +154,7 @@ static DBusMessage *set_service_allowlist(DBusConnection *conn,g_hash_table_destroy (admin_policy->allowed_uuid_set);btd_admin_policy_allowlist_set (admin_policy, uuid_set); +btd_adapter_store_adapter_info (adapter);return dbus_message_new_method_return (msg); }
Signature · 1 line
2.31.0.291.g576ba9dcdaf-goog
PATCH 8/8 core: Initialize uuid_str_arr to NULL
In reply to Howard ChungFrom: Sonny Sasaka <[email protected]>
Not initializing may crash g_free() below.
---
src/adapter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/adapter.c +1 -1
@@ -483,7 +483,7 @@ static void store_adapter_info(struct btd_adapter *adapter)char *str;gsize length =0 ;gboolean discoverable; -char **uuid_str_arr; +char **uuid_str_arr =NULL ;guint num_of_uuid =0 ;int i;
Signature · 1 line
2.31.0.291.g576ba9dcdaf-goog
Luiz Augusto von Dentz
maintainerHi Howard,
Quoted 51 lines · Howard Chung
From: Yun-Hao Chung <[email protected]>
This series is to add a new method |SetServiceAllowList| in D-Bus API to control what services can be connected by specifying UUID allow list. Users can query a device property |IsBlockedByPolicy| to tell if some of the services are currently restricted. Since we plan to add more methods to limit different bluetooth functionalities, we also introduce a new interface for this purpose. This series has been tested via sending commands with dbus-send manually on chromebook octopus and eve.
Thanks,
HowardHoward Chung (7):
doc: add description of SetServiceAllowList
lib: add hash functions forbt_uuid_t
core: add AdminPolicy Interface
input/hog: block connection by policy
audio: Remove Media1 interface when a2dp source disallowed
core: add properties IsBlockedByPolicy and ServiceAllowList
core: store ServiceAllowList into settingsSonny Sasaka (1):
core: Initializeuuid_str_arrto NULLMakefile.am | 3 +- doc/admin_policy-api.txt | 34 +++++ doc/device-api.txt | 7 + lib/uuid.c | 21 +++ lib/uuid.h | 3 + profiles/audio/a2dp.c | 2 + profiles/audio/avrcp.c | 3 + profiles/input/hog.c | 22 +++ src/adapter.c | 148 +++++++++++++++++++- src/adapter.h | 5 + src/admin_policy.c | 292 +++++++++++++++++++++++++++++++++++++++ src/admin_policy.h | 23 +++ src/device.c | 79 ++++++++++- src/device.h | 2 + src/profile.c | 39 ++++++ src/profile.h | 5 + src/service.c | 21 +++ src/service.h | 1 + 18 files changed, 705 insertions(+), 5 deletions(-) create mode 100644 doc/admin_policy-api.txt create mode 100644 src/admin_policy.c create mode 100644 src/admin_policy.h
Quoted 2 lines
--
2.31.0.291.g576ba9dcdaf-goog
I think I mentioned to one of you guys before so sorry I will be repeating myself, we did in the past have control over blocking/connection on a per service level using a plugin:
https://github.com/Vudentz/BlueZ/commits/service_api
https://github.com/Vudentz/BlueZ/blob/service_api/plugins/service.c
It probably need some rebasing to be applied on top but it already gives upper layer control over things like auto-connect and blocked properties, I've didn't add support for persisting the setting on storage though since this use case was limited to car industry but if we go into this direction I rather have this plugin instead.
Signature · 1 line
Luiz Augusto von Dentz