* [Bluez PATCH v4 01/13] core: add is_allowed property in btd_service
2021-07-29 3:12 [Bluez PATCH v4 00/13] Admin policy series Howard Chung
@ 2021-07-29 3:12 ` Howard Chung
2021-07-29 3:39 ` Admin policy series bluez.test.bot
2021-07-29 3:12 ` [Bluez PATCH v4 02/13] core: add adapter and device allowed_uuid functions Howard Chung
` (11 subsequent siblings)
12 siblings, 1 reply; 15+ messages in thread
From: Howard Chung @ 2021-07-29 3:12 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz; +Cc: Yun-Hao Chung, Miao-chen Chou
From: Yun-Hao Chung <howardchung@chromium.org>
This adds is_allowed property in btd_service. When is_allowed is set to
false, calling btd_service_connect and service_accept will fail and the
existing service connection gets disconnected.
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
Changes in v4:
- Update commit message (admin_policy -> admin)
- remove old plugins/admin_policy.c
Changes in v3:
- Rename plugins/admin_policy.c -> plugins/admin.c
- Use device_added callback in btd_adapter_driver instead of listen for
dbus
- Add authorization method in profiles/health/mcap.c and block incoming
connections in adapter authorization function.
Changes in v2:
- Move bt_uuid_hash and bt_uuid_equal functions to adapter.c.
- Modify the criteria to say a device is `Affected` from any-of-uuid
to any-of-auto-connect-profile.
- Remove the code to remove/reprobe disallowed/allowed profiles,
instead, check if the service is allowed in bt_io_accept connect_cb.
- Fix a typo in emit_property_change in
plugin/admin_policy.c:set_service_allowlist
- Instead of using device_state_cb, utilize D-BUS client to watch device
added/removed.
- Add a document in doc/
src/service.c | 39 +++++++++++++++++++++++++++++++++++++++
src/service.h | 2 ++
2 files changed, 41 insertions(+)
diff --git a/src/service.c b/src/service.c
index 21a52762e637..929d6c136b6d 100644
--- a/src/service.c
+++ b/src/service.c
@@ -41,6 +41,7 @@ struct btd_service {
void *user_data;
btd_service_state_t state;
int err;
+ bool is_allowed;
};
struct service_state_callback {
@@ -133,6 +134,7 @@ struct btd_service *service_create(struct btd_device *device,
service->device = device; /* Weak ref */
service->profile = profile;
service->state = BTD_SERVICE_STATE_UNAVAILABLE;
+ service->is_allowed = true;
return service;
}
@@ -186,6 +188,18 @@ int service_accept(struct btd_service *service)
if (!service->profile->accept)
return -ENOSYS;
+ if (!service->is_allowed) {
+ info("service %s is not allowed",
+ service->profile->remote_uuid);
+ return -ECONNABORTED;
+ }
+
+ if (!service->is_allowed) {
+ info("service %s is not allowed",
+ service->profile->remote_uuid);
+ return -ECONNABORTED;
+ }
+
err = service->profile->accept(service);
if (!err)
goto done;
@@ -245,6 +259,12 @@ int btd_service_connect(struct btd_service *service)
return -EBUSY;
}
+ if (!service->is_allowed) {
+ info("service %s is not allowed",
+ service->profile->remote_uuid);
+ return -ECONNABORTED;
+ }
+
err = profile->connect(service);
if (err == 0) {
change_state(service, BTD_SERVICE_STATE_CONNECTING, 0);
@@ -361,6 +381,25 @@ bool btd_service_remove_state_cb(unsigned int id)
return false;
}
+void btd_service_set_allowed(struct btd_service *service, bool allowed)
+{
+ if (allowed == service->is_allowed)
+ return;
+
+ service->is_allowed = allowed;
+
+ if (!allowed && (service->state == BTD_SERVICE_STATE_CONNECTING ||
+ service->state == BTD_SERVICE_STATE_CONNECTED)) {
+ btd_service_disconnect(service);
+ return;
+ }
+}
+
+bool btd_service_is_allowed(struct btd_service *service)
+{
+ return service->is_allowed;
+}
+
void btd_service_connecting_complete(struct btd_service *service, int err)
{
if (service->state != BTD_SERVICE_STATE_DISCONNECTED &&
diff --git a/src/service.h b/src/service.h
index 88530cc17d53..5a2a02447b24 100644
--- a/src/service.h
+++ b/src/service.h
@@ -51,6 +51,8 @@ int btd_service_get_error(const struct btd_service *service);
unsigned int btd_service_add_state_cb(btd_service_state_cb cb,
void *user_data);
bool btd_service_remove_state_cb(unsigned int id);
+void btd_service_set_allowed(struct btd_service *service, bool allowed);
+bool btd_service_is_allowed(struct btd_service *service);
/* Functions used by profile implementation */
void btd_service_connecting_complete(struct btd_service *service, int err);
--
2.32.0.554.ge1b32706d8-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread* RE: Admin policy series
2021-07-29 3:12 ` [Bluez PATCH v4 01/13] core: add is_allowed property in btd_service Howard Chung
@ 2021-07-29 3:39 ` bluez.test.bot
0 siblings, 0 replies; 15+ messages in thread
From: bluez.test.bot @ 2021-07-29 3:39 UTC (permalink / raw)
To: linux-bluetooth, howardchung
[-- Attachment #1: Type: text/plain, Size: 11639 bytes --]
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=523089
---Test result---
Test Summary:
CheckPatch FAIL 4.21 seconds
GitLint PASS 1.59 seconds
Prep - Setup ELL PASS 47.01 seconds
Build - Prep PASS 0.11 seconds
Build - Configure PASS 8.40 seconds
Build - Make FAIL 152.72 seconds
Make Check FAIL 0.52 seconds
Make Distcheck PASS 242.04 seconds
Build w/ext ELL - Configure PASS 8.44 seconds
Build w/ext ELL - Make FAIL 140.34 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
Output:
mcap: add adapter authorization
WARNING:NEW_TYPEDEFS: do not add new typedefs
#152: FILE: profiles/health/mcap.h:253:
+typedef guint (* mcap_authorize_cb) (const bdaddr_t *src, const bdaddr_t *dst,
WARNING:LONG_LINE_COMMENT: line length of 93 exceeds 80 columns
#163: FILE: profiles/health/mcap.h:279:
+ mcap_authorize_cb authorize_cb; /* Method to request authorization */
- total: 0 errors, 2 warnings, 141 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
"[PATCH] mcap: add adapter authorization" has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
core: add device_added and device_removed to adapter driver
WARNING:SPACING: Unnecessary space before function pointer arguments
#130: FILE: src/adapter.h:114:
+ void (*device_added) (struct btd_adapter *adapter,
WARNING:SPACING: Unnecessary space before function pointer arguments
#132: FILE: src/adapter.h:116:
+ void (*device_removed) (struct btd_adapter *adapter,
- total: 0 errors, 2 warnings, 112 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
"[PATCH] core: add device_added and device_removed to adapter driver" has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
plugins/admin: add ServiceAllowList property
ERROR:SPACING: need consistent spacing around '*' (ctx:WxV)
#63: FILE: plugins/admin.c:186:
+ const GDBusPropertyTable *property,
^
- total: 1 errors, 0 warnings, 82 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
"[PATCH] plugins/admin: add ServiceAllowList property" has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
plugins/admin: add AffectedByPolicy property
ERROR:SPACING: need consistent spacing around '*' (ctx:WxV)
#65: FILE: plugins/admin.c:254:
+ const GDBusPropertyTable *property,
^
- total: 1 errors, 0 warnings, 121 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
"[PATCH] plugins/admin: add AffectedByPolicy property" has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
plugins/admin: persist policy settings
WARNING:LINE_SPACING: Missing a blank line after declarations
#151: FILE: plugins/admin.c:336:
+ struct queue *uuid_list = NULL;
+ gchar **uuids = NULL;
- total: 0 errors, 1 warnings, 204 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
"[PATCH] plugins/admin: persist policy settings" has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
##############################
Test: GitLint - PASS
Desc: Run gitlint with rule in .gitlint
##############################
Test: Prep - Setup ELL - PASS
Desc: Clone, build, and install ELL
##############################
Test: Build - Prep - PASS
Desc: Prepare environment for build
##############################
Test: Build - Configure - PASS
Desc: Configure the BlueZ source tree
##############################
Test: Build - Make - FAIL
Desc: Build the BlueZ source tree
Output:
plugins/admin.c:211:6: error: no previous declaration for ‘append_service_uuid’ [-Werror=missing-declarations]
211 | void append_service_uuid(void *data, void *user_data)
| ^~~~~~~~~~~~~~~~~~~
plugins/admin.c: In function ‘free_uuid_strings’:
plugins/admin.c:252:16: error: comparison of integer expressions of different signedness: ‘gsize’ {aka ‘long unsigned int’} and ‘int’ [-Werror=sign-compare]
252 | for (i = 0; i < num; i++)
| ^
plugins/admin.c: In function ‘store_policy_settings’:
plugins/admin.c:317:26: error: ‘errno’ undeclared (first use in this function)
317 | filename, strerror(errno));
| ^~~~~
plugins/admin.c:32:1: note: ‘errno’ is defined in header ‘<errno.h>’; did you forget to ‘#include <errno.h>’?
31 | #include "src/shared/queue.h"
+++ |+#include <errno.h>
32 |
plugins/admin.c:317:26: note: each undeclared identifier is reported only once for each function it appears in
317 | filename, strerror(errno));
| ^~~~~
plugins/admin.c: In function ‘property_get_affected_by_policy’:
plugins/admin.c:418:14: error: unused variable ‘affected’ [-Werror=unused-variable]
418 | dbus_bool_t affected;
| ^~~~~~~~
plugins/admin.c: In function ‘admin_policy_adapter_probe’:
plugins/admin.c:467:11: error: ‘ENOMEM’ undeclared (first use in this function)
467 | return -ENOMEM;
| ^~~~~~
plugins/admin.c:479:11: error: ‘EINVAL’ undeclared (first use in this function)
479 | return -EINVAL;
| ^~~~~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:8449: plugins/bluetoothd-admin.o] Error 1
make: *** [Makefile:4147: all] Error 2
##############################
Test: Make Check - FAIL
Desc: Run 'make check'
Output:
plugins/admin.c:211:6: error: no previous declaration for ‘append_service_uuid’ [-Werror=missing-declarations]
211 | void append_service_uuid(void *data, void *user_data)
| ^~~~~~~~~~~~~~~~~~~
plugins/admin.c: In function ‘free_uuid_strings’:
plugins/admin.c:252:16: error: comparison of integer expressions of different signedness: ‘gsize’ {aka ‘long unsigned int’} and ‘int’ [-Werror=sign-compare]
252 | for (i = 0; i < num; i++)
| ^
plugins/admin.c: In function ‘store_policy_settings’:
plugins/admin.c:317:26: error: ‘errno’ undeclared (first use in this function)
317 | filename, strerror(errno));
| ^~~~~
plugins/admin.c:32:1: note: ‘errno’ is defined in header ‘<errno.h>’; did you forget to ‘#include <errno.h>’?
31 | #include "src/shared/queue.h"
+++ |+#include <errno.h>
32 |
plugins/admin.c:317:26: note: each undeclared identifier is reported only once for each function it appears in
317 | filename, strerror(errno));
| ^~~~~
plugins/admin.c: In function ‘property_get_affected_by_policy’:
plugins/admin.c:418:14: error: unused variable ‘affected’ [-Werror=unused-variable]
418 | dbus_bool_t affected;
| ^~~~~~~~
plugins/admin.c: In function ‘admin_policy_adapter_probe’:
plugins/admin.c:467:11: error: ‘ENOMEM’ undeclared (first use in this function)
467 | return -ENOMEM;
| ^~~~~~
plugins/admin.c:479:11: error: ‘EINVAL’ undeclared (first use in this function)
479 | return -EINVAL;
| ^~~~~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:8449: plugins/bluetoothd-admin.o] Error 1
make: *** [Makefile:10436: check] Error 2
##############################
Test: Make Distcheck - PASS
Desc: Run distcheck to check the distribution
##############################
Test: Build w/ext ELL - Configure - PASS
Desc: Configure BlueZ source with '--enable-external-ell' configuration
##############################
Test: Build w/ext ELL - Make - FAIL
Desc: Build BlueZ source with '--enable-external-ell' configuration
Output:
plugins/admin.c:211:6: error: no previous declaration for ‘append_service_uuid’ [-Werror=missing-declarations]
211 | void append_service_uuid(void *data, void *user_data)
| ^~~~~~~~~~~~~~~~~~~
plugins/admin.c: In function ‘free_uuid_strings’:
plugins/admin.c:252:16: error: comparison of integer expressions of different signedness: ‘gsize’ {aka ‘long unsigned int’} and ‘int’ [-Werror=sign-compare]
252 | for (i = 0; i < num; i++)
| ^
plugins/admin.c: In function ‘store_policy_settings’:
plugins/admin.c:317:26: error: ‘errno’ undeclared (first use in this function)
317 | filename, strerror(errno));
| ^~~~~
plugins/admin.c:32:1: note: ‘errno’ is defined in header ‘<errno.h>’; did you forget to ‘#include <errno.h>’?
31 | #include "src/shared/queue.h"
+++ |+#include <errno.h>
32 |
plugins/admin.c:317:26: note: each undeclared identifier is reported only once for each function it appears in
317 | filename, strerror(errno));
| ^~~~~
plugins/admin.c: In function ‘property_get_affected_by_policy’:
plugins/admin.c:418:14: error: unused variable ‘affected’ [-Werror=unused-variable]
418 | dbus_bool_t affected;
| ^~~~~~~~
plugins/admin.c: In function ‘admin_policy_adapter_probe’:
plugins/admin.c:467:11: error: ‘ENOMEM’ undeclared (first use in this function)
467 | return -ENOMEM;
| ^~~~~~
plugins/admin.c:479:11: error: ‘EINVAL’ undeclared (first use in this function)
479 | return -EINVAL;
| ^~~~~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:8449: plugins/bluetoothd-admin.o] Error 1
make: *** [Makefile:4147: all] Error 2
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Bluez PATCH v4 02/13] core: add adapter and device allowed_uuid functions
2021-07-29 3:12 [Bluez PATCH v4 00/13] Admin policy series Howard Chung
2021-07-29 3:12 ` [Bluez PATCH v4 01/13] core: add is_allowed property in btd_service Howard Chung
@ 2021-07-29 3:12 ` Howard Chung
2021-07-29 3:12 ` [Bluez PATCH v4 03/13] mcap: add adapter authorization Howard Chung
` (10 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Howard Chung @ 2021-07-29 3:12 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz; +Cc: Yun-Hao Chung, Miao-chen Chou
From: Yun-Hao Chung <howardchung@chromium.org>
This implements functions in src/adapter.c and src/device.c for
plugins setting a list of allowed services.
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
(no changes since v1)
src/adapter.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++
src/adapter.h | 8 +++++
src/device.c | 64 +++++++++++++++++++++++++++++++++++-
src/device.h | 2 ++
4 files changed, 163 insertions(+), 1 deletion(-)
diff --git a/src/adapter.c b/src/adapter.c
index 663b778e4a5d..c7fe27d19a5d 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -260,6 +260,8 @@ struct btd_adapter {
struct btd_battery_provider_manager *battery_provider_manager;
+ GHashTable *allowed_uuid_set; /* Set of allowed service UUIDs */
+
gboolean initialized;
GSList *pin_callbacks;
@@ -3489,6 +3491,93 @@ static DBusMessage *connect_device(DBusConnection *conn,
return NULL;
}
+static void update_device_allowed_services(void *data, void *user_data)
+{
+ struct btd_device *device = data;
+
+ btd_device_update_allowed_services(device);
+}
+
+static void add_uuid_to_uuid_set(void *data, void *user_data)
+{
+ bt_uuid_t *uuid = data;
+ GHashTable *uuid_set = user_data;
+
+ if (!uuid) {
+ error("Found NULL in UUID allowed list");
+ return;
+ }
+
+ g_hash_table_add(uuid_set, uuid);
+}
+
+static guint bt_uuid_hash(gconstpointer key)
+{
+ const bt_uuid_t *uuid = key;
+ bt_uuid_t uuid_128;
+ uint64_t *val;
+
+ if (!uuid)
+ return 0;
+
+ bt_uuid_to_uuid128(uuid, &uuid_128);
+ val = (uint64_t *)&uuid_128.value.u128;
+
+ return g_int64_hash(val) ^ g_int64_hash(val+1);
+}
+
+static gboolean bt_uuid_equal(gconstpointer v1, gconstpointer v2)
+{
+ const bt_uuid_t *uuid1 = v1;
+ const bt_uuid_t *uuid2 = v2;
+
+ if (!uuid1 || !uuid2)
+ return !uuid1 && !uuid2;
+
+ return bt_uuid_cmp(uuid1, uuid2) == 0;
+}
+
+bool btd_adapter_set_allowed_uuids(struct btd_adapter *adapter,
+ struct queue *uuids)
+{
+ if (!adapter)
+ return false;
+
+ if (adapter->allowed_uuid_set)
+ g_hash_table_destroy(adapter->allowed_uuid_set);
+
+ adapter->allowed_uuid_set = g_hash_table_new(bt_uuid_hash,
+ bt_uuid_equal);
+ if (!adapter->allowed_uuid_set) {
+ btd_error(adapter->dev_id,
+ "Failed to allocate allowed_uuid_set");
+ return false;
+ }
+
+ queue_foreach(uuids, add_uuid_to_uuid_set, adapter->allowed_uuid_set);
+ g_slist_foreach(adapter->devices, update_device_allowed_services, NULL);
+
+ return true;
+}
+
+bool btd_adapter_is_uuid_allowed(struct btd_adapter *adapter,
+ const char *uuid_str)
+{
+ bt_uuid_t uuid;
+
+ if (!adapter || !adapter->allowed_uuid_set)
+ return true;
+
+ if (bt_string_to_uuid(&uuid, uuid_str)) {
+ btd_error(adapter->dev_id,
+ "Failed to parse UUID string '%s'", uuid_str);
+ return false;
+ }
+
+ return !g_hash_table_size(adapter->allowed_uuid_set) ||
+ g_hash_table_contains(adapter->allowed_uuid_set, &uuid);
+}
+
static const GDBusMethodTable adapter_methods[] = {
{ GDBUS_ASYNC_METHOD("StartDiscovery", NULL, NULL, start_discovery) },
{ GDBUS_METHOD("SetDiscoveryFilter",
@@ -5404,6 +5493,7 @@ static void adapter_free(gpointer user_data)
g_free(adapter->stored_alias);
g_free(adapter->current_alias);
free(adapter->modalias);
+ g_hash_table_destroy(adapter->allowed_uuid_set);
g_free(adapter);
}
diff --git a/src/adapter.h b/src/adapter.h
index 60b5e3bcca34..7cac51451249 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -25,6 +25,7 @@
struct btd_adapter;
struct btd_device;
+struct queue;
struct btd_adapter *btd_adapter_get_default(void);
bool btd_adapter_is_default(struct btd_adapter *adapter);
@@ -97,6 +98,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 +243,8 @@ enum kernel_features {
};
bool btd_has_kernel_features(uint32_t feature);
+
+bool btd_adapter_set_allowed_uuids(struct btd_adapter *adapter,
+ struct queue *uuids);
+bool btd_adapter_is_uuid_allowed(struct btd_adapter *adapter,
+ const char *uuid_str);
diff --git a/src/device.c b/src/device.c
index b29aa195d19b..c4a4497da01f 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1929,6 +1929,56 @@ static int service_prio_cmp(gconstpointer a, gconstpointer b)
return p2->priority - p1->priority;
}
+bool btd_device_all_services_allowed(struct btd_device *dev)
+{
+ GSList *l;
+ struct btd_adapter *adapter = dev->adapter;
+ struct btd_service *service;
+ struct btd_profile *profile;
+
+ for (l = dev->services; l != NULL; l = g_slist_next(l)) {
+ service = l->data;
+ profile = btd_service_get_profile(service);
+
+ if (!profile || !profile->auto_connect)
+ continue;
+
+ if (!btd_adapter_is_uuid_allowed(adapter, profile->remote_uuid))
+ return false;
+ }
+
+ return true;
+}
+
+void btd_device_update_allowed_services(struct btd_device *dev)
+{
+ struct btd_adapter *adapter = dev->adapter;
+ struct btd_service *service;
+ struct btd_profile *profile;
+ GSList *l;
+ bool is_allowed;
+ char addr[18];
+
+ /* If service discovery is ongoing, let the service discovery complete
+ * callback call this function.
+ */
+ if (dev->browse) {
+ ba2str(&dev->bdaddr, addr);
+ DBG("service discovery of %s is ongoing. Skip updating allowed "
+ "services", addr);
+ return;
+ }
+
+ for (l = dev->services; l != NULL; l = g_slist_next(l)) {
+ service = l->data;
+ profile = btd_service_get_profile(service);
+
+ is_allowed = btd_adapter_is_uuid_allowed(adapter,
+ profile->remote_uuid);
+ btd_service_set_allowed(service, is_allowed);
+ }
+}
+
static GSList *create_pending_list(struct btd_device *dev, const char *uuid)
{
struct btd_service *service;
@@ -1937,9 +1987,14 @@ static GSList *create_pending_list(struct btd_device *dev, const char *uuid)
if (uuid) {
service = find_connectable_service(dev, uuid);
- if (service)
+
+ if (!service)
+ return dev->pending;
+
+ if (btd_service_is_allowed(service))
return g_slist_prepend(dev->pending, service);
+ info("service %s is blocked", uuid);
return dev->pending;
}
@@ -1950,6 +2005,11 @@ static GSList *create_pending_list(struct btd_device *dev, const char *uuid)
if (!p->auto_connect)
continue;
+ if (!btd_service_is_allowed(service)) {
+ info("service %s is blocked", p->remote_uuid);
+ continue;
+ }
+
if (g_slist_find(dev->pending, service))
continue;
@@ -2633,6 +2693,8 @@ static void device_svc_resolved(struct btd_device *dev, uint8_t browse_type,
dev->svc_callbacks);
g_free(cb);
}
+
+ btd_device_update_allowed_services(dev);
}
static struct bonding_req *bonding_request_new(DBusMessage *msg,
diff --git a/src/device.h b/src/device.h
index 4ae9abe0dbb4..5f615cb4b6b2 100644
--- a/src/device.h
+++ b/src/device.h
@@ -175,5 +175,7 @@ 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);
+bool btd_device_all_services_allowed(struct btd_device *dev);
+void btd_device_update_allowed_services(struct btd_device *dev);
void btd_device_init(void);
void btd_device_cleanup(void);
--
2.32.0.554.ge1b32706d8-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Bluez PATCH v4 03/13] mcap: add adapter authorization
2021-07-29 3:12 [Bluez PATCH v4 00/13] Admin policy series Howard Chung
2021-07-29 3:12 ` [Bluez PATCH v4 01/13] core: add is_allowed property in btd_service Howard Chung
2021-07-29 3:12 ` [Bluez PATCH v4 02/13] core: add adapter and device allowed_uuid functions Howard Chung
@ 2021-07-29 3:12 ` Howard Chung
2021-07-29 3:12 ` [Bluez PATCH v4 04/13] core: block not allowed UUID connect in auth Howard Chung
` (9 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Howard Chung @ 2021-07-29 3:12 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz; +Cc: Yun-Hao Chung
From: Yun-Hao Chung <howardchung@chromium.org>
Currently mcap is the only profile that doesn't request adatper
authorization. This patch adds a argument when creating the mcap
instance to set authorize method. The reason why we don't use
btd_request_authorization directly like all other profiles is because
tools/mcaptest includes the profile/health/mcap.h. If we add dependency
to adapter.h in mcap.h, it will make mcaptest depend on adapter and be
not able to build independently.
---
(no changes since v1)
android/health.c | 2 +-
profiles/health/hdp.c | 1 +
profiles/health/mcap.c | 39 +++++++++++++++++++++++++++++++++++++--
profiles/health/mcap.h | 7 +++++++
tools/mcaptest.c | 2 +-
5 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/android/health.c b/android/health.c
index 9a29964b1be2..de50db98e988 100644
--- a/android/health.c
+++ b/android/health.c
@@ -2008,7 +2008,7 @@ bool bt_health_register(struct ipc *ipc, const bdaddr_t *addr, uint8_t mode)
mcl_connected, mcl_reconnected,
mcl_disconnected, mcl_uncached,
NULL, /* CSP is not used right now */
- NULL, &err);
+ NULL, NULL, &err);
if (!mcap) {
error("health: MCAP instance creation failed %s", err->message);
g_error_free(err);
diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c
index 6bc41946fef3..efa8955efaea 100644
--- a/profiles/health/hdp.c
+++ b/profiles/health/hdp.c
@@ -1347,6 +1347,7 @@ static gboolean update_adapter(struct hdp_adapter *hdp_adapter)
mcl_connected, mcl_reconnected,
mcl_disconnected, mcl_uncached,
NULL, /* CSP is not used by now */
+ btd_request_authorization,
hdp_adapter, &err);
if (hdp_adapter->mi == NULL) {
error("Error creating the MCAP instance: %s", err->message);
diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c
index be13af37a0b8..d4cb69f77f5b 100644
--- a/profiles/health/mcap.c
+++ b/profiles/health/mcap.c
@@ -14,6 +14,7 @@
#endif
#define _GNU_SOURCE
+#include <dbus/dbus.h>
#include <netinet/in.h>
#include <stdlib.h>
#include <errno.h>
@@ -23,6 +24,7 @@
#include <glib.h>
#include "lib/bluetooth.h"
+#include "lib/uuid.h"
#include "bluetooth/l2cap.h"
#include "btio/btio.h"
#include "src/log.h"
@@ -1980,7 +1982,6 @@ static void set_mcl_conf(GIOChannel *chan, struct mcap_mcl *mcl)
mcl->state = MCL_CONNECTED;
mcl->role = MCL_ACCEPTOR;
mcl->req = MCL_AVAILABLE;
- mcl->cc = g_io_channel_ref(chan);
mcl->ctrl |= MCAP_CTRL_STD_OP;
mcap_sync_init(mcl);
@@ -2005,19 +2006,39 @@ static void set_mcl_conf(GIOChannel *chan, struct mcap_mcl *mcl)
mcl->mi->mcl_connected_cb(mcl, mcl->mi->user_data);
}
+static void auth_callback(void *err, void *user_data)
+{
+ struct mcap_mcl *mcl = user_data;
+ DBusError *derr = err;
+
+ if (derr) {
+ error("Access denied: %s", derr->message);
+ goto reject;
+ }
+
+ set_mcl_conf(mcl->cc, mcl);
+ return;
+
+reject:
+ g_io_channel_shutdown(mcl->cc, TRUE, NULL);
+ g_io_channel_unref(mcl->cc);
+}
+
static void connect_mcl_event_cb(GIOChannel *chan, GError *gerr,
gpointer user_data)
{
struct mcap_instance *mi = user_data;
struct mcap_mcl *mcl;
- bdaddr_t dst;
+ bdaddr_t src, dst;
char address[18], srcstr[18];
GError *err = NULL;
+ guint ret;
if (gerr)
return;
bt_io_get(chan, &err,
+ BT_IO_OPT_SOURCE_BDADDR, &src,
BT_IO_OPT_DEST_BDADDR, &dst,
BT_IO_OPT_DEST, address,
BT_IO_OPT_INVALID);
@@ -2044,6 +2065,18 @@ static void connect_mcl_event_cb(GIOChannel *chan, GError *gerr,
mcl->next_mdl = (rand() % MCAP_MDLID_FINAL) + 1;
}
+ mcl->cc = g_io_channel_ref(chan);
+ if (mi->authorize_cb) {
+ ret = mi->authorize_cb(&src, &dst, HDP_UUID, auth_callback,
+ mcl);
+ if (ret != 0)
+ return;
+
+ error("HDP: authorization for device %s failed", address);
+ g_io_channel_unref(mcl->cc);
+ goto drop;
+ }
+
set_mcl_conf(chan, mcl);
return;
@@ -2060,6 +2093,7 @@ struct mcap_instance *mcap_create_instance(const bdaddr_t *src,
mcap_mcl_event_cb mcl_disconnected,
mcap_mcl_event_cb mcl_uncached,
mcap_info_ind_event_cb mcl_sync_info_ind,
+ mcap_authorize_cb authorize_cb,
gpointer user_data,
GError **gerr)
{
@@ -2089,6 +2123,7 @@ struct mcap_instance *mcap_create_instance(const bdaddr_t *src,
mi->mcl_disconnected_cb = mcl_disconnected;
mi->mcl_uncached_cb = mcl_uncached;
mi->mcl_sync_infoind_cb = mcl_sync_info_ind;
+ mi->authorize_cb = authorize_cb;
mi->user_data = user_data;
mi->csp_enabled = FALSE;
diff --git a/profiles/health/mcap.h b/profiles/health/mcap.h
index 5a94c8b63bea..aa69b0d32c0d 100644
--- a/profiles/health/mcap.h
+++ b/profiles/health/mcap.h
@@ -249,6 +249,11 @@ typedef void (* mcap_sync_set_cb) (struct mcap_mcl *mcl,
GError *err,
gpointer data);
+typedef void mcap_auth_cb(void *err, void *user_data);
+typedef guint (* mcap_authorize_cb) (const bdaddr_t *src, const bdaddr_t *dst,
+ const char *uuid, mcap_auth_cb cb,
+ void *user_data);
+
struct mcap_mdl_cb {
mcap_mdl_event_cb mdl_connected; /* Remote device has created a MDL */
mcap_mdl_event_cb mdl_closed; /* Remote device has closed a MDL */
@@ -271,6 +276,7 @@ struct mcap_instance {
mcap_mcl_event_cb mcl_disconnected_cb; /* MCL disconnected */
mcap_mcl_event_cb mcl_uncached_cb; /* MCL has been removed from MCAP cache */
mcap_info_ind_event_cb mcl_sync_infoind_cb; /* (CSP Master) Received info indication */
+ mcap_authorize_cb authorize_cb; /* Method to request authorization */
gpointer user_data; /* Data to be provided in callbacks */
int ref; /* Reference counter */
@@ -404,6 +410,7 @@ struct mcap_instance *mcap_create_instance(const bdaddr_t *src,
mcap_mcl_event_cb mcl_disconnected,
mcap_mcl_event_cb mcl_uncached,
mcap_info_ind_event_cb mcl_sync_info_ind,
+ mcap_authorize_cb authorize_cb,
gpointer user_data,
GError **gerr);
void mcap_release_instance(struct mcap_instance *mi);
diff --git a/tools/mcaptest.c b/tools/mcaptest.c
index dcef0b908ac8..63ee22149a40 100644
--- a/tools/mcaptest.c
+++ b/tools/mcaptest.c
@@ -434,7 +434,7 @@ int main(int argc, char *argv[])
mcl_connected, mcl_reconnected,
mcl_disconnected, mcl_uncached,
NULL, /* CSP is not used right now */
- NULL, &err);
+ NULL, NULL, &err);
if (!mcap) {
printf("MCAP instance creation failed %s\n", err->message);
--
2.32.0.554.ge1b32706d8-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Bluez PATCH v4 04/13] core: block not allowed UUID connect in auth
2021-07-29 3:12 [Bluez PATCH v4 00/13] Admin policy series Howard Chung
` (2 preceding siblings ...)
2021-07-29 3:12 ` [Bluez PATCH v4 03/13] mcap: add adapter authorization Howard Chung
@ 2021-07-29 3:12 ` Howard Chung
2021-07-29 3:12 ` [Bluez PATCH v4 05/13] core: add device_added and device_removed to adapter driver Howard Chung
` (8 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Howard Chung @ 2021-07-29 3:12 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz; +Cc: Yun-Hao Chung
From: Yun-Hao Chung <howardchung@chromium.org>
This ensures any incoming profile connection will be blocked if its UUID
is not allowed by the following assumption:
1. Each system profile asks adapter authorization when seeing a incoming
connection.
2. Each external profile checks if its UUID is allowed by adapter when
seeing a incoming connection.
---
The following test steps were performed after enabling admin plugin:
1. Set ServiceAllowList to ["1234"].
2. Turn on a paired classic keyboard. Verify it can not be connected.
3. Set ServiceAllowList to
["1800","1801","180A","180F","1812"]
4. Turn off and turn on the keyboard. Verift it can be connected.
(no changes since v1)
src/adapter.c | 5 +++++
src/profile.c | 12 ++++++++++++
2 files changed, 17 insertions(+)
diff --git a/src/adapter.c b/src/adapter.c
index c7fe27d19a5d..6c8096147bdd 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -7118,6 +7118,11 @@ static gboolean process_auth_queue(gpointer user_data)
if (auth->svc_id > 0)
return FALSE;
+ if (!btd_adapter_is_uuid_allowed(adapter, auth->uuid)) {
+ auth->cb(&err, auth->user_data);
+ goto next;
+ }
+
if (device_is_trusted(device) == TRUE) {
auth->cb(NULL, auth->user_data);
goto next;
diff --git a/src/profile.c b/src/profile.c
index 60d17b6ae657..58500c74746d 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -1249,6 +1249,11 @@ static void ext_confirm(GIOChannel *io, gpointer user_data)
DBG("incoming connect from %s", addr);
+ if (btd_adapter_is_uuid_allowed(adapter_find(&src), uuid)) {
+ info("UUID %s is not allowed. Igoring the connection", uuid);
+ return;
+ }
+
conn = create_conn(server, io, &src, &dst);
if (conn == NULL)
return;
@@ -1272,6 +1277,7 @@ static void ext_direct_connect(GIOChannel *io, GError *err, gpointer user_data)
struct ext_profile *ext = server->ext;
GError *gerr = NULL;
struct ext_io *conn;
+ const char *uuid = ext->service ? ext->service : ext->uuid;
bdaddr_t src, dst;
bt_io_get(io, &gerr,
@@ -1285,6 +1291,12 @@ static void ext_direct_connect(GIOChannel *io, GError *err, gpointer user_data)
return;
}
+ if (btd_adapter_is_uuid_allowed(adapter_find(&src), ext->uuid)) {
+ info("UUID %s is not allowed. Igoring the connection",
+ ext->uuid);
+ return;
+ }
+
conn = create_conn(server, io, &src, &dst);
if (conn == NULL)
return;
--
2.32.0.554.ge1b32706d8-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Bluez PATCH v4 05/13] core: add device_added and device_removed to adapter driver
2021-07-29 3:12 [Bluez PATCH v4 00/13] Admin policy series Howard Chung
` (3 preceding siblings ...)
2021-07-29 3:12 ` [Bluez PATCH v4 04/13] core: block not allowed UUID connect in auth Howard Chung
@ 2021-07-29 3:12 ` Howard Chung
2021-07-29 3:12 ` [Bluez PATCH v4 06/13] plugins: new plugin Howard Chung
` (7 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Howard Chung @ 2021-07-29 3:12 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz; +Cc: Yun-Hao Chung
From: Yun-Hao Chung <howardchung@chromium.org>
This adds device_added and device_removed to btd_adapter_driver so that
a driver can get notification when device is added or removed.
---
(no changes since v1)
src/adapter.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++-----
src/adapter.h | 4 ++++
2 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 6c8096147bdd..5c556b569ca7 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1218,6 +1218,9 @@ void adapter_service_remove(struct btd_adapter *adapter, uint32_t handle)
remove_record_from_server(rec->handle);
}
+static void adapter_add_device(struct btd_adapter *adapter,
+ struct btd_device *device);
+
static struct btd_device *adapter_create_device(struct btd_adapter *adapter,
const bdaddr_t *bdaddr,
uint8_t bdaddr_type)
@@ -1228,8 +1231,7 @@ static struct btd_device *adapter_create_device(struct btd_adapter *adapter,
if (!device)
return NULL;
- adapter->devices = g_slist_append(adapter->devices, device);
-
+ adapter_add_device(adapter, device);
return device;
}
@@ -1256,6 +1258,9 @@ static void service_auth_cancel(struct service_auth *auth)
g_free(auth);
}
+static void adapter_remove_device(struct btd_adapter *adapter,
+ struct btd_device *device);
+
void btd_adapter_remove_device(struct btd_adapter *adapter,
struct btd_device *dev)
{
@@ -1263,7 +1268,7 @@ void btd_adapter_remove_device(struct btd_adapter *adapter,
adapter->connect_list = g_slist_remove(adapter->connect_list, dev);
- adapter->devices = g_slist_remove(adapter->devices, dev);
+ adapter_remove_device(adapter, dev);
btd_adv_monitor_device_remove(adapter->adv_monitor_manager, dev);
adapter->discovery_found = g_slist_remove(adapter->discovery_found,
@@ -4665,7 +4670,7 @@ static void load_devices(struct btd_adapter *adapter)
goto free;
btd_device_set_temporary(device, false);
- adapter->devices = g_slist_append(adapter->devices, device);
+ adapter_add_device(adapter, device);
/* TODO: register services from pre-loaded list of primaries */
@@ -4827,6 +4832,48 @@ void adapter_remove_profile(struct btd_adapter *adapter, gpointer p)
profile->adapter_remove(profile, adapter);
}
+static void device_added_drivers(struct btd_adapter *adapter,
+ struct btd_device *device)
+{
+ struct btd_adapter_driver *driver;
+ GSList *l;
+
+ for (l = adapter_drivers; l; l = l->next) {
+ driver = l->data;
+
+ if (driver->device_added)
+ driver->device_added(adapter, device);
+ }
+}
+
+static void device_removed_drivers(struct btd_adapter *adapter,
+ struct btd_device *device)
+{
+ struct btd_adapter_driver *driver;
+ GSList *l;
+
+ for (l = adapter_drivers; l; l = l->next) {
+ driver = l->data;
+
+ if (driver->device_removed)
+ driver->device_removed(adapter, device);
+ }
+}
+
+static void adapter_add_device(struct btd_adapter *adapter,
+ struct btd_device *device)
+{
+ adapter->devices = g_slist_append(adapter->devices, device);
+ device_added_drivers(adapter, device);
+}
+
+static void adapter_remove_device(struct btd_adapter *adapter,
+ struct btd_device *device)
+{
+ adapter->devices = g_slist_remove(adapter->devices, device);
+ device_removed_drivers(adapter, device);
+}
+
static void adapter_add_connection(struct btd_adapter *adapter,
struct btd_device *device,
uint8_t bdaddr_type)
@@ -6445,8 +6492,10 @@ static void adapter_remove(struct btd_adapter *adapter)
g_slist_free(adapter->connect_list);
adapter->connect_list = NULL;
- for (l = adapter->devices; l; l = l->next)
+ for (l = adapter->devices; l; l = l->next) {
+ device_removed_drivers(adapter, l->data);
device_remove(l->data, FALSE);
+ }
g_slist_free(adapter->devices);
adapter->devices = NULL;
diff --git a/src/adapter.h b/src/adapter.h
index 7cac51451249..a2567330ddc9 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -111,6 +111,10 @@ struct btd_adapter_driver {
int (*probe) (struct btd_adapter *adapter);
void (*remove) (struct btd_adapter *adapter);
void (*resume) (struct btd_adapter *adapter);
+ void (*device_added) (struct btd_adapter *adapter,
+ struct btd_device *device);
+ void (*device_removed) (struct btd_adapter *adapter,
+ struct btd_device *device);
};
typedef void (*service_auth_cb) (DBusError *derr, void *user_data);
--
2.32.0.554.ge1b32706d8-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Bluez PATCH v4 06/13] plugins: new plugin
2021-07-29 3:12 [Bluez PATCH v4 00/13] Admin policy series Howard Chung
` (4 preceding siblings ...)
2021-07-29 3:12 ` [Bluez PATCH v4 05/13] core: add device_added and device_removed to adapter driver Howard Chung
@ 2021-07-29 3:12 ` Howard Chung
2021-07-29 3:12 ` [Bluez PATCH v4 07/13] plugins/admin: add admin_policy adapter driver Howard Chung
` (6 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Howard Chung @ 2021-07-29 3:12 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz; +Cc: Yun-Hao Chung, Miao-chen Chou
From: Yun-Hao Chung <howardchung@chromium.org>
This adds an initial code for a new plugin admin.
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
(no changes since v1)
Makefile.plugins | 5 +++++
bootstrap-configure | 1 +
configure.ac | 4 ++++
plugins/admin.c | 30 ++++++++++++++++++++++++++++++
4 files changed, 40 insertions(+)
create mode 100644 plugins/admin.c
diff --git a/Makefile.plugins b/Makefile.plugins
index 4e6a72b0bdf6..69fb01001cc6 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -11,6 +11,11 @@ builtin_sources += plugins/autopair.c
builtin_modules += policy
builtin_sources += plugins/policy.c
+if ADMIN
+builtin_modules += admin
+builtin_sources += plugins/admin.c
+endif
+
if NFC
builtin_modules += neard
builtin_sources += plugins/neard.c
diff --git a/bootstrap-configure b/bootstrap-configure
index 0efd83abc2c4..a34be832068e 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -30,4 +30,5 @@ fi
--enable-pie \
--enable-cups \
--enable-library \
+ --enable-admin \
--disable-datafiles $*
diff --git a/configure.ac b/configure.ac
index a5afaea6cfcd..0744860b89fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -364,6 +364,10 @@ AC_ARG_ENABLE(logger, AC_HELP_STRING([--enable-logger],
[enable HCI logger service]), [enable_logger=${enableval}])
AM_CONDITIONAL(LOGGER, test "${enable_logger}" = "yes")
+AC_ARG_ENABLE(admin, AC_HELP_STRING([--enable-admin],
+ [enable admin policy plugin]), [enable_admin=${enableval}])
+AM_CONDITIONAL(ADMIN, test "${enable_admin}" = "yes")
+
if (test "${prefix}" = "NONE"); then
dnl no prefix and no localstatedir, so default to /var
if (test "$localstatedir" = '${prefix}/var'); then
diff --git a/plugins/admin.c b/plugins/admin.c
new file mode 100644
index 000000000000..42866bcf7be2
--- /dev/null
+++ b/plugins/admin.c
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2021 Google LLC
+ *
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "src/log.h"
+#include "src/plugin.h"
+
+static int admin_init(void)
+{
+ DBG("");
+}
+
+static void admin_exit(void)
+{
+ DBG("");
+}
+
+BLUETOOTH_PLUGIN_DEFINE(admin, VERSION,
+ BLUETOOTH_PLUGIN_PRIORITY_DEFAULT,
+ admin_init, admin_exit)
--
2.32.0.554.ge1b32706d8-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Bluez PATCH v4 07/13] plugins/admin: add admin_policy adapter driver
2021-07-29 3:12 [Bluez PATCH v4 00/13] Admin policy series Howard Chung
` (5 preceding siblings ...)
2021-07-29 3:12 ` [Bluez PATCH v4 06/13] plugins: new plugin Howard Chung
@ 2021-07-29 3:12 ` Howard Chung
2021-07-29 3:12 ` [Bluez PATCH v4 08/13] plugins/admin: add ServiceAllowList method Howard Chung
` (5 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Howard Chung @ 2021-07-29 3:12 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz; +Cc: Yun-Hao Chung, Miao-chen Chou
From: Yun-Hao Chung <howardchung@chromium.org>
This adds code to register admin_policy driver to adapter when
admin plugin is enabled.
The following test steps were performed:
1. restart bluetoothd
2. check if "Admin Policy is enabled" in system log
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
(no changes since v1)
plugins/admin.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 67 insertions(+)
diff --git a/plugins/admin.c b/plugins/admin.c
index 42866bcf7be2..923e08cb836b 100644
--- a/plugins/admin.c
+++ b/plugins/admin.c
@@ -12,17 +12,84 @@
#include <config.h>
#endif
+#include "lib/bluetooth.h"
+
+#include "src/adapter.h"
+#include "src/error.h"
#include "src/log.h"
#include "src/plugin.h"
+#include "src/shared/queue.h"
+
+/* |policy_data| has the same life cycle as btd_adapter */
+static struct btd_admin_policy {
+ struct btd_adapter *adapter;
+ uint16_t adapter_id;
+} *policy_data = NULL;
+
+static struct btd_admin_policy *admin_policy_new(struct btd_adapter *adapter)
+{
+ struct btd_admin_policy *admin_policy = NULL;
+
+ admin_policy = g_try_malloc(sizeof(*admin_policy));
+ if (!admin_policy) {
+ btd_error(btd_adapter_get_index(adapter),
+ "Failed to allocate memory for admin_policy");
+ return NULL;
+ }
+
+ admin_policy->adapter = adapter;
+ admin_policy->adapter_id = btd_adapter_get_index(adapter);
+
+ return admin_policy;
+}
+
+static void admin_policy_free(void *data)
+{
+ struct btd_admin_policy *admin_policy = data;
+
+ g_free(admin_policy);
+}
+
+static int admin_policy_adapter_probe(struct btd_adapter *adapter)
+{
+ if (policy_data) {
+ btd_warn(policy_data->adapter_id,
+ "Policy data already exists");
+ admin_policy_free(policy_data);
+ policy_data = NULL;
+ }
+
+ policy_data = admin_policy_new(adapter);
+ if (!policy_data)
+ return -ENOMEM;
+
+ btd_info(policy_data->adapter_id, "Admin Policy has been enabled");
+
+ return 0;
+}
+
+static struct btd_adapter_driver admin_policy_driver = {
+ .name = "admin_policy",
+ .probe = admin_policy_adapter_probe,
+ .resume = NULL,
+};
+
static int admin_init(void)
{
DBG("");
+
+ return btd_register_adapter_driver(&admin_policy_driver);
}
static void admin_exit(void)
{
DBG("");
+
+ btd_unregister_adapter_driver(&admin_policy_driver);
+
+ if (policy_data)
+ admin_policy_free(policy_data);
}
BLUETOOTH_PLUGIN_DEFINE(admin, VERSION,
--
2.32.0.554.ge1b32706d8-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Bluez PATCH v4 08/13] plugins/admin: add ServiceAllowList method
2021-07-29 3:12 [Bluez PATCH v4 00/13] Admin policy series Howard Chung
` (6 preceding siblings ...)
2021-07-29 3:12 ` [Bluez PATCH v4 07/13] plugins/admin: add admin_policy adapter driver Howard Chung
@ 2021-07-29 3:12 ` Howard Chung
2021-07-29 3:12 ` [Bluez PATCH v4 09/13] plugins/admin: add ServiceAllowList property Howard Chung
` (4 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Howard Chung @ 2021-07-29 3:12 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz; +Cc: Yun-Hao Chung, Miao-chen Chou
From: Yun-Hao Chung <howardchung@chromium.org>
This adds code to register interface org.bluez.AdminPolicySet1.
The interface will provide methods to limit users to operate certain
functions of bluez, such as allow/disallow user to taggle adapter power,
or only allow users to connect services in the specified list, etc.
This patch also implements ServiceAllowlist in
org.bluez.AdminPolicySet1.
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
The following test steps were performed:
1. Set ServiceAllowList to
["1108","110A","110B","110C","110D","110E",
"110F","1112","111E","111F","1203"]
( users are only allowed to connect headset )
2. Turn on paired WF1000XM3, and listen music on Youtube.
3. Turn on paired K830 (LE device), press any key on keyboard.
4. Turn on paired Samsung Bluetooth Keyboard EE-BT550 (BREDR device),
press any key on keyboard.
5. Set ServiceAllowList to
["1124","180A","180F","1812"]
( users are only allowed to connect HID devices )
6. Turn on paired WF1000XM3, and listen music on Youtube.
7. Turn on paired K830 (LE device), press any key on keyboard.
8. Turn on paired Samsung Bluetooth Keyboard EE-BT550 (BREDR device),
press any key on keyboard.
9. Set ServiceAllowList to []
( users are only allowed to connect any device. )
10. Turn on paired WF1000XM3, and listen music on Youtube.
11. Turn on paired K830 (LE device), press any key on keyboard.
12. Turn on paired Samsung Bluetooth Keyboard EE-BT550 (BREDR device),
press any key on keyboard.
Expected results:
Step 2,7,8,9,10,11 should success, and step 3,4,6 should fail.
(no changes since v1)
plugins/admin.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 126 insertions(+), 1 deletion(-)
diff --git a/plugins/admin.c b/plugins/admin.c
index 923e08cb836b..1fe2904d93d9 100644
--- a/plugins/admin.c
+++ b/plugins/admin.c
@@ -12,19 +12,29 @@
#include <config.h>
#endif
+#include <dbus/dbus.h>
+#include <gdbus/gdbus.h>
+
#include "lib/bluetooth.h"
+#include "lib/uuid.h"
#include "src/adapter.h"
+#include "src/dbus-common.h"
#include "src/error.h"
#include "src/log.h"
#include "src/plugin.h"
#include "src/shared/queue.h"
+#define ADMIN_POLICY_SET_INTERFACE "org.bluez.AdminPolicySet1"
+
+static DBusConnection *dbus_conn;
+
/* |policy_data| has the same life cycle as btd_adapter */
static struct btd_admin_policy {
struct btd_adapter *adapter;
uint16_t adapter_id;
+ struct queue *service_allowlist;
} *policy_data = NULL;
static struct btd_admin_policy *admin_policy_new(struct btd_adapter *adapter)
@@ -40,19 +50,120 @@ static struct btd_admin_policy *admin_policy_new(struct btd_adapter *adapter)
admin_policy->adapter = adapter;
admin_policy->adapter_id = btd_adapter_get_index(adapter);
+ admin_policy->service_allowlist = NULL;
return admin_policy;
}
+static void free_service_allowlist(struct queue *q)
+{
+ queue_destroy(q, g_free);
+}
+
static void admin_policy_free(void *data)
{
struct btd_admin_policy *admin_policy = data;
+ free_service_allowlist(admin_policy->service_allowlist);
g_free(admin_policy);
}
+static struct queue *parse_allow_service_list(struct btd_adapter *adapter,
+ DBusMessage *msg)
+{
+ DBusMessageIter iter, arr_iter;
+ struct queue *uuid_list = NULL;
+
+ dbus_message_iter_init(msg, &iter);
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY)
+ return NULL;
+
+ uuid_list = queue_new();
+ dbus_message_iter_recurse(&iter, &arr_iter);
+ do {
+ const int type = dbus_message_iter_get_arg_type(&arr_iter);
+ char *uuid_param;
+ bt_uuid_t *uuid;
+
+ if (type == DBUS_TYPE_INVALID)
+ break;
+
+ if (type != DBUS_TYPE_STRING)
+ goto failed;
+
+ dbus_message_iter_get_basic(&arr_iter, &uuid_param);
+
+ uuid = g_try_malloc(sizeof(*uuid));
+ if (!uuid)
+ goto failed;
+
+ if (bt_string_to_uuid(uuid, uuid_param)) {
+ g_free(uuid);
+ goto failed;
+ }
+
+ queue_push_head(uuid_list, uuid);
+
+ dbus_message_iter_next(&arr_iter);
+ } while (true);
+
+ return uuid_list;
+
+failed:
+ queue_destroy(uuid_list, g_free);
+ return NULL;
+}
+
+static bool service_allowlist_set(struct btd_admin_policy *admin_policy,
+ struct queue *uuid_list)
+{
+ struct btd_adapter *adapter = admin_policy->adapter;
+
+ if (!btd_adapter_set_allowed_uuids(adapter, uuid_list))
+ return false;
+
+ free_service_allowlist(admin_policy->service_allowlist);
+ admin_policy->service_allowlist = uuid_list;
+
+ return true;
+}
+
+static DBusMessage *set_service_allowlist(DBusConnection *conn,
+ DBusMessage *msg, void *user_data)
+{
+ struct btd_admin_policy *admin_policy = user_data;
+ struct btd_adapter *adapter = admin_policy->adapter;
+ struct queue *uuid_list = NULL;
+ const char *sender = dbus_message_get_sender(msg);
+
+ DBG("sender %s", sender);
+
+ /* Parse parameters */
+ uuid_list = parse_allow_service_list(adapter, msg);
+ if (!uuid_list) {
+ btd_error(admin_policy->adapter_id,
+ "Failed on parsing allowed service list");
+ return btd_error_invalid_args(msg);
+ }
+
+ if (!service_allowlist_set(admin_policy, uuid_list)) {
+ free_service_allowlist(uuid_list);
+ return btd_error_failed(msg, "service_allowlist_set failed");
+ }
+
+ return dbus_message_new_method_return(msg);
+}
+
+static const GDBusMethodTable admin_policy_adapter_methods[] = {
+ { GDBUS_METHOD("SetServiceAllowList", GDBUS_ARGS({ "UUIDs", "as" }),
+ NULL, set_service_allowlist) },
+ { }
+};
+
static int admin_policy_adapter_probe(struct btd_adapter *adapter)
{
+ const char *adapter_path;
+
if (policy_data) {
btd_warn(policy_data->adapter_id,
"Policy data already exists");
@@ -64,8 +175,20 @@ static int admin_policy_adapter_probe(struct btd_adapter *adapter)
if (!policy_data)
return -ENOMEM;
- btd_info(policy_data->adapter_id, "Admin Policy has been enabled");
+ adapter_path = adapter_get_path(adapter);
+ if (!g_dbus_register_interface(dbus_conn, adapter_path,
+ ADMIN_POLICY_SET_INTERFACE,
+ admin_policy_adapter_methods, NULL,
+ NULL, policy_data, admin_policy_free)) {
+ btd_error(policy_data->adapter_id,
+ "Admin Policy Set interface init failed on path %s",
+ adapter_path);
+ return -EINVAL;
+ }
+
+ btd_info(policy_data->adapter_id,
+ "Admin Policy Set interface registered");
return 0;
}
@@ -79,6 +202,8 @@ static int admin_init(void)
{
DBG("");
+ dbus_conn = btd_get_dbus_connection();
+
return btd_register_adapter_driver(&admin_policy_driver);
}
--
2.32.0.554.ge1b32706d8-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Bluez PATCH v4 09/13] plugins/admin: add ServiceAllowList property
2021-07-29 3:12 [Bluez PATCH v4 00/13] Admin policy series Howard Chung
` (7 preceding siblings ...)
2021-07-29 3:12 ` [Bluez PATCH v4 08/13] plugins/admin: add ServiceAllowList method Howard Chung
@ 2021-07-29 3:12 ` Howard Chung
2021-07-29 3:12 ` [Bluez PATCH v4 10/13] plugins/admin: add device callbacks Howard Chung
` (3 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Howard Chung @ 2021-07-29 3:12 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz; +Cc: Yun-Hao Chung, Miao-chen Chou
From: Yun-Hao Chung <howardchung@chromium.org>
This adds code to register interface org.bluez.AdminPolicyStatus.
The interface will provide read-only properties to indicate the current
settings of admin policies. We separate this from AdminPolicySet so that
normal clients can check current policy settings while only a few
clients can change policies.
This patch also adds readonly property ServiceAllowlist to
AdminPolicyStatus1, which indicates the current setting of service
allowlist.
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
The following test steps were performed:
1. Set ServiceAllowList to ["1124","180A","180F","1812"]
2. Verify ServiceAllowList is ["1124","180A","180F","1812"] in UUID-128
form
3. Set ServiceAllowList to []
4. Verify ServiceAllowList is []
(no changes since v1)
plugins/admin.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/plugins/admin.c b/plugins/admin.c
index 1fe2904d93d9..d89a77c8a123 100644
--- a/plugins/admin.c
+++ b/plugins/admin.c
@@ -27,6 +27,7 @@
#include "src/shared/queue.h"
#define ADMIN_POLICY_SET_INTERFACE "org.bluez.AdminPolicySet1"
+#define ADMIN_POLICY_STATUS_INTERFACE "org.bluez.AdminPolicyStatus1"
static DBusConnection *dbus_conn;
@@ -151,6 +152,11 @@ static DBusMessage *set_service_allowlist(DBusConnection *conn,
return btd_error_failed(msg, "service_allowlist_set failed");
}
+ g_dbus_emit_property_changed(dbus_conn,
+ adapter_get_path(policy_data->adapter),
+ ADMIN_POLICY_STATUS_INTERFACE,
+ "ServiceAllowList");
+
return dbus_message_new_method_return(msg);
}
@@ -160,6 +166,43 @@ static const GDBusMethodTable admin_policy_adapter_methods[] = {
{ }
};
+void append_service_uuid(void *data, void *user_data)
+{
+ bt_uuid_t *uuid = data;
+ DBusMessageIter *entry = user_data;
+ char uuid_str[MAX_LEN_UUID_STR];
+ const char *uuid_str_ptr = uuid_str;
+
+ if (!uuid) {
+ error("Unexpected NULL uuid data in service_allowlist");
+ return;
+ }
+
+ 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);
+ queue_foreach(admin_policy->service_allowlist, append_service_uuid,
+ &entry);
+ dbus_message_iter_close_container(iter, &entry);
+
+ return TRUE;
+}
+
+static const GDBusPropertyTable admin_policy_adapter_properties[] = {
+ { "ServiceAllowList", "as", property_get_service_allowlist },
+ { }
+};
+
static int admin_policy_adapter_probe(struct btd_adapter *adapter)
{
const char *adapter_path;
@@ -189,6 +232,21 @@ static int admin_policy_adapter_probe(struct btd_adapter *adapter)
btd_info(policy_data->adapter_id,
"Admin Policy Set interface registered");
+
+ if (!g_dbus_register_interface(dbus_conn, adapter_path,
+ ADMIN_POLICY_STATUS_INTERFACE,
+ NULL, NULL,
+ admin_policy_adapter_properties,
+ policy_data, admin_policy_free)) {
+ btd_error(policy_data->adapter_id,
+ "Admin Policy Status interface init failed on path %s",
+ adapter_path);
+ return -EINVAL;
+ }
+
+ btd_info(policy_data->adapter_id,
+ "Admin Policy Status interface registered");
+
return 0;
}
--
2.32.0.554.ge1b32706d8-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Bluez PATCH v4 10/13] plugins/admin: add device callbacks
2021-07-29 3:12 [Bluez PATCH v4 00/13] Admin policy series Howard Chung
` (8 preceding siblings ...)
2021-07-29 3:12 ` [Bluez PATCH v4 09/13] plugins/admin: add ServiceAllowList property Howard Chung
@ 2021-07-29 3:12 ` Howard Chung
2021-07-29 3:12 ` [Bluez PATCH v4 11/13] plugins/admin: add AffectedByPolicy property Howard Chung
` (2 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Howard Chung @ 2021-07-29 3:12 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz; +Cc: Yun-Hao Chung, Miao-chen Chou
From: Yun-Hao Chung <howardchung@chromium.org>
This adds callbacks for device added and device removed. It is
necessary for implementation of "AffectedByPolicy" property since it
needs to register an interface for each device object and unregister it
once the device gets removed.
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
The following test steps were performed:
1. start discovery using UI
2. verify device_data were added by checking system log
3. stop discovery
4. verify device_data were removed after a few seconds by checking
system log
(no changes since v1)
plugins/admin.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 78 insertions(+)
diff --git a/plugins/admin.c b/plugins/admin.c
index d89a77c8a123..37dae77ac448 100644
--- a/plugins/admin.c
+++ b/plugins/admin.c
@@ -20,6 +20,7 @@
#include "src/adapter.h"
#include "src/dbus-common.h"
+#include "src/device.h"
#include "src/error.h"
#include "src/log.h"
#include "src/plugin.h"
@@ -29,7 +30,11 @@
#define ADMIN_POLICY_SET_INTERFACE "org.bluez.AdminPolicySet1"
#define ADMIN_POLICY_STATUS_INTERFACE "org.bluez.AdminPolicyStatus1"
+#define DBUS_BLUEZ_SERVICE "org.bluez"
+#define BTD_DEVICE_INTERFACE "org.bluez.Device1"
+
static DBusConnection *dbus_conn;
+static struct queue *devices; /* List of struct device_data objects */
/* |policy_data| has the same life cycle as btd_adapter */
static struct btd_admin_policy {
@@ -38,6 +43,11 @@ static struct btd_admin_policy {
struct queue *service_allowlist;
} *policy_data = NULL;
+struct device_data {
+ struct btd_device *device;
+ char *path;
+};
+
static struct btd_admin_policy *admin_policy_new(struct btd_adapter *adapter)
{
struct btd_admin_policy *admin_policy = NULL;
@@ -203,6 +213,37 @@ static const GDBusPropertyTable admin_policy_adapter_properties[] = {
{ }
};
+static bool device_data_match(const void *a, const void *b)
+{
+ const struct device_data *data = a;
+ const struct btd_device *dev = b;
+
+ if (!data) {
+ error("Unexpected NULL device_data");
+ return false;
+ }
+
+ return data->device == dev;
+}
+
+static void free_device_data(void *data)
+{
+ struct device_data *device_data = data;
+
+ g_free(device_data->path);
+ g_free(device_data);
+}
+
+static void remove_device_data(void *data)
+{
+ struct device_data *device_data = data;
+
+ DBG("device_data for %s removing", device_data->path);
+
+ queue_remove(devices, device_data);
+ free_device_data(device_data);
+}
+
static int admin_policy_adapter_probe(struct btd_adapter *adapter)
{
const char *adapter_path;
@@ -250,10 +291,45 @@ static int admin_policy_adapter_probe(struct btd_adapter *adapter)
return 0;
}
+static void admin_policy_device_added(struct btd_adapter *adapter,
+ struct btd_device *device)
+{
+ struct device_data *data;
+
+ if (queue_find(devices, device_data_match, device))
+ return;
+
+ data = g_new0(struct device_data, 1);
+ if (!data) {
+ btd_error(btd_adapter_get_index(adapter),
+ "Failed to allocate memory for device_data");
+ return;
+ }
+
+ data->device = device;
+ data->path = g_strdup(device_get_path(device));
+ queue_push_tail(devices, data);
+
+ DBG("device_data for %s added", data->path);
+}
+
+static void admin_policy_device_removed(struct btd_adapter *adapter,
+ struct btd_device *device)
+{
+ struct device_data *data;
+
+ data = queue_find(devices, device_data_match, device);
+
+ if (data)
+ remove_device_data(data);
+}
+
static struct btd_adapter_driver admin_policy_driver = {
.name = "admin_policy",
.probe = admin_policy_adapter_probe,
.resume = NULL,
+ .device_added = admin_policy_device_added,
+ .device_removed = admin_policy_device_removed
};
static int admin_init(void)
@@ -261,6 +337,7 @@ static int admin_init(void)
DBG("");
dbus_conn = btd_get_dbus_connection();
+ devices = queue_new();
return btd_register_adapter_driver(&admin_policy_driver);
}
@@ -270,6 +347,7 @@ static void admin_exit(void)
DBG("");
btd_unregister_adapter_driver(&admin_policy_driver);
+ queue_destroy(devices, free_device_data);
if (policy_data)
admin_policy_free(policy_data);
--
2.32.0.554.ge1b32706d8-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Bluez PATCH v4 11/13] plugins/admin: add AffectedByPolicy property
2021-07-29 3:12 [Bluez PATCH v4 00/13] Admin policy series Howard Chung
` (9 preceding siblings ...)
2021-07-29 3:12 ` [Bluez PATCH v4 10/13] plugins/admin: add device callbacks Howard Chung
@ 2021-07-29 3:12 ` Howard Chung
2021-07-29 3:12 ` [Bluez PATCH v4 12/13] plugins/admin: persist policy settings Howard Chung
2021-07-29 3:12 ` [Bluez PATCH v4 13/13] doc: add description of admin policy Howard Chung
12 siblings, 0 replies; 15+ messages in thread
From: Howard Chung @ 2021-07-29 3:12 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz; +Cc: Yun-Hao Chung, Miao-chen Chou
From: Yun-Hao Chung <howardchung@chromium.org>
This adds property to indicate if a device has any service that is being
blocked by admin policy.
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
The following test steps were performed:
1. Set ServiceAllowList to []
2. Verify AffectedByPolicy of K830 is False
3. Set ServiceAllowList to
["1800"]
4. Verify AffectedByPolicy of K830 is False
5. Set ServiceAllowList to ["1800","1801","180A","180F","1812"]
6. Verify AffectedByPolicy of K830 is True
(no changes since v1)
plugins/admin.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 72 insertions(+), 2 deletions(-)
diff --git a/plugins/admin.c b/plugins/admin.c
index 37dae77ac448..2ad60f2fde2a 100644
--- a/plugins/admin.c
+++ b/plugins/admin.c
@@ -46,6 +46,7 @@ static struct btd_admin_policy {
struct device_data {
struct btd_device *device;
char *path;
+ bool affected;
};
static struct btd_admin_policy *admin_policy_new(struct btd_adapter *adapter)
@@ -139,6 +140,27 @@ static bool service_allowlist_set(struct btd_admin_policy *admin_policy,
return true;
}
+static void update_device_affected(void *data, void *user_data)
+{
+ struct device_data *dev_data = data;
+ bool affected;
+
+ if (!dev_data) {
+ error("Unexpected NULL device_data when updating device");
+ return;
+ }
+
+ affected = !btd_device_all_services_allowed(dev_data->device);
+
+ if (affected == dev_data->affected)
+ return;
+
+ dev_data->affected = affected;
+
+ g_dbus_emit_property_changed(dbus_conn, dev_data->path,
+ ADMIN_POLICY_STATUS_INTERFACE, "AffectedByPolicy");
+}
+
static DBusMessage *set_service_allowlist(DBusConnection *conn,
DBusMessage *msg, void *user_data)
{
@@ -167,6 +189,8 @@ static DBusMessage *set_service_allowlist(DBusConnection *conn,
ADMIN_POLICY_STATUS_INTERFACE,
"ServiceAllowList");
+ queue_foreach(devices, update_device_affected, NULL);
+
return dbus_message_new_method_return(msg);
}
@@ -226,6 +250,29 @@ static bool device_data_match(const void *a, const void *b)
return data->device == dev;
}
+static gboolean property_get_affected_by_policy(
+ const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *user_data)
+{
+ struct device_data *data = user_data;
+ dbus_bool_t affected;
+
+ if (!data) {
+ error("Unexpected error: device_data is NULL");
+ return FALSE;
+ }
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN,
+ &data->affected);
+
+ return TRUE;
+}
+
+static const GDBusPropertyTable admin_policy_device_properties[] = {
+ { "AffectedByPolicy", "b", property_get_affected_by_policy },
+ { }
+};
+
static void free_device_data(void *data)
{
struct device_data *device_data = data;
@@ -308,11 +355,33 @@ static void admin_policy_device_added(struct btd_adapter *adapter,
data->device = device;
data->path = g_strdup(device_get_path(device));
+ data->affected = !btd_device_all_services_allowed(data->device);
+
+ if (!g_dbus_register_interface(dbus_conn, data->path,
+ ADMIN_POLICY_STATUS_INTERFACE,
+ NULL, NULL,
+ admin_policy_device_properties,
+ data, remove_device_data)) {
+ btd_error(btd_adapter_get_index(adapter),
+ "Admin Policy Status interface init failed on path %s",
+ device_get_path(device));
+ free_device_data(data);
+ return;
+ }
+
queue_push_tail(devices, data);
DBG("device_data for %s added", data->path);
}
+static void unregister_device_data(void *data, void *user_data)
+{
+ struct device_data *dev_data = data;
+
+ g_dbus_unregister_interface(dbus_conn, dev_data->path,
+ ADMIN_POLICY_STATUS_INTERFACE);
+}
+
static void admin_policy_device_removed(struct btd_adapter *adapter,
struct btd_device *device)
{
@@ -321,7 +390,7 @@ static void admin_policy_device_removed(struct btd_adapter *adapter,
data = queue_find(devices, device_data_match, device);
if (data)
- remove_device_data(data);
+ unregister_device_data(data, NULL);
}
static struct btd_adapter_driver admin_policy_driver = {
@@ -347,7 +416,8 @@ static void admin_exit(void)
DBG("");
btd_unregister_adapter_driver(&admin_policy_driver);
- queue_destroy(devices, free_device_data);
+ queue_foreach(devices, unregister_device_data, NULL);
+ queue_destroy(devices, g_free);
if (policy_data)
admin_policy_free(policy_data);
--
2.32.0.554.ge1b32706d8-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Bluez PATCH v4 12/13] plugins/admin: persist policy settings
2021-07-29 3:12 [Bluez PATCH v4 00/13] Admin policy series Howard Chung
` (10 preceding siblings ...)
2021-07-29 3:12 ` [Bluez PATCH v4 11/13] plugins/admin: add AffectedByPolicy property Howard Chung
@ 2021-07-29 3:12 ` Howard Chung
2021-07-29 3:12 ` [Bluez PATCH v4 13/13] doc: add description of admin policy Howard Chung
12 siblings, 0 replies; 15+ messages in thread
From: Howard Chung @ 2021-07-29 3:12 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz; +Cc: Yun-Hao Chung, Miao-chen Chou
From: Yun-Hao Chung <howardchung@chromium.org>
This adds code to store the ServiceAllowlist to file
/var/lib/bluetooth/{MAC_ADDR}/admin_policy
The stored settings will be loaded upon admin_policy initialized.
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
The following test steps were performed:
1. Set ServiceAllowlist to ["1124","180A","180F","1812", "1801"]
2. restart bluetoothd
3. Verify ServiceAllowlist is ["1124","180A","180F","1812","1801"] in
UUID-128 form
4. Set ServiceAllowlist to []
5. restart bluetoothd
6. Verify ServiceAllowlist is []
(no changes since v1)
plugins/admin.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 162 insertions(+), 1 deletion(-)
diff --git a/plugins/admin.c b/plugins/admin.c
index 2ad60f2fde2a..82a8ae928ba0 100644
--- a/plugins/admin.c
+++ b/plugins/admin.c
@@ -14,6 +14,8 @@
#include <dbus/dbus.h>
#include <gdbus/gdbus.h>
+#include <sys/file.h>
+#include <sys/stat.h>
#include "lib/bluetooth.h"
#include "lib/uuid.h"
@@ -24,11 +26,13 @@
#include "src/error.h"
#include "src/log.h"
#include "src/plugin.h"
+#include "src/textfile.h"
#include "src/shared/queue.h"
#define ADMIN_POLICY_SET_INTERFACE "org.bluez.AdminPolicySet1"
#define ADMIN_POLICY_STATUS_INTERFACE "org.bluez.AdminPolicyStatus1"
+#define ADMIN_POLICY_STORAGE STORAGEDIR "/admin_policy_settings"
#define DBUS_BLUEZ_SERVICE "org.bluez"
#define BTD_DEVICE_INTERFACE "org.bluez.Device1"
@@ -161,6 +165,8 @@ static void update_device_affected(void *data, void *user_data)
ADMIN_POLICY_STATUS_INTERFACE, "AffectedByPolicy");
}
+static void store_policy_settings(struct btd_admin_policy *admin_policy);
+
static DBusMessage *set_service_allowlist(DBusConnection *conn,
DBusMessage *msg, void *user_data)
{
@@ -179,7 +185,9 @@ static DBusMessage *set_service_allowlist(DBusConnection *conn,
return btd_error_invalid_args(msg);
}
- if (!service_allowlist_set(admin_policy, uuid_list)) {
+ if (service_allowlist_set(admin_policy, uuid_list)) {
+ store_policy_settings(admin_policy);
+ } else {
free_service_allowlist(uuid_list);
return btd_error_failed(msg, "service_allowlist_set failed");
}
@@ -237,6 +245,158 @@ static const GDBusPropertyTable admin_policy_adapter_properties[] = {
{ }
};
+static void free_uuid_strings(char **uuid_strs, int num)
+{
+ gsize i;
+
+ for (i = 0; i < num; i++)
+ g_free(uuid_strs[i]);
+ g_free(uuid_strs);
+}
+
+static char **new_uuid_strings(struct queue *allowlist, gsize *num)
+{
+ const struct queue_entry *entry = NULL;
+ bt_uuid_t *uuid = NULL;
+ char **uuid_strs = NULL;
+ gsize i = 0, allowlist_num;
+
+ allowlist_num = queue_length(allowlist);
+ uuid_strs = g_try_malloc_n(allowlist_num, sizeof(char *));
+ if (!uuid_strs)
+ return NULL;
+
+ for (entry = queue_get_entries(allowlist); entry != NULL;
+ entry = entry->next) {
+ uuid = entry->data;
+ uuid_strs[i] = g_try_malloc0(MAX_LEN_UUID_STR * sizeof(char));
+
+ if (!uuid_strs[i])
+ goto failed;
+
+ bt_uuid_to_string(uuid, uuid_strs[i], MAX_LEN_UUID_STR);
+ i++;
+ }
+
+ *num = allowlist_num;
+ return uuid_strs;
+
+failed:
+ free_uuid_strings(uuid_strs, i);
+
+ return NULL;
+}
+
+static void store_policy_settings(struct btd_admin_policy *admin_policy)
+{
+ GKeyFile *key_file = NULL;
+ char *filename = ADMIN_POLICY_STORAGE;
+ char *key_file_data = NULL;
+ char **uuid_strs = NULL;
+ gsize length, num_uuids;
+
+ key_file = g_key_file_new();
+
+ if (num_uuids) {
+ uuid_strs = new_uuid_strings(admin_policy->service_allowlist,
+ &num_uuids);
+ }
+
+ if (!uuid_strs && num_uuids) {
+ btd_error(admin_policy->adapter_id,
+ "Failed to allocate uuid strings");
+ goto failed;
+ }
+
+ g_key_file_set_string_list(key_file, "General", "ServiceAllowlist",
+ (const gchar * const *)uuid_strs,
+ num_uuids);
+
+ if (create_file(ADMIN_POLICY_STORAGE, 0600) < 0) {
+ btd_error(admin_policy->adapter_id, "create %s failed, %s",
+ filename, strerror(errno));
+ goto failed;
+ }
+
+ key_file_data = g_key_file_to_data(key_file, &length, NULL);
+ g_file_set_contents(ADMIN_POLICY_STORAGE, key_file_data, length, NULL);
+
+ g_free(key_file_data);
+ free_uuid_strings(uuid_strs, num_uuids);
+
+failed:
+ g_key_file_free(key_file);
+}
+
+static void key_file_load_service_allowlist(GKeyFile *key_file,
+ struct btd_admin_policy *admin_policy)
+{
+ GError *gerr = NULL;
+ struct queue *uuid_list = NULL;
+ gchar **uuids = NULL;
+ gsize num, i;
+
+ uuids = g_key_file_get_string_list(key_file, "General",
+ "ServiceAllowlist", &num, &gerr);
+
+ if (gerr) {
+ btd_error(admin_policy->adapter_id,
+ "Failed to load ServiceAllowlist");
+ g_error_free(gerr);
+ return;
+ }
+
+ uuid_list = queue_new();
+ for (i = 0; i < num; i++) {
+ bt_uuid_t *uuid = g_try_malloc(sizeof(*uuid));
+
+ if (!uuid)
+ goto failed;
+
+ if (bt_string_to_uuid(uuid, *uuids)) {
+
+ btd_error(admin_policy->adapter_id,
+ "Failed to convert '%s' to uuid struct",
+ *uuids);
+
+ g_free(uuid);
+ goto failed;
+ }
+
+ queue_push_tail(uuid_list, uuid);
+ uuids++;
+ }
+
+ if (!service_allowlist_set(admin_policy, uuid_list))
+ goto failed;
+
+ return;
+failed:
+ free_service_allowlist(uuid_list);
+}
+
+static void load_policy_settings(struct btd_admin_policy *admin_policy)
+{
+ GKeyFile *key_file;
+ char *filename = ADMIN_POLICY_STORAGE;
+ struct stat st;
+
+ if (stat(filename, &st) < 0) {
+ btd_error(admin_policy->adapter_id,
+ "Failed to get file %s information",
+ filename);
+ return;
+ }
+
+ key_file = g_key_file_new();
+
+ g_key_file_load_from_file(key_file, filename, 0, NULL);
+
+ key_file_load_service_allowlist(key_file, admin_policy);
+
+ g_key_file_free(key_file);
+}
+
static bool device_data_match(const void *a, const void *b)
{
const struct device_data *data = a;
@@ -306,6 +466,7 @@ static int admin_policy_adapter_probe(struct btd_adapter *adapter)
if (!policy_data)
return -ENOMEM;
+ load_policy_settings(policy_data);
adapter_path = adapter_get_path(adapter);
if (!g_dbus_register_interface(dbus_conn, adapter_path,
--
2.32.0.554.ge1b32706d8-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Bluez PATCH v4 13/13] doc: add description of admin policy
2021-07-29 3:12 [Bluez PATCH v4 00/13] Admin policy series Howard Chung
` (11 preceding siblings ...)
2021-07-29 3:12 ` [Bluez PATCH v4 12/13] plugins/admin: persist policy settings Howard Chung
@ 2021-07-29 3:12 ` Howard Chung
12 siblings, 0 replies; 15+ messages in thread
From: Howard Chung @ 2021-07-29 3:12 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz; +Cc: Yun-Hao Chung, Miao-chen Chou
From: Yun-Hao Chung <howardchung@chromium.org>
This adds admin-policy-api.txt.
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
(no changes since v1)
doc/admin-policy-api.txt | 65 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
create mode 100644 doc/admin-policy-api.txt
diff --git a/doc/admin-policy-api.txt b/doc/admin-policy-api.txt
new file mode 100644
index 000000000000..3f116901dbd7
--- /dev/null
+++ b/doc/admin-policy-api.txt
@@ -0,0 +1,65 @@
+BlueZ D-Bus Admin Policy API description
+***********************************
+
+This API provides methods to control the behavior of bluez as an administrator.
+
+Interface AdminPolicySet1 provides methods to set policies. Once the policy is
+set successfully, it will affect all clients and stay persistently even after
+restarting Bluetooth Daemon. The only way to clear it is to overwrite the
+policy with the same method.
+
+Interface AdminPolicyStatus1 provides readonly properties to indicate the
+current values of admin policy.
+
+
+Admin Policy Set hierarchy
+=================
+
+Service org.bluez
+Interface org.bluez.AdminPolicySet1
+Object path [variable prefix]/{hci0,hci1,...}
+
+Methods void SetServiceAllowList(array{string} UUIDs)
+
+ This method sets the service allowlist by specifying
+ service UUIDs.
+
+ When SetServiceAllowList is called, bluez will block
+ incoming and outgoing connections to the service not in
+ UUIDs for all of the clients.
+
+ 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.
+
+ The default value is an empty array.
+
+ Possible errors: org.bluez.Error.InvalidArguments
+ org.bluez.Error.Failed
+
+
+Admin Policy Status hierarchy
+=================
+
+Service org.bluez
+Interface org.bluez.AdminPolicyStatus1
+Object path [variable prefix]/{hci0,hci1,...}
+
+Properties array{string} ServiceAllowList [readonly]
+
+ Current value of service allow list.
+
+
+
+Admin Policy Status hierarchy
+=================
+
+Service org.bluez
+Interface org.bluez.AdminPolicyStatus1
+Object path [variable prefix]/{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX
+
+Properties bool IsAffectedByPolicy [readonly]
+
+ Indicate if there is any auto-connect profile in this
+ device is not allowed by admin policy.
--
2.32.0.554.ge1b32706d8-goog
^ permalink raw reply related [flat|nested] 15+ messages in thread