From 19506296905cddb9a286921a0d56ab22c404aa12 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 20 Apr 2016 15:09:44 -0500 Subject: debug tracers --- src/usb-manager.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/usb-manager.cpp') diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp index 4d750c0..d2d82c3 100644 --- a/src/usb-manager.cpp +++ b/src/usb-manager.cpp @@ -92,6 +92,7 @@ private: void maybe_snap() { +g_message("%s m_req.public_key.empty() %d && m_greeter->is_active().get() %d", G_STRLOC, int(m_req.public_key.empty()), int(m_greeter->is_active().get())); // don't prompt in the greeter! if (!m_req.public_key.empty() && !m_greeter->is_active().get()) snap(); -- cgit v1.2.3 From e1284eb774d75f96d61787f116b0d79328b27286 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 20 Apr 2016 17:32:17 -0500 Subject: remove tracers --- src/usb-manager.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/usb-manager.cpp') diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp index d2d82c3..4d750c0 100644 --- a/src/usb-manager.cpp +++ b/src/usb-manager.cpp @@ -92,7 +92,6 @@ private: void maybe_snap() { -g_message("%s m_req.public_key.empty() %d && m_greeter->is_active().get() %d", G_STRLOC, int(m_req.public_key.empty()), int(m_greeter->is_active().get())); // don't prompt in the greeter! if (!m_req.public_key.empty() && !m_greeter->is_active().get()) snap(); -- cgit v1.2.3 From ce5234162fa0c534ff9abf3fce3d03f4b01e893e Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 22 Apr 2016 09:43:44 -0500 Subject: don't prompt when the greeter's not running yet: change greeter's payload from an 'is_active' bool to a three-value state of active, inactive, and unavailable --- src/usb-manager.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/usb-manager.cpp') diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp index 4d750c0..80b274b 100644 --- a/src/usb-manager.cpp +++ b/src/usb-manager.cpp @@ -49,7 +49,7 @@ public: restart(); }); - m_greeter->is_active().changed().connect([this](bool /*is_active*/) { + m_greeter->state().changed().connect([this](Greeter::State /*state*/) { maybe_snap(); }); @@ -92,9 +92,15 @@ private: void maybe_snap() { - // don't prompt in the greeter! - if (!m_req.public_key.empty() && !m_greeter->is_active().get()) - snap(); + // only prompt if there's something to prompt about + if (m_req.public_key.empty()) + return; + + // only prompt in an unlocked session + if (m_greeter->state().get() != Greeter::State::INACTIVE) + return; + + snap(); } void snap() -- cgit v1.2.3 From 7d2fac8f46110a84d8396251cd0f38351b92f6ce Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 25 Apr 2016 11:05:22 +0200 Subject: add tracer log messages --- src/usb-manager.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/usb-manager.cpp') diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp index 80b274b..9f67720 100644 --- a/src/usb-manager.cpp +++ b/src/usb-manager.cpp @@ -50,6 +50,7 @@ public: }); m_greeter->state().changed().connect([this](Greeter::State /*state*/) { +g_message("%s greeter state changed; calling maybe_snap()", G_STRLOC); maybe_snap(); }); @@ -83,7 +84,7 @@ private: 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: %s", G_STRLOC, req.fingerprint.c_str()); + g_message("%s got pk request: %s, calling maybe_snap()", G_STRLOC, req.fingerprint.c_str()); m_req = req; maybe_snap(); } @@ -92,14 +93,17 @@ private: void maybe_snap() { +g_message("%s m_req.public_key [%s]", G_STRLOC, m_req.public_key.c_str()); // only prompt if there's something to prompt about if (m_req.public_key.empty()) return; +g_message("%s m_greeter->state() %s", G_STRLOC, Greeter::state_str(m_greeter->state().get())); // only prompt in an unlocked session if (m_greeter->state().get() != Greeter::State::INACTIVE) return; +g_message("%s calling snap!", G_STRLOC); snap(); } -- cgit v1.2.3 From f8a8646b5cc0e9b59a5f953dcd8129c93d162915 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 27 Apr 2016 09:56:53 +0200 Subject: add tracers for the notification warning --- src/usb-manager.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/usb-manager.cpp') diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp index 9f67720..ce546fe 100644 --- a/src/usb-manager.cpp +++ b/src/usb-manager.cpp @@ -50,6 +50,8 @@ public: }); m_greeter->state().changed().connect([this](Greeter::State /*state*/) { +g_message("%s clearing old snap, if any", G_STRLOC); + clear_snap(); g_message("%s greeter state changed; calling maybe_snap()", G_STRLOC); maybe_snap(); }); @@ -67,11 +69,16 @@ g_message("%s greeter state changed; calling maybe_snap()", G_STRLOC); private: - void clear() + void clear_snap() { - // clear out old state m_snap_connections.clear(); m_snap.reset(); + } + + void clear() + { + // clear out old state + clear_snap(); m_req = decltype(m_req)(); m_adbd_client.reset(); } -- cgit v1.2.3 From 020e49163abd558ae095ab9a00b6b69b4fdaef2a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 27 Apr 2016 10:43:08 +0200 Subject: remove the temporary tracers --- src/usb-manager.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/usb-manager.cpp') diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp index ce546fe..cf3330d 100644 --- a/src/usb-manager.cpp +++ b/src/usb-manager.cpp @@ -50,9 +50,7 @@ public: }); m_greeter->state().changed().connect([this](Greeter::State /*state*/) { -g_message("%s clearing old snap, if any", G_STRLOC); clear_snap(); -g_message("%s greeter state changed; calling maybe_snap()", G_STRLOC); maybe_snap(); }); @@ -91,7 +89,7 @@ private: m_adbd_client.reset(new GAdbdClient{m_socket_path}); m_adbd_client->on_pk_request().connect( [this](const AdbdClient::PKRequest& req) { - g_message("%s got pk request: %s, calling maybe_snap()", G_STRLOC, req.fingerprint.c_str()); + g_debug("%s got pk request: %s, calling maybe_snap()", G_STRLOC, req.fingerprint.c_str()); m_req = req; maybe_snap(); } @@ -100,17 +98,14 @@ private: void maybe_snap() { -g_message("%s m_req.public_key [%s]", G_STRLOC, m_req.public_key.c_str()); // only prompt if there's something to prompt about if (m_req.public_key.empty()) return; -g_message("%s m_greeter->state() %s", G_STRLOC, Greeter::state_str(m_greeter->state().get())); // only prompt in an unlocked session if (m_greeter->state().get() != Greeter::State::INACTIVE) return; -g_message("%s calling snap!", G_STRLOC); snap(); } -- cgit v1.2.3 From d7a0cac8ebd836172ad6e4b9298ae92b3f9d8de9 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 29 Apr 2016 11:51:22 +0200 Subject: don't clear the snap decision when the greeter changes state --- src/usb-manager.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/usb-manager.cpp') diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp index cf3330d..9c45a56 100644 --- a/src/usb-manager.cpp +++ b/src/usb-manager.cpp @@ -50,7 +50,6 @@ public: }); m_greeter->state().changed().connect([this](Greeter::State /*state*/) { - clear_snap(); maybe_snap(); }); -- cgit v1.2.3 From c66c33c4c1c70b197941f8c486196f3a56abd0e3 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 3 May 2016 18:07:48 -0500 Subject: always send a response to adb even in edge cases; e.g. send an auto-NO if the usb connection is broken while the prompt is up --- src/usb-manager.cpp | 92 +++++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 45 deletions(-) (limited to 'src/usb-manager.cpp') diff --git a/src/usb-manager.cpp b/src/usb-manager.cpp index 9c45a56..65617c5 100644 --- a/src/usb-manager.cpp +++ b/src/usb-manager.cpp @@ -46,59 +46,54 @@ public: m_greeter{greeter} { m_usb_monitor->on_usb_disconnected().connect([this](const std::string& /*usb_name*/) { - restart(); + m_req.reset(); }); - m_greeter->state().changed().connect([this](Greeter::State /*state*/) { - maybe_snap(); + m_greeter->state().changed().connect([this](const Greeter::State& state) { + if (state == Greeter::State::INACTIVE) + maybe_snap(); + else + stop_snap(); }); - restart(); + // create a new adbd 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: %s, calling maybe_snap()", G_STRLOC, req.fingerprint.c_str()); + + m_response = AdbdClient::PKResponse::DENY; // set the fallback response + m_req.reset( + new AdbdClient::PKRequest(req), + [this](AdbdClient::PKRequest* r) { + stop_snap(); + r->respond(m_response); + delete r; + } + ); + maybe_snap(); + } + ); } ~Impl() { - if (m_restart_idle_tag) - g_source_remove(m_restart_idle_tag); - - clear(); + if (m_request_complete_idle_tag) + g_source_remove(m_request_complete_idle_tag); } private: - void clear_snap() + void stop_snap() { m_snap_connections.clear(); m_snap.reset(); } - void clear() - { - // clear out old state - clear_snap(); - m_req = decltype(m_req)(); - m_adbd_client.reset(); - } - - 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: %s, calling maybe_snap()", G_STRLOC, req.fingerprint.c_str()); - m_req = req; - maybe_snap(); - } - ); - } - void maybe_snap() { // only prompt if there's something to prompt about - if (m_req.public_key.empty()) + if (!m_req) return; // only prompt in an unlocked session @@ -110,19 +105,25 @@ private: void snap() { - m_snap = std::make_shared(m_req.fingerprint); + m_snap = std::make_shared(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); - m_restart_idle_tag = g_idle_add([](gpointer gself){ - auto self = static_cast(gself); - self->m_restart_idle_tag = 0; - self->restart(); - return G_SOURCE_REMOVE; - }, this); + write_public_key(m_req->public_key); + + m_response = response; + + // defer finishing the request into an idle func because + // ScopedConnections can't be destroyed inside their callbacks + if (m_request_complete_idle_tag == 0) { + m_request_complete_idle_tag = g_idle_add([](gpointer gself){ + auto self = static_cast(gself); + self->m_request_complete_idle_tag = 0; + self->m_req.reset(); + return G_SOURCE_REMOVE; + }, this); + } } )); } @@ -163,12 +164,13 @@ private: const std::shared_ptr m_usb_monitor; const std::shared_ptr m_greeter; - unsigned int m_restart_idle_tag {}; + unsigned int m_request_complete_idle_tag {}; std::shared_ptr m_adbd_client; - AdbdClient::PKRequest m_req; std::shared_ptr m_snap; std::set m_snap_connections; + AdbdClient::PKResponse m_response {AdbdClient::PKResponse::DENY}; + std::shared_ptr m_req; }; /*** -- cgit v1.2.3