From d3dadedde5df262cac280bfa201def5885331deb Mon Sep 17 00:00:00 2001 From: Patrick Nicolas Date: Sun, 24 Nov 2024 14:47:28 +0100 Subject: [PATCH] wivrnctl: add list-enrolled --- tools/wivrnctl/main.cpp | 62 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/tools/wivrnctl/main.cpp b/tools/wivrnctl/main.cpp index 52d9c9ee..89193cf9 100644 --- a/tools/wivrnctl/main.cpp +++ b/tools/wivrnctl/main.cpp @@ -63,6 +63,20 @@ sd_bus_message_ptr call_method(const sd_bus_ptr & bus, const char * member, cons return sd_bus_message_ptr(msg); } +sd_bus_message_ptr get_property(const sd_bus_ptr & bus, const char * member, const char * signature) +{ + sd_bus_error error = SD_BUS_ERROR_NULL; + sd_bus_message * msg = nullptr; + int ret = sd_bus_get_property(bus.get(), destination, path, interface, member, &error, &msg, signature); + if (ret < 0) + { + std::runtime_error e(std::string("read property ") + member + " failed: " + error.message); + sd_bus_error_free(&error); + throw e; + } + return sd_bus_message_ptr(msg); +} + void enroll(int duration) { if (duration == 0) @@ -87,6 +101,48 @@ void enroll(int duration) } } +void list_enrolled(bool show_keys) +{ + auto msg = get_property(get_user_bus(), + "KnownKeys", + "a(ss)"); + + int ret = sd_bus_message_enter_container(msg.get(), 'a', "(ss)"); + if (ret < 0) + throw std::system_error(-ret, std::system_category(), "Failed to get enrolled headsets"); + + std::vector> values; + while (true) + { + char * name; + char * key; + int ret = sd_bus_message_read(msg.get(), "(ss)", &name, &key); + if (ret == 0) + break; + if (ret < 0) + throw std::system_error(-ret, std::system_category(), "Failed to get enrolled headset details"); + + values.emplace_back(name, key); + } + size_t width = 0; + if (show_keys) + { + for (const auto & [name, key]: values) + width = std::max(width, name.length()); + width += 1; + } + std::cout << "Enrolled headsets:" << std::endl; + for (const auto & [name, key]: values) + { + if (width > 0) + std::cout << std::left << std::setw(width); + std::cout << name; + if (show_keys) + std::cout << key; + std::cout << std::endl; + } +} + void stop_server() { call_method(get_user_bus(), @@ -124,6 +180,12 @@ int main(int argc, char ** argv) ->default_val(2) ->option_text("INT|unlimited"); + bool show_keys = false; + auto list_command = app.add_subcommand("list-enrolled", "List headsets allowed to connect") + ->callback([&]() { list_enrolled(show_keys); }); + + list_command->add_flag("--keys, -k", show_keys, "Show public keys"); + app.add_subcommand("stop-server", "Stop wivrn-server process") ->callback(stop_server);