aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/main.cpp2
-rw-r--r--src/usb-manager.cpp76
-rw-r--r--src/usb-manager.h4
-rw-r--r--tests/utils/mock-greeter.h32
4 files changed, 91 insertions, 23 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 6c111f1..52cdd58 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -64,7 +64,7 @@ main(int /*argc*/, char** /*argv*/)
static constexpr char const * PUBLIC_KEYS_FILENAME {"/data/misc/adb/adb_keys"};
auto usb_monitor = std::make_shared<GUDevUsbMonitor>();
auto greeter = std::make_shared<UnityGreeter>();
- UsbManager usb_manager {ADB_SOCKET_PATH, PUBLIC_KEYS_FILENAME, usb_monitor};
+ UsbManager usb_manager {ADB_SOCKET_PATH, PUBLIC_KEYS_FILENAME, usb_monitor, greeter};
// let's go!
g_main_loop_run(loop);
diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp
index f5957d9..0e59ca2 100644
--- a/src/usb-manager.cpp
+++ b/src/usb-manager.cpp
@@ -37,51 +37,83 @@ public:
explicit Impl(
const std::string& socket_path,
const std::string& public_keys_filename,
- const std::shared_ptr<UsbMonitor>& usb_monitor
+ const std::shared_ptr<UsbMonitor>& usb_monitor,
+ const std::shared_ptr<Greeter>& greeter
):
m_socket_path{socket_path},
m_public_keys_filename{public_keys_filename},
- m_usb_monitor{usb_monitor}
+ m_usb_monitor{usb_monitor},
+ m_greeter{greeter}
{
m_usb_monitor->on_usb_disconnected().connect([this](const std::string& /*usb_name*/) {
restart();
});
+ m_greeter->is_active().changed().connect([this](bool /*is_active*/) {
+ maybe_snap_now();
+ });
+
restart();
}
- ~Impl() =default;
+ ~Impl()
+ {
+ clear();
+ }
private:
- void restart()
+ void clear()
{
// clear out old state
m_snap_connections.clear();
m_snap.reset();
+ m_req = AdbdClient::PKRequest{};
m_adbd_client.reset();
+ }
- // add a new client
+ void restart()
+ {
+ clear();
+
+ // set a new client
m_adbd_client.reset(new GAdbdClient{m_socket_path});
m_adbd_client->on_pk_request().connect(
[this](const AdbdClient::PKRequest& req) {
-
g_debug("%s got pk request", G_STRLOC);
-
- m_snap = std::make_shared<UsbSnap>(req.fingerprint);
- m_snap_connections.insert((*m_snap).on_user_response().connect(
- [this,req](AdbdClient::PKResponse response, bool remember_choice){
- g_debug("%s user responded! response %d, remember %d", G_STRLOC, int(response), int(remember_choice));
- req.respond(response);
- if (remember_choice && (response == AdbdClient::PKResponse::ALLOW))
- write_public_key(req.public_key);
- g_idle_add([](gpointer gself){static_cast<Impl*>(gself)->m_snap.reset(); return G_SOURCE_REMOVE;}, this);
- }
- ));
+ m_req = req;
+ maybe_snap_now();
}
);
}
+ bool ready_to_snap()
+ {
+ return !m_greeter->is_active().get() && !m_req.public_key.empty();
+ }
+
+ void maybe_snap_now()
+ {
+ if (ready_to_snap())
+ snap_now();
+ }
+
+ void snap_now()
+ {
+ g_return_if_fail(ready_to_snap());
+
+ m_snap = std::make_shared<UsbSnap>(m_req.fingerprint);
+ m_snap_connections.insert((*m_snap).on_user_response().connect(
+ [this](AdbdClient::PKResponse response, bool remember_choice){
+ g_debug("%s user responded! response %d, remember %d", G_STRLOC, int(response), int(remember_choice));
+ m_req.respond(response);
+ if (remember_choice && (response == AdbdClient::PKResponse::ALLOW))
+ write_public_key(m_req.public_key);
+ g_idle_add([](gpointer gself){static_cast<Impl*>(gself)->restart(); return G_SOURCE_REMOVE;}, this);
+ }
+ ));
+ }
+
void write_public_key(const std::string& public_key)
{
g_debug("%s writing public key '%s' to '%s'", G_STRLOC, public_key.c_str(), m_public_keys_filename.c_str());
@@ -115,10 +147,11 @@ private:
const std::string m_socket_path;
const std::string m_public_keys_filename;
-
- std::shared_ptr<UsbMonitor> m_usb_monitor;
+ const std::shared_ptr<UsbMonitor> m_usb_monitor;
+ const std::shared_ptr<Greeter> m_greeter;
std::shared_ptr<GAdbdClient> m_adbd_client;
+ AdbdClient::PKRequest m_req;
std::shared_ptr<UsbSnap> m_snap;
std::set<core::ScopedConnection> m_snap_connections;
};
@@ -130,9 +163,10 @@ private:
UsbManager::UsbManager(
const std::string& socket_path,
const std::string& public_keys_filename,
- const std::shared_ptr<UsbMonitor>& usb_monitor
+ const std::shared_ptr<UsbMonitor>& usb_monitor,
+ const std::shared_ptr<Greeter>& greeter
):
- impl{new Impl{socket_path, public_keys_filename, usb_monitor}}
+ impl{new Impl{socket_path, public_keys_filename, usb_monitor, greeter}}
{
}
diff --git a/src/usb-manager.h b/src/usb-manager.h
index 960d634..b93992f 100644
--- a/src/usb-manager.h
+++ b/src/usb-manager.h
@@ -19,6 +19,7 @@
#pragma once
+#include <src/greeter.h>
#include <src/usb-monitor.h>
#include <memory>
@@ -34,7 +35,8 @@ public:
UsbManager(
const std::string& socket_path,
const std::string& public_key_filename,
- const std::shared_ptr<UsbMonitor>&
+ const std::shared_ptr<UsbMonitor>&,
+ const std::shared_ptr<Greeter>&
);
~UsbManager();
diff --git a/tests/utils/mock-greeter.h b/tests/utils/mock-greeter.h
new file mode 100644
index 0000000..5ac85a0
--- /dev/null
+++ b/tests/utils/mock-greeter.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#pragma once
+
+#include <src/greeter.h>
+
+class MockGreeter: public Greeter
+{
+public:
+ MockGreeter() =default;
+ virtual ~MockGreeter() =default;
+ core::Property<bool>& is_active() override {return m_is_active;}
+ core::Property<bool> m_is_active {false};
+};
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 04:02:59 +0000