Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp5764829pxv; Wed, 28 Jul 2021 20:15:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2ItRoTxX5ZlAY6GkXMfVS/3Zkaq5adNupAANquQfgBUJFSHGprXtI/tWhbteBvE9vu+sD X-Received: by 2002:a92:750f:: with SMTP id q15mr1789592ilc.240.1627528515968; Wed, 28 Jul 2021 20:15:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627528515; cv=none; d=google.com; s=arc-20160816; b=llKqP73gh5zufnxzV8raoFQmpPb7gDdaCBuyuXnx4jfeQGQ5bVjWBLdxBSQ2vtyYGT D1BDqkrY513VkPoSBdnplLusG5cUHJ1fAFuiWdsuDwFm5OwYXxS1dv7wV1tUa5D+GsNQ j1TDLA1HedTzs1sg+YFQvaNrRccNR7wU2zfQ6G6GP/CThEBRqbtBhl1UzxyNC5tg5rHU H9OU889wSvjR7P1r1fz38wsbFUkxBBoor6agIxGe1gqewfSlUqSLh3E4lBu1eMBuH3wk NqucrTxFdglsWacp0QDQnlOcwszXt9G9NIdSQZXoz0TY7XiEg+W8lPmrAryNZdavwdlj lLdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=mBLjXrHQ5lgtfl1BcZdX0e297aDH/2LQGuJ4FxguBp8=; b=0KSXoyk0TyBFlFA5O9NLhpJX/FTNWy5ft/wACA0Pk3d9Fd+3d6VXRW6JK0qxPMOukT yRo1cgfydNSPDWFF2Wf/z/IuU0Hhrl3dl1jNY4vgWlXIxVGJODJIayuz+r7PmV8N58Hl 0TwJJ3/jAiOVDuDxb4kUJtkE0WlCTv6l/z79hfRznn0CTAH2mEva5OkPkMpTBwPa8hOc VD1X0Jhh2Cv/KQ/aIKDQ5LLcdQjbRk29g2whv7zr0B4jySPIvhWg+9mFyK6rDSAbOq55 AFBEFNWoeRmlqIf6u7x+eDuZetZkDU9Jxf1gj77Yx24rElnyVrl0QnkkCacibBnzh+Er 5qHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=FUZlMpmI; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n26si1798654jam.80.2021.07.28.20.15.04; Wed, 28 Jul 2021 20:15:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=FUZlMpmI; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233542AbhG2DOd (ORCPT + 99 others); Wed, 28 Jul 2021 23:14:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233485AbhG2DOd (ORCPT ); Wed, 28 Jul 2021 23:14:33 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19430C061796 for ; Wed, 28 Jul 2021 20:14:26 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id n192-20020a25dac90000b029054c59edf217so5406144ybf.3 for ; Wed, 28 Jul 2021 20:14:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=mBLjXrHQ5lgtfl1BcZdX0e297aDH/2LQGuJ4FxguBp8=; b=FUZlMpmIPfoo2foHztG4S6kApHDvI/HfOj4fGr+oXwUy68xzIufYimEkQD2KaPDm3Q 2m0eHUhCovFiSuf/IotfbH6zhj0dxK9muuGTzzN0sXh2XOKJekHFfzjUGe4LXu83+hqB ZcsyfdPQtJPtEPCVycn9L7d2lBFh7oCDI0cQpj2AIgA5H9Yzqi+2GMbG+TdigLrQfQ/5 UIVd+SPYS56uh/SeLWCVqeKA4iZQgphvLXGP6c6ZT741OLFyJbL13uXEBUto4Asf0OCj U87yABQxm1ckU66aa843LuYKMM13IZeTnNBshN8VPQKxsZXjoTM4SvhZAsRAr6S+ilQ/ SZoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=mBLjXrHQ5lgtfl1BcZdX0e297aDH/2LQGuJ4FxguBp8=; b=tQuTo8vgGdPQX6ZjaIP/lZ/Rc1iWf2w5532jT56WwTz7Daq/+/CTeThK7dgyC/Pu86 OeZBUNHLtGiVLmsMUvwrYV0RbJhlBQYJORs6jPnbx9dfP9yEktxBqARHJXdmHUCVSAzM tvqLEl6ouRkZVGPY+X0y0fD2mAwi4OCNw/THETGO2IKkpi3wKdI7qxTLnnOrzvjlrPXF iPpRqf2Cl/TUPMRqsuxnQaB50lT9iLzGsqb3S8OSlqGjMwjums3UMUJ/dpMhvgmfZGgs Da5T8wF2XpVox9qFKSmRGbtBueCAJ86jDz7GrmocPJtifyNvTwCEa7RgXEJFlyTgTS0N BX8g== X-Gm-Message-State: AOAM530ldV4ePNeCUxwLfY2DV3fZJaNsCbDbIRdkaIHGEycVdfjT1bv2 0LsJrKUN1YFRNkTc/jN/vfg0xSO4CZ6ri9lS9rJFG8c0n8M4iQI08jWPeoXS5runNM4aMETg8Qz r0nZNKoyL9jRGUtNLjmufMnOJxAH+O3hcYc0K2R503TLM4ASsJz7u3gFdKzawMiUS+UEJgSdMLP nsrlThyBaPo5E= X-Received: from howardchung-p920.tpe.corp.google.com ([2401:fa00:1:10:ff72:1420:4502:fdaf]) (user=howardchung job=sendgmr) by 2002:a25:c9c7:: with SMTP id z190mr3886604ybf.21.1627528466079; Wed, 28 Jul 2021 20:14:26 -0700 (PDT) Date: Thu, 29 Jul 2021 11:12:58 +0800 In-Reply-To: <20210729031258.3391756-1-howardchung@google.com> Message-Id: <20210729110956.Bluez.v4.12.Ib26c0abdbd417673a8b5788c175c06110726a68c@changeid> Mime-Version: 1.0 References: <20210729031258.3391756-1-howardchung@google.com> X-Mailer: git-send-email 2.32.0.554.ge1b32706d8-goog Subject: [Bluez PATCH v4 12/13] plugins/admin: persist policy settings From: Howard Chung To: linux-bluetooth@vger.kernel.org, luiz.dentz@gmail.com Cc: Yun-Hao Chung , Miao-chen Chou Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Yun-Hao Chung 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 --- 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 #include +#include +#include #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