From patchwork Fri Aug 6 09:38:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yun-hao Chung X-Patchwork-Id: 12423019 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35442C4338F for ; Fri, 6 Aug 2021 09:38:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 16BE6611B0 for ; Fri, 6 Aug 2021 09:38:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244493AbhHFJjE (ORCPT ); Fri, 6 Aug 2021 05:39:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231553AbhHFJjE (ORCPT ); Fri, 6 Aug 2021 05:39:04 -0400 Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97AD9C061798 for ; Fri, 6 Aug 2021 02:38:47 -0700 (PDT) Received: by mail-qk1-x749.google.com with SMTP id l26-20020a05620a0c1ab02903ca414e2173so607102qki.20 for ; Fri, 06 Aug 2021 02:38:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=LFFb32v3xhyRKaISoTQcRhANyaQ38+5TSARoGpy4Z4I=; b=PgwQKpHGHZmVFJfS6aJH/XZfzsjCP6cDi5BZ5jrz5LHoQRHrl7oEoT0oeE7YAEQOua U2ZyNdjt6Ux4nJDxOjRZ8ss3V9DDIaYnTV7Z2dHR13vH1rvpVauEeosMoyOFJLh1XheU 1W0OPiUBME3VG1YGL0dSb+SG8lLr2RNbAuunKslDHjKZtAc5d65wJbCzwpxiEbRRtebX IH/xS+GaTXFR1uYAQyEMiiK5fwaytNfG9Iq5dcrQmZHQ4k3CSAjWa32aK9FVpeWYv7rj NJmPrdwFA8noqIsP1XByvT/OVbElEQhyOZk2V7x8j2zzkL38V2iMaj52jVUR5NpnWpEk P5Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=LFFb32v3xhyRKaISoTQcRhANyaQ38+5TSARoGpy4Z4I=; b=sHPRgWJJSG9YD4XlNn2KR7pkhzhhSqIQH0+2UQYxnZcVQ9Bui/EoquugMW66YLSV38 9iktOM3jTqJe1N1shEUl8oca2TybVsjcJqB0N386Vv8BCqqkKxtMDA7Alv+aBXBMvaF1 3jMYIMI2IQ5BWpnRQNHR+lSUXu3nvqobRhVlqE9FWXlYM8TgH4X7nBMi7GbhiDDfg2J+ FhUvHTJHhQRnuO6vWDLonTmCQpJgHaR3VlFcFmIezu9oe/seRmw2WwUF36k6lfgGUq66 miia4wqxd4MQFPgzHJeq3ect5hygU9MZPCYZWnMZvjXRynoy9mqiOhrDM0sa12NHnRtI GgHQ== X-Gm-Message-State: AOAM530m5BTxG1/lWLkDf55xUBYExlB9yrLDPkwDOLNspSpK4S9OHFCP 0Tm3YSQFO67jT4bwuDQVswhNnMqqjgfvqKe6Ih8oz2rkqJqXCI0gj2KM8Uiwm5RP7GYyyzKNvQH mk4VjfJIbGMbv/YzvxYAOMGsoUjYYjA4FKBPCMe1wIUwikghO1e8aXF6c1VQTsxDfRZZgDRm6Fw ZXhvF50uIDRbw= X-Google-Smtp-Source: ABdhPJzV66wBlgdRGTkZOX8lLmkX65w7gW3nYEwgU8yENIMjmxZ9lzztwRPrybcHwhDGZjnAR08TXiuj/slQEY6JEg== X-Received: from howardchung-p920.tpe.corp.google.com ([2401:fa00:1:10:85ab:3c41:db28:3381]) (user=howardchung job=sendgmr) by 2002:a0c:be8e:: with SMTP id n14mr9864178qvi.16.1628242726458; Fri, 06 Aug 2021 02:38:46 -0700 (PDT) Date: Fri, 6 Aug 2021 17:38:32 +0800 Message-Id: <20210806173706.v1.1.Ie7d876ad0b7defabfa86beb64e83f655f12be7ab@changeid> Mime-Version: 1.0 X-Mailer: git-send-email 2.32.0.605.g8dce9f2422-goog Subject: [PATCH v1 1/3] shared/shell: fix missing stdbool in shell.h From: Howard Chung To: linux-bluetooth@vger.kernel.org, luiz.dentz@gmail.com Cc: Yun-Hao Chung , Miao-chen Chou Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Yun-Hao Chung bt_shell_menu_exists_t returns bool, but stdbool.h is not included. Reviewed-by: Miao-chen Chou --- src/shared/shell.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shared/shell.h b/src/shared/shell.h index 415194a40736..cc4f822fbf1d 100644 --- a/src/shared/shell.h +++ b/src/shared/shell.h @@ -8,6 +8,7 @@ * */ #include +#include #define COLOR_OFF "\001\x1B[0m\002" #define COLOR_RED "\001\x1B[0;91m\002" From patchwork Fri Aug 6 09:38:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yun-hao Chung X-Patchwork-Id: 12423021 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76C7AC4338F for ; Fri, 6 Aug 2021 09:38:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 57E0B611BF for ; Fri, 6 Aug 2021 09:38:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244540AbhHFJjG (ORCPT ); Fri, 6 Aug 2021 05:39:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244234AbhHFJjG (ORCPT ); Fri, 6 Aug 2021 05:39:06 -0400 Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9742C061798 for ; Fri, 6 Aug 2021 02:38:50 -0700 (PDT) Received: by mail-qt1-x849.google.com with SMTP id k2-20020ac847820000b029024ea3acef5bso4109296qtq.12 for ; Fri, 06 Aug 2021 02:38:50 -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=rpVgB1BDvoLw0qfkUaQpBy8/tFI+Wqy6J0WWDSTrs+M=; b=Verbatl3PFVwgMy2cI8rbUFYb4XLBCQch8XFDIwiyeKPfPQluDLWkLpXVtI6Qj3dFb WrKHpDgOoZHV8UwsD10DlZXcpIkn2g7vVEkDvffm29FlhSt00V5yoW4+w8zjqou6mUUt LpH11iKqIotnSSGZGfq/bZOWZ1701BM1RTgHVEBl3P0520E3BcZZswmeClx4oYHucyH4 HPI4adPo/6FaY6upwwKXyOXpwlLFGxOBW4g7+fm2JE3YlZllfHIrsfMz5B9a2GNtZesH W48sSCQMly+yUg1LOadZtexgI7mC0VNt2w7H3o7sd56f50kpXzLcSUJkVYNrsq/7U2Jj uuJg== 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=rpVgB1BDvoLw0qfkUaQpBy8/tFI+Wqy6J0WWDSTrs+M=; b=e1uH9obT7capCkmqBPIfHdQUfFgHUYspEkgRTYtuMpXISBYLv7mo1vM6niPfXL7m+V SF+fmcu7reFyXHqx4rlYSd91Hp0JZLKjBU0pbwoW7GNxkhvUaUXHa7MB9ICS4Cu2UmB9 zGvdX2Wvl850924jOpx6K7UdNX6dBv6jRwSvMHV1J7X7FiCH3+8jj15+B7OKF2bozRZb czbh0rT4551C0Q1O/L07zIFMz5QBZ8wQbvirZlHXxmS8+B9bQKlPEXtjJLNRu4o+yQDB OwCFn2yaVXRTsQx6S2F2G+/7dzR+JFGmP8WbUO6Y44CeFmtfuneaOkyqs7qaHoYCgLPo Vbxg== X-Gm-Message-State: AOAM530zo6XiwH7GS9y7WXDPotkM8JsqDEb1p1oHZqV4/kkFRaJXoufO wWMUptU1vvqAsgzb3ECWvJjrqNPlQI/+sjTT752EgX4wnZb4GeCq7bIioSe3NpULFDEO4kML4lH eQSs6FAHJlu93ij2LGqpb6Twl/YqMdrJ+H4e9tWGc/6tv/9bCpryEULP575FeWpmo0sDzjlC/zv v+eCYFa/6yVWE= X-Google-Smtp-Source: ABdhPJyPVDfEX0IBsFWd3PPmQYcXv4G+4gepLBWyBe7fytRKJ8OvutUzu5xIty5QGSpEzEPj92AqMs/YV3ppAAWYVQ== X-Received: from howardchung-p920.tpe.corp.google.com ([2401:fa00:1:10:85ab:3c41:db28:3381]) (user=howardchung job=sendgmr) by 2002:a05:6214:5182:: with SMTP id kl2mr10116716qvb.19.1628242729940; Fri, 06 Aug 2021 02:38:49 -0700 (PDT) Date: Fri, 6 Aug 2021 17:38:33 +0800 In-Reply-To: <20210806173706.v1.1.Ie7d876ad0b7defabfa86beb64e83f655f12be7ab@changeid> Message-Id: <20210806173706.v1.2.I1d1cf4fbc02b11d62f186f0db23c2c537e296a64@changeid> Mime-Version: 1.0 References: <20210806173706.v1.1.Ie7d876ad0b7defabfa86beb64e83f655f12be7ab@changeid> X-Mailer: git-send-email 2.32.0.605.g8dce9f2422-goog Subject: [PATCH v1 2/3] client: add service-allowlist command From: Howard Chung To: linux-bluetooth@vger.kernel.org, luiz.dentz@gmail.com Cc: Yun-Hao Chung , Miao-chen Chou Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Yun-Hao Chung This creates a menu - admin and adds two commands to bluetoothctl - set-service-allowlist [uuid1 uuid2 ...] - get-service-allowlist Reviewed-by: Miao-chen Chou --- The following test steps were performed: 1. [bluetooth]# - menu admin 2. [bluetooth]# set-service-allowlist 1124 180A 180F 1812 1801 3. [bluetooth]# get-service-allowlist 4. Verify the printed UUIDs are the same as what we set. Makefile.tools | 4 +- client/admin_policy.c | 133 ++++++++++++++++++++++++++++++++++++++++++ client/admin_policy.h | 25 ++++++++ client/main.c | 72 +++++++++++++++++++++++ 4 files changed, 233 insertions(+), 1 deletion(-) create mode 100644 client/admin_policy.c create mode 100644 client/admin_policy.h diff --git a/Makefile.tools b/Makefile.tools index c836b5984934..1b493d4d0ed6 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -9,7 +9,9 @@ client_bluetoothctl_SOURCES = client/main.c \ client/advertising.c \ client/adv_monitor.h \ client/adv_monitor.c \ - client/gatt.h client/gatt.c + client/gatt.h client/gatt.c \ + client/admin_policy.h \ + client/admin_policy.c client_bluetoothctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ $(GLIB_LIBS) $(DBUS_LIBS) -lreadline endif diff --git a/client/admin_policy.c b/client/admin_policy.c new file mode 100644 index 000000000000..21062c4f6185 --- /dev/null +++ b/client/admin_policy.c @@ -0,0 +1,133 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2021 Google LLC + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "gdbus/gdbus.h" +#include "src/shared/shell.h" + +#include "admin_policy.h" +#define _GNU_SOURCE + +static GDBusProxy *set_proxy; +static GDBusProxy *status_proxy; + +void admin_policy_set_set_proxy(GDBusProxy *proxy) +{ + set_proxy = proxy; +} + +void admin_policy_set_status_proxy(GDBusProxy *proxy) +{ + status_proxy = proxy; +} + +void admin_policy_read_service_allowlist(DBusConnection *dbus_conn) +{ + DBusMessageIter iter, subiter; + char *uuid = NULL; + + if (!status_proxy || !g_dbus_proxy_get_property(status_proxy, + "ServiceAllowList", &iter)) { + bt_shell_printf("Failed to get property\n"); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY) { + bt_shell_printf("Unexpected return type\n"); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + bt_shell_printf("Service AllowedList:\n"); + dbus_message_iter_recurse(&iter, &subiter); + while (dbus_message_iter_get_arg_type(&subiter) == + DBUS_TYPE_STRING) { + dbus_message_iter_get_basic(&subiter, &uuid); + bt_shell_printf("\t%s\n", uuid); + dbus_message_iter_next(&subiter); + } + + return bt_shell_noninteractive_quit(EXIT_SUCCESS); +} + +struct uuid_list_data { + char **uuid_list; + size_t num; +}; + +static void set_service_setup(DBusMessageIter *iter, void *user_data) +{ + struct uuid_list_data *data = user_data; + DBusMessageIter arr_iter; + size_t i; + + dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, + DBUS_TYPE_STRING_AS_STRING, + &arr_iter); + + for (i = 0; i < data->num; i++) { + dbus_message_iter_append_basic(&arr_iter, DBUS_TYPE_STRING, + &data->uuid_list[i]); + } + + dbus_message_iter_close_container(iter, &arr_iter); +} + +static void set_service_reply(DBusMessage *message, void *user_data) +{ + DBusError error; + + dbus_error_init(&error); + + if (!dbus_set_error_from_message(&error, message)) { + bt_shell_printf("Set allowed service successfully\n"); + return bt_shell_noninteractive_quit(EXIT_SUCCESS); + } + + bt_shell_printf("Failed to set service allowed list: %s\n", error.name); + dbus_error_free(&error); + return bt_shell_noninteractive_quit(EXIT_FAILURE); +} + +void admin_policy_set_service_allowlist(DBusConnection *dbus_connd, + int argc, char *argv[]) +{ + struct uuid_list_data data; + + if (!set_proxy) { + bt_shell_printf("Set proxy not ready\n"); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + data.uuid_list = argv; + data.num = argc; + + if (!g_dbus_proxy_method_call(set_proxy, "SetServiceAllowList", + set_service_setup, set_service_reply, + &data, NULL)) { + bt_shell_printf("Failed to call method\n"); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } +} diff --git a/client/admin_policy.h b/client/admin_policy.h new file mode 100644 index 000000000000..1c8c2152d59d --- /dev/null +++ b/client/admin_policy.h @@ -0,0 +1,25 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2021 Google LLC + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +void admin_policy_set_set_proxy(GDBusProxy *proxy); +void admin_policy_set_status_proxy(GDBusProxy *proxy); + +void admin_policy_read_service_allowlist(DBusConnection *dbus_conn); +void admin_policy_set_service_allowlist(DBusConnection *dbus_conn, + int argc, char *argv[]); diff --git a/client/main.c b/client/main.c index c1a62edb7f99..5297760c8cec 100644 --- a/client/main.c +++ b/client/main.c @@ -29,6 +29,7 @@ #include "gatt.h" #include "advertising.h" #include "adv_monitor.h" +#include "admin_policy.h" /* String display constants */ #define COLORED_NEW COLOR_GREEN "NEW" COLOR_OFF @@ -530,6 +531,23 @@ static void admon_manager_added(GDBusProxy *proxy) adv_monitor_register_app(dbus_conn); } +static void admin_policy_set_added(GDBusProxy *proxy) +{ + admin_policy_set_set_proxy(proxy); +} + +static void admin_policy_status_added(GDBusProxy *proxy) +{ + struct adapter *adapter; + + adapter = find_ctrl(ctrl_list, g_dbus_proxy_get_path(proxy)); + + if (!adapter) + return; + + admin_policy_set_status_proxy(proxy); +} + static void proxy_added(GDBusProxy *proxy, void *user_data) { const char *interface; @@ -565,6 +583,10 @@ static void proxy_added(GDBusProxy *proxy, void *user_data) } else if (!strcmp(interface, "org.bluez.AdvertisementMonitorManager1")) { admon_manager_added(proxy); + } else if (!strcmp(interface, "org.bluez.AdminPolicySet1")) { + admin_policy_set_added(proxy); + } else if (!strcmp(interface, "org.bluez.AdminPolicyStatus1")) { + admin_policy_status_added(proxy); } } @@ -621,6 +643,23 @@ static void adapter_removed(GDBusProxy *proxy) } } +static void admin_policy_set_removed(GDBusProxy *proxy) +{ + admin_policy_set_set_proxy(NULL); +} + +static void admin_policy_status_removed(GDBusProxy *proxy) +{ + struct adapter *adapter; + + adapter = find_ctrl(ctrl_list, g_dbus_proxy_get_path(proxy)); + + if (!adapter) + return; + + admin_policy_set_status_proxy(NULL); +} + static void proxy_removed(GDBusProxy *proxy, void *user_data) { const char *interface; @@ -661,6 +700,10 @@ static void proxy_removed(GDBusProxy *proxy, void *user_data) } else if (!strcmp(interface, "org.bluez.AdvertisementMonitorManager1")) { adv_monitor_remove_manager(dbus_conn); + } else if (!strcmp(interface, "org.bluez.AdminPolicySet1")) { + admin_policy_set_removed(proxy); + } else if (!strcmp(interface, "org.bluez.AdminPolicyStatus1")) { + admin_policy_status_removed(proxy); } } @@ -2824,6 +2867,22 @@ static void cmd_adv_monitor_get_supported_info(int argc, char *argv[]) adv_monitor_get_supported_info(); } +static void cmd_set_service_allowlist(int argc, char *argv[]) +{ + if (check_default_ctrl() == FALSE) + return bt_shell_noninteractive_quit(EXIT_FAILURE); + + admin_policy_set_service_allowlist(dbus_conn, argc - 1, argv + 1); +} + +static void cmd_get_service_allowlist(int argc, char *argv[]) +{ + if (check_default_ctrl() == FALSE) + return bt_shell_noninteractive_quit(EXIT_FAILURE); + + admin_policy_read_service_allowlist(dbus_conn); +} + static const struct bt_shell_menu advertise_menu = { .name = "advertise", .desc = "Advertise Options Submenu", @@ -2978,6 +3037,18 @@ static const struct bt_shell_menu gatt_menu = { { } }, }; +static const struct bt_shell_menu admin_menu = { + .name = "admin", + .desc = "Admin Policy Submenu", + .entries = { + { "set-service-allowlist", "[uuid1 uuid2 ...]", + cmd_set_service_allowlist, + "Set service allowlist"}, + { "get-service-allowlist", NULL, cmd_get_service_allowlist, + "Get service allowlist"}, + {} }, +}; + static const struct bt_shell_menu main_menu = { .name = "main", .entries = { @@ -3075,6 +3146,7 @@ int main(int argc, char *argv[]) bt_shell_add_submenu(&advertise_monitor_menu); bt_shell_add_submenu(&scan_menu); bt_shell_add_submenu(&gatt_menu); + bt_shell_add_submenu(&admin_menu); bt_shell_set_prompt(PROMPT_OFF); if (agent_option) From patchwork Fri Aug 6 09:38:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yun-hao Chung X-Patchwork-Id: 12423023 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5C55C4338F for ; Fri, 6 Aug 2021 09:38:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A634A611B0 for ; Fri, 6 Aug 2021 09:38:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244604AbhHFJjL (ORCPT ); Fri, 6 Aug 2021 05:39:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244597AbhHFJjJ (ORCPT ); Fri, 6 Aug 2021 05:39:09 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 744C5C061798 for ; Fri, 6 Aug 2021 02:38:54 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id o38-20020a17090a0a29b02901772cd97277so10048490pjo.0 for ; Fri, 06 Aug 2021 02:38:54 -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=8IPkfJKLaht0GqlRiH05vPkqQ7WMlNLkm6GbILAI3no=; b=tWPclWRStpoyjqstcBunVYqJZYERFby6NSDSPTEh94DQYJwbENWTZTBNN9LFgnO5gB D2Q1pjLwQ+NPaWPeyLEHIBHkyhxDBKTXlAhcJIwHi1qTIoAIXzu/3iAHi9FALuYNaUTN IjUo9MKwRdihlBTdWQT92+mwRj1H+JKEHe/W3VAXLXAD5PnBeH5FVaKxiUUJ0os3UjFi 7iJfaYnGLzFHZZUhvVa8iefkF8PI4U2eDKZZwfvCAkoJUqSEk8JLSm66oP9vQqecacJ7 NIIPJXTioX9/1kmJihANaH6+mzSeidRnSA9pOHBa2mGSx+ZHOK3GCeErWEw3mlFjstUo 7IRA== 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=8IPkfJKLaht0GqlRiH05vPkqQ7WMlNLkm6GbILAI3no=; b=FH2TZEU1TfWkHUTirGN96bPB2hQAVGaoGMFlLwezwbyk/Qc5ySqHiX83Bpf0hjwbIY 45W7uRMmT9naUv8bATMTSqJE94Ynrb5mVnnZQyJ2J91D+KbIpk9wBeplaVYYnDFKCQWl I++EQ8pRqkAFGPrngcit2zm4wbTBUclO0jpBqzzt80X24AgLCkAO3kzbb7cM6N3KQ8YM fKF7MFJgr+xAsW4141Q/dwRIscWhDKENPjn44ADXWy1s12Vrl2ytiOTEdj3twiek+nz9 ZRpjP6eluZxZzveyNyg/Wu2tkf9/i56CKPcXPwf9sM6KKm/3KL7ulVJUwIuI9V+FCGQw WjJQ== X-Gm-Message-State: AOAM530Fz15jeI7Bcj4Pxisa7/aJYW16gqC+Gs1TtBCtZ38FUisJqLLL 2DJ1z4U0Yfi/t91dbzDvVFqdkDZZKlT2+6u+KbhA3d7d4Huf+83w0kOV+Y/UMgyJ0fphABIltR9 BGm8VgSRwBnfvElZCSZ1CBaKlvq1KrppPQHdrr/pfq9hs/EaEOxO6vATLQhh2s61g96y4x4qt2p aCghAyZlTPVgg= X-Google-Smtp-Source: ABdhPJypFCNiIAoRMgcRNhy/jR4GejvRB19fvR5MiYZOYi/plzrxuhKmrPvAvZY534B2fX43q9sMxWSRGqJt/OioJQ== X-Received: from howardchung-p920.tpe.corp.google.com ([2401:fa00:1:10:85ab:3c41:db28:3381]) (user=howardchung job=sendgmr) by 2002:a17:90a:f683:: with SMTP id cl3mr19828929pjb.170.1628242733826; Fri, 06 Aug 2021 02:38:53 -0700 (PDT) Date: Fri, 6 Aug 2021 17:38:34 +0800 In-Reply-To: <20210806173706.v1.1.Ie7d876ad0b7defabfa86beb64e83f655f12be7ab@changeid> Message-Id: <20210806173706.v1.3.I4f0ce40e36938756509ebe62a97929957936e648@changeid> Mime-Version: 1.0 References: <20210806173706.v1.1.Ie7d876ad0b7defabfa86beb64e83f655f12be7ab@changeid> X-Mailer: git-send-email 2.32.0.605.g8dce9f2422-goog Subject: [PATCH v1 3/3] client: add AffectedByPolicy property From: Howard Chung To: linux-bluetooth@vger.kernel.org, luiz.dentz@gmail.com Cc: Yun-Hao Chung , Miao-chen Chou Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Yun-Hao Chung This prints property AffectedByPolicy in device info if org.bluez.AdminPolicyStatus1 exists. This also rename find_battery_by_path to find_proxies_by_path to reuse the function. Reviewed-by: Miao-chen Chou --- The following test steps were performed: 1. [bluetooth] menu admin 2. [bluetooth] set-service-allowlist 1124 180A 180F 1812 1801 3. Verify only HID devices are not `Affected by Policy` 4. [bluetooth] set-service-allowlist 1108 110A 110B 110C 110D 110E 110F 1112 111E 111F 1203 5. Verify only audio devices are not `Affected by Policy` devices are expected. client/main.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/client/main.c b/client/main.c index 5297760c8cec..60ccee75a1e5 100644 --- a/client/main.c +++ b/client/main.c @@ -56,6 +56,7 @@ static GDBusProxy *default_dev; static GDBusProxy *default_attr; static GList *ctrl_list; static GList *battery_proxies; +static GList *admin_devices_proxies; static const char *agent_arguments[] = { "on", @@ -542,8 +543,11 @@ static void admin_policy_status_added(GDBusProxy *proxy) adapter = find_ctrl(ctrl_list, g_dbus_proxy_get_path(proxy)); - if (!adapter) + if (!adapter) { + admin_devices_proxies = g_list_append(admin_devices_proxies, + proxy); return; + } admin_policy_set_status_proxy(proxy); } @@ -654,8 +658,11 @@ static void admin_policy_status_removed(GDBusProxy *proxy) adapter = find_ctrl(ctrl_list, g_dbus_proxy_get_path(proxy)); - if (!adapter) + if (!adapter) { + admin_devices_proxies = g_list_remove(admin_devices_proxies, + proxy); return; + } admin_policy_set_status_proxy(NULL); } @@ -837,7 +844,7 @@ static struct adapter *find_ctrl_by_address(GList *source, const char *address) return NULL; } -static GDBusProxy *find_battery_by_path(GList *source, const char *path) +static GDBusProxy *find_proxies_by_path(GList *source, const char *path) { GList *list; @@ -1704,6 +1711,7 @@ static struct GDBusProxy *find_device(int argc, char *argv[]) static void cmd_info(int argc, char *argv[]) { GDBusProxy *proxy; + GDBusProxy *admin_proxy; GDBusProxy *battery_proxy; DBusMessageIter iter; const char *address; @@ -1747,10 +1755,14 @@ static void cmd_info(int argc, char *argv[]) print_property(proxy, "AdvertisingFlags"); print_property(proxy, "AdvertisingData"); - battery_proxy = find_battery_by_path(battery_proxies, + battery_proxy = find_proxies_by_path(battery_proxies, + g_dbus_proxy_get_path(proxy)); + admin_proxy = find_proxies_by_path(admin_devices_proxies, g_dbus_proxy_get_path(proxy)); print_property_with_label(battery_proxy, "Percentage", "Battery Percentage"); + print_property_with_label(admin_proxy, "AffectedByPolicy", + "Affected by Policy"); return bt_shell_noninteractive_quit(EXIT_SUCCESS); }