Skip to content

Connection::getDeviceVerificationState() #863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 0.9.x
Choose a base branch
from
Open

Connection::getDeviceVerificationState() #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Quotient/connection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1904,6 +1904,21 @@ bool Connection::isKnownE2eeCapableDevice(const QString& userId, const QString&
return query.next();
}

Connection::VerificationState Connection::getDeviceVerificationState(const QString& userId,
const QString& deviceId) const
{
auto query = database()->prepareQuery(
"SELECT verified, selfVerified FROM tracked_devices WHERE deviceId=:deviceId AND matrixId=:matrixId;"_L1);
query.bindValue(":deviceId"_L1, deviceId);
query.bindValue(":matrixId"_L1, userId);
database()->execute(query);
return query.next() ? query.value("verified"_L1).toBool() ? Verified
: isUserVerified(userId) && query.value("selfVerified"_L1).toBool()
? SelfVerified
: Unverified
: NoE2EE;
}

bool Connection::hasConflictingDeviceIdsAndCrossSigningKeys(const QString& userId)
{
if (d->encryptionData) {
Expand Down
11 changes: 11 additions & 0 deletions Quotient/connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ class QUOTIENT_API Connection : public QObject {
//! Returns true if this megolm session comes from a verified device
bool isVerifiedSession(const QByteArray& megolmSessionId) const;

#if Quotient_VERSION_MAJOR == 0 && Quotient_VERSION_MINOR <= 10
//! Returns whether the device is verified
bool isVerifiedDevice(const QString& userId, const QString& deviceId) const;

Expand All @@ -381,7 +382,17 @@ class QUOTIENT_API Connection : public QObject {
//! This might give unexpected results for users we're not tracking,
//! i.e., users that we don't share an encrypted room with
bool isKnownE2eeCapableDevice(const QString& userId, const QString& deviceId) const;
#endif

enum VerificationState : uint8_t { NoE2EE = 0, Unverified, SelfVerified, Verified };
Q_ENUM(VerificationState)

//! \brief Returns whether the device is E2EE-capable and verified/self-verified
//!
//! \note This may give unexpected results for users not tracked in this account,
//! e.g. users that have no common encrypted room with the current account
VerificationState getDeviceVerificationState(const QString& userId,
const QString& deviceId) const;

void sendSessionKeyToDevices(const QString& roomId,
const QOlmOutboundGroupSession& outboundSession,
Expand Down