From patchwork Fri Nov 10 12:58:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 13452402 Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF80A13ADA for ; Fri, 10 Nov 2023 12:58:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EC0lps9b" Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-66d76904928so12670596d6.2 for ; Fri, 10 Nov 2023 04:58:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699621096; x=1700225896; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jR7IS8MqkfjMefzbIaqPeQr/hCOKlml4b7bYxB06kgo=; b=EC0lps9bs8J/o0/ANyrH7ktvjEHAcdaN8snmnyp5O2nSAr0J5iqwXp97FyEBFlodNC 9Ok09JzIYp0DuqhELIP83ybqf8exQUdRgp8GT3aVWWjncNQjOX864vN73nHpC8hP5Gsx UmDJ+vvu3Ltf95BpjZkpVWULJXgWY3raLTrcyqnpIJa9yg9ApP1KsqDIkb48qSrk6VcH H2D31pIfn1+yyWWR1RQdHhw+YUd94KxNDTThobj4xs+F7xbsw3HXVtP4CawUczbhMwxY 4nIrrzwvMKJXhO8XHGmo32SmOtqB3J0sG1GYe7zmVLnRhtj3MGSiCNCBpfAXeC4WCBoq p52A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699621096; x=1700225896; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jR7IS8MqkfjMefzbIaqPeQr/hCOKlml4b7bYxB06kgo=; b=oeMHRxHZAGVNexucwMkwCMT4YlJUAyA3nUDeECb0GJOMZMD2h91M4ar9JLPD0yrpHP BUpWKlHU0fIZ0r9HkhCEoLVb3v88kEacMr6prfVM2b7qiUqbG1/nW29pp7i6m5+IgZp6 zPs4Vcs3kMw/ewX/MsatN7jtDm4u+46iraJ5znJRF+EW6sT9uCyu3OeJtRHLQJMpGttq Yj8VU9YhgXeQFUBqt6k5VBwq/kUYx34hH1zEh+XCzbkIuQSPeN2dS/wrpWlg+FExuzG+ Jn7FlclsfZvVv1v9vkBhGoowjZWFjTXpg7bh2k+uLw72gLrPGPq+5pFtXM2+GZMEoqMT XF5g== X-Gm-Message-State: AOJu0Yyc91vXjPQHagq/sCpS7FVxPddNClUaUj8RFn7nZp7BcivZSrHQ ax2IeMKkWVLkevPvETGWPa7fyz7barc= X-Google-Smtp-Source: AGHT+IGpJfKCLCqcmjLK0sCMCP9Zb8TqcSfpHkJ30b6EXeshriwRemQEOmvb5cRsKUFXtv57jTCR9w== X-Received: by 2002:a05:6214:e49:b0:66d:bc09:f6db with SMTP id o9-20020a0562140e4900b0066dbc09f6dbmr8257691qvc.34.1699621096557; Fri, 10 Nov 2023 04:58:16 -0800 (PST) Received: from LOCLAP699.rst-02.locus (50-78-19-50-static.hfc.comcastbusiness.net. [50.78.19.50]) by smtp.gmail.com with ESMTPSA id l8-20020a056214104800b0065d89f4d537sm2874512qvr.45.2023.11.10.04.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 04:58:16 -0800 (PST) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH 1/2] client: Add shared code DBus interface Date: Fri, 10 Nov 2023 04:58:11 -0800 Message-Id: <20231110125812.69911-1-prestwoj@gmail.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --- client/dbus-proxy.h | 3 +++ 1 file changed, 3 insertions(+) v2: * Fixed copyright diff --git a/client/dbus-proxy.h b/client/dbus-proxy.h index 0b4fec43..98b0a2a4 100644 --- a/client/dbus-proxy.h +++ b/client/dbus-proxy.h @@ -3,6 +3,7 @@ * Wireless daemon for Linux * * Copyright (C) 2017-2019 Intel Corporation. All rights reserved. + * Copyright (C) 2023, Locus Robotics * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,6 +39,8 @@ struct proxy_interface; #define IWD_AP_DIAGNOSTIC_INTERFACE "net.connman.iwd.AccessPointDiagnostic" #define IWD_DAEMON_INTERFACE "net.connman.iwd.Daemon" #define IWD_DPP_INTERFACE "net.connman.iwd.DeviceProvisioning" +#define IWD_DPP_PKEX_INTERFACE \ + "net.connman.iwd.SharedCodeDeviceProvisioning" typedef bool (*proxy_property_match_func_t) (const void *a, const void *b); From patchwork Fri Nov 10 12:58:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 13452403 Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 01F2A13FF9 for ; Fri, 10 Nov 2023 12:58:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ef40jCqg" Received: by mail-yb1-f177.google.com with SMTP id 3f1490d57ef6-da2b9234a9fso2136728276.3 for ; Fri, 10 Nov 2023 04:58:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699621097; x=1700225897; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ug1ao2l3Na+5hYecvZ5ZShGsK871WBtzCkFterRx874=; b=Ef40jCqgIWtGLYld35n2c51P9smLaZNJ/RPBQT76q5OsM1evGkDK+kpugI8PRR4PoF LLES3yereiUlXQ/HJO69WTzdP9e9yRS1NIfuLoQM/CRbDq99Nq2fQiyJTAQLLZ1y1Y/Z WbNIpF45X0cX6SgVtuFd2pZstCx3DB1RyCk/L68j0aPQTJ/D5l3kkxfNnULxw1Pvx5EA 8/1xnISwd2XtJcJSmvkWi+C6uMHkKYtrg6EEcLmWW1/+HeL/bVU+6TZXLg1RNe6+jKyQ f4If8RbfYHEmExtfuwj+4ccyfhMlEF2puSeWtfHru5rbLfHlY3lgQ7E0lSdP2OMk8JkU ILKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699621097; x=1700225897; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ug1ao2l3Na+5hYecvZ5ZShGsK871WBtzCkFterRx874=; b=kPbRcwyVgtwWnaCSl2IbU8uuPAT3R+N7qBiQscA5CaBH1EDNzSsthim9x31dg6wH9b qMAhi6kWcHltkt9RJQKP3UGIXfUe/bSoVZRDzJoATS54dQbSbV8QQ2cv/IiMzXiOLe17 84U5nzQ8yvuN2Qnsze0jcvMWBkYtK57FGn9cmlQkJvRd7HbbmOsF7uQZ4CIbXofHPW8q 0cPtGfa2k1MkhecB8o6qprq3eT3lhpWVipdSq1M63CVGQIj1r1ROJjAL7R86Ml8dgvqV IW2brr3NnoTXEQ2QsMctJQYxw/Ync9g3xPUOoNoV3aMVapLjcLLTDxK24sg1rjaa+pT/ 7d0Q== X-Gm-Message-State: AOJu0Yza9nZf46ez6+Q+GDB/Ffx5wNc6CNcijuflvSJIpd1m0/zisuik SzsytdC+FRt/6zwlow93gioh90IB11M= X-Google-Smtp-Source: AGHT+IGHWOWrb99FYTPr2OMiRaz42ACmLABz9q/CAd532BI5bUond2B0BU54+NBkYEzbPa6ir6VM4Q== X-Received: by 2002:a25:b2a1:0:b0:daf:114a:471 with SMTP id k33-20020a25b2a1000000b00daf114a0471mr2525451ybj.63.1699621097618; Fri, 10 Nov 2023 04:58:17 -0800 (PST) Received: from LOCLAP699.rst-02.locus (50-78-19-50-static.hfc.comcastbusiness.net. [50.78.19.50]) by smtp.gmail.com with ESMTPSA id l8-20020a056214104800b0065d89f4d537sm2874512qvr.45.2023.11.10.04.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 04:58:17 -0800 (PST) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH 2/2] client: add client commands for shared code configuration Date: Fri, 10 Nov 2023 04:58:12 -0800 Message-Id: <20231110125812.69911-2-prestwoj@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231110125812.69911-1-prestwoj@gmail.com> References: <20231110125812.69911-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The StartConfigurator() call was left out since there would be no functional difference to the user in iwctl. Its expected that human users of the shared code API provide the code/id ahead of time, i.e. use ConfigureEnrollee/StartEnrollee. --- Makefile.am | 3 +- client/dpp-pkex.c | 314 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 316 insertions(+), 1 deletion(-) create mode 100644 client/dpp-pkex.c v2: * Fixed copyright * Use l_dbus_message_set_arguments rather than entirely new buidler API. (and removed that builder patch). diff --git a/Makefile.am b/Makefile.am index 2e962153..d0247faf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -314,7 +314,8 @@ client_iwctl_SOURCES = client/main.c \ client/wsc.c client/station.c \ client/diagnostic.c client/diagnostic.h \ client/daemon.c client/daemon.h \ - client/dpp.c client/station-debug.c \ + client/dpp.c client/dpp-pkex.c \ + client/station-debug.c \ src/util.c src/util.h \ src/band.c src/band.h diff --git a/client/dpp-pkex.c b/client/dpp-pkex.c new file mode 100644 index 00000000..9a4273bc --- /dev/null +++ b/client/dpp-pkex.c @@ -0,0 +1,314 @@ +/* + * + * Wireless daemon for Linux + * + * Copyright (C) 2023 Locus Robotics. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#include + +#include "client/command.h" +#include "client/dbus-proxy.h" +#include "client/device.h" +#include "client/display.h" +#include "src/util.h" + +struct pkex { + bool started; + char *role; +}; + +static void *pkex_create(void) +{ + return l_new(struct pkex, 1); +} + +static void pkex_destroy(void *data) +{ + struct pkex *pkex = data; + + l_free(pkex->role); + l_free(pkex); +} + +static void display_pkex_inline(const char *margin, const void *data) +{ + const struct proxy_interface *pkex_i = data; + struct proxy_interface *device_i = + proxy_interface_find(IWD_DEVICE_INTERFACE, + proxy_interface_get_path(pkex_i)); + const char *identity; + + if (!device_i) + return; + + identity = proxy_interface_get_identity_str(device_i); + if (!identity) + return; + + display("%s%-*s\n", margin, 20, identity); +} + +static void check_errors_method_callback(struct l_dbus_message *message, + void *user_data) +{ + dbus_message_has_error(message); +} + +static enum cmd_status cmd_list(const char *device_name, char **argv, int argc) +{ + const struct l_queue_entry *entry; + struct l_queue *match = + proxy_interface_find_all(IWD_DPP_PKEX_INTERFACE, NULL, NULL); + + display_table_header("DPP-PKEX-capable Devices", + MARGIN "%-*s", 20, "Name"); + + if (!match) { + display("No DPP-PKEX-capable devices available\n"); + display_table_footer(); + + return CMD_STATUS_DONE; + } + + for (entry = l_queue_get_entries(match); entry; entry = entry->next) { + const struct proxy_interface *pkex = entry->data; + display_pkex_inline(MARGIN, pkex); + } + + display_table_footer(); + + l_queue_destroy(match, NULL); + + return CMD_STATUS_DONE; +} + +static enum cmd_status cmd_enroll_or_configure(const char *device_name, + char **argv, int argc, + const char *method) +{ + const struct proxy_interface *pkex; + const char *code; + const char *id = NULL; + + pkex = device_proxy_find(device_name, IWD_DPP_PKEX_INTERFACE); + if (!pkex) { + display("No pkex pkex on device: '%s'\n", device_name); + return CMD_STATUS_INVALID_VALUE; + } + + if (argc < 1) + return CMD_STATUS_INVALID_ARGS; + + code = argv[0]; + + if (argc > 1) + id = argv[1]; + + if (id) + proxy_interface_method_call(pkex, method, "a{sv}", + check_errors_method_callback, 2, + "Code", "s", code, + "Identifier", "s", id); + else + proxy_interface_method_call(pkex, method, "a{sv}", + check_errors_method_callback, 1, + "Code", "s", code); + + return CMD_STATUS_TRIGGERED; +} + +static enum cmd_status cmd_enroll(const char *device_name, + char **argv, int argc) +{ + return cmd_enroll_or_configure(device_name, argv, argc, + "StartEnrollee"); +} + +static enum cmd_status cmd_configure(const char *device_name, + char **argv, int argc) +{ + return cmd_enroll_or_configure(device_name, argv, argc, + "ConfigureEnrollee"); +} + +static enum cmd_status cmd_stop(const char *device_name, char **argv, int argc) +{ + const struct proxy_interface *pkex_i = + device_proxy_find(device_name, IWD_DPP_PKEX_INTERFACE); + + if (!pkex_i) { + display("No pkex on device: '%s'\n", device_name); + return CMD_STATUS_INVALID_VALUE; + } + + proxy_interface_method_call(pkex_i, "Stop", "", + check_errors_method_callback); + + return CMD_STATUS_TRIGGERED; +} + +static enum cmd_status cmd_show(const char *device_name, + char **argv, int argc) +{ + const struct proxy_interface *proxy = + device_proxy_find(device_name, IWD_DPP_PKEX_INTERFACE); + char *caption = l_strdup_printf("%s: %s", "DPP-PKEX", device_name); + + if (!proxy) { + display("No DPP-PKEX interface on device: '%s'\n", device_name); + return CMD_STATUS_INVALID_VALUE; + } + + proxy_properties_display(proxy, caption, MARGIN, 20, 47); + l_free(caption); + + display_table_footer(); + + return CMD_STATUS_DONE; +} + +static const struct command pkex_commands[] = { + { NULL, "list", NULL, cmd_list, + "List shared code capable devices", true }, + { "", "stop", NULL, cmd_stop, "Aborts shared code operations" }, + { "", "show", NULL, cmd_show, + "Shows the shared code state", true }, + { "", "enroll", "key [identifier]", + cmd_enroll, "Start a shared code enrollee"}, + { "", "configure", "key [identifier]", + cmd_configure, + "Start a shared code configurator"}, + { } +}; + +static char *family_arg_completion(const char *text, int state) +{ + return device_arg_completion(text, state, pkex_commands, + IWD_DPP_PKEX_INTERFACE); +} + +static char *entity_arg_completion(const char *text, int state) +{ + return command_entity_arg_completion(text, state, pkex_commands); +} + +static void update_started(void *data, struct l_dbus_message_iter *variant) +{ + struct pkex *pkex = data; + bool value; + + if (!l_dbus_message_iter_get_variant(variant, "b", &value)) { + pkex->started = false; + return; + } + + pkex->started = value; +} + +static const char *started_tostr(const void *data) +{ + const struct pkex *pkex = data; + + return pkex->started ? "yes" : "no"; +} + +static void update_role(void *data, struct l_dbus_message_iter *variant) +{ + struct pkex *pkex = data; + const char *value; + + if (pkex->role) + l_free(pkex->role); + + if (!l_dbus_message_iter_get_variant(variant, "s", &value)) { + pkex->role = NULL; + return; + } + + pkex->role = l_strdup(value); +} + +static const char *role_tostr(const void *data) +{ + const struct pkex *pkex = data; + + return pkex->role; +} + +static const struct proxy_interface_property pkex_properties[] = { + { "Started", "b", update_started, started_tostr }, + { "Role", "s", update_role, role_tostr }, + { } +}; + +static const struct proxy_interface_type_ops pkex_ops = { + .create = pkex_create, + .destroy = pkex_destroy, +}; + +static struct proxy_interface_type pkex_interface_type = { + .interface = IWD_DPP_PKEX_INTERFACE, + .properties = pkex_properties, + .ops = &pkex_ops, +}; + + +static struct command_family pkex_command_family = { + .caption = "Shared Code Device Provisioning (PKEX)", + .name = "pkex", + .command_list = pkex_commands, + .family_arg_completion = family_arg_completion, + .entity_arg_completion = entity_arg_completion, +}; + +static int pkex_command_family_init(void) +{ + command_family_register(&pkex_command_family); + + return 0; +} + +static void pkex_command_family_exit(void) +{ + command_family_unregister(&pkex_command_family); +} + +COMMAND_FAMILY(pkex_command_family, pkex_command_family_init, + pkex_command_family_exit) + +static int pkex_interface_init(void) +{ + proxy_interface_type_register(&pkex_interface_type); + + return 0; +} + +static void pkex_interface_exit(void) +{ + proxy_interface_type_unregister(&pkex_interface_type); +} + +INTERFACE_TYPE(pkex_interface_type, pkex_interface_init, pkex_interface_exit)