From b6291294d42c41633a3b5bb3e68eac86acd29096 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Sat, 5 Aug 2023 19:04:39 +0200 Subject: [PATCH] Add some logging to key verification event handling --- Quotient/connectionencryptiondata_p.cpp | 6 +++++- Quotient/connectionencryptiondata_p.h | 3 +++ Quotient/keyverificationsession.cpp | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Quotient/connectionencryptiondata_p.cpp b/Quotient/connectionencryptiondata_p.cpp index add2f8e13..ccec13a1c 100644 --- a/Quotient/connectionencryptiondata_p.cpp +++ b/Quotient/connectionencryptiondata_p.cpp @@ -329,10 +329,14 @@ bool ConnectionEncryptionData::processIfVerificationEvent(const Event& evt, reqEvt, q, encrypted); return true; }, - [](const KeyVerificationDoneEvent&) { return true; }, + [](const KeyVerificationDoneEvent&) { + qCDebug(E2EE) << "Ignoring m.key.verification.done"; + return true; + }, [this](const KeyVerificationEvent& kvEvt) { if (auto* const session = verificationSessions.value(kvEvt.transactionId())) { + qCDebug(E2EE) << "Handling" << kvEvt.matrixType(); session->handleEvent(kvEvt); emit q->keyVerificationStateChanged(session, session->state()); } diff --git a/Quotient/connectionencryptiondata_p.h b/Quotient/connectionencryptiondata_p.h index 21d28f8c7..d917f1632 100644 --- a/Quotient/connectionencryptiondata_p.h +++ b/Quotient/connectionencryptiondata_p.h @@ -6,6 +6,8 @@ #include "e2ee/qolmaccount.h" #include "e2ee/qolmsession.h" +#include "logging_categories_p.h" + namespace Quotient { struct DevicesList; @@ -80,6 +82,7 @@ namespace _impl { { auto session = new KeyVerificationSession(std::forward(sessionArgs)...); + qCDebug(E2EE) << "Incoming key verification session from" << session->remoteDeviceId(); verificationSessions.insert(session->transactionId(), session); QObject::connect(session, &QObject::destroyed, q, [this, txnId = session->transactionId()] { diff --git a/Quotient/keyverificationsession.cpp b/Quotient/keyverificationsession.cpp index 4db7e633b..2d8931082 100644 --- a/Quotient/keyverificationsession.cpp +++ b/Quotient/keyverificationsession.cpp @@ -455,6 +455,7 @@ KeyVerificationSession::State KeyVerificationSession::state() const void KeyVerificationSession::setState(KeyVerificationSession::State state) { + qCDebug(E2EE) << "KeyVerificationSession state" << m_state << "->" << state; m_state = state; emit stateChanged(); }