forked from blue/squawk
some further work on omemo, far from done yet
This commit is contained in:
parent
6f32e99593
commit
77dd28b600
@ -106,6 +106,8 @@ Account::Account(const QString& p_login, const QString& p_server, const QString&
|
||||
#ifdef WITH_OMEMO
|
||||
client.addExtension(tm);
|
||||
client.addExtension(om);
|
||||
om->setSecurityPolicy(QXmpp::Toakafa);
|
||||
om->setNewDeviceAutoSessionBuildingEnabled(true);
|
||||
|
||||
if (oh->hasOwnDevice()) {
|
||||
QXmppTask<bool> future = om->load();
|
||||
|
@ -110,10 +110,10 @@ void Core::DiscoveryHandler::onInfoReceived(const QXmppDiscoveryIq& info)
|
||||
}
|
||||
}
|
||||
acc->setPepSupport(pepSupported ? Shared::Support::supported : Shared::Support::unsupported);
|
||||
} else {
|
||||
qDebug() << "Received info for account" << accName << "about" << from;
|
||||
} else {
|
||||
QString node = info.queryNode();
|
||||
if (!node.isEmpty()) {
|
||||
qDebug() << "Received features and identities for account" << accName << "about" << from;
|
||||
QStringList feats = info.features();
|
||||
std::set<Shared::Identity> identities;
|
||||
std::set<QString> features(feats.begin(), feats.end());
|
||||
@ -135,7 +135,7 @@ void Core::DiscoveryHandler::onInfoReceived(const QXmppDiscoveryIq& info)
|
||||
} else {
|
||||
Contact* cont = acc->rh->getContact(from);
|
||||
if (cont != nullptr) {
|
||||
qDebug() << "Received info for account" << accName << "about" << from;
|
||||
qDebug() << "Received info for account" << accName << "about contact" << from;
|
||||
QList<QXmppDiscoveryIq::Identity> identities = info.identities();
|
||||
bool pepSupported = false;
|
||||
for (const QXmppDiscoveryIq::Identity& identity : identities) {
|
||||
|
@ -154,6 +154,19 @@ QXmppTask<void> Core::OmemoHandler::resetAll() {
|
||||
return Core::makeReadyTask();
|
||||
}
|
||||
|
||||
void Core::OmemoHandler::getDevices(const QString& jid, std::list<Shared::KeyInfo>& out) const {
|
||||
QHash<uint32_t, Device> devs;
|
||||
try {
|
||||
devs = devices->getRecord(jid);
|
||||
} catch (const DataBase::NotFound& error) {}
|
||||
|
||||
for (QHash<uint32_t, Device>::const_iterator itr = devs.begin(), end = devs.end(); itr != end; ++itr) {
|
||||
const Device& dev = itr.value();
|
||||
out.emplace_back(itr.key(), dev.keyId, dev.label, QDateTime(), Shared::TrustLevel::undecided, Shared::EncryptionProtocol::omemo2, false);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
QDataStream & operator >> (QDataStream& in, QXmppOmemoStorage::Device& device) {
|
||||
in >> device.label;
|
||||
in >> device.keyId;
|
||||
|
@ -17,9 +17,15 @@
|
||||
#ifndef CORE_OMEMOHANDLER_H
|
||||
#define CORE_OMEMOHANDLER_H
|
||||
|
||||
#include <map>
|
||||
#include <list>
|
||||
|
||||
#include <QXmppOmemoStorage.h>
|
||||
#include <cache.h>
|
||||
|
||||
#include <shared/keyinfo.h>
|
||||
#include <shared/enums.h>
|
||||
|
||||
Q_DECLARE_METATYPE(QXmppOmemoStorage::OwnDevice);
|
||||
Q_DECLARE_METATYPE(QXmppOmemoStorage::Device);
|
||||
|
||||
@ -34,24 +40,26 @@ public:
|
||||
OmemoHandler(Account* account);
|
||||
~OmemoHandler() override;
|
||||
|
||||
QXmppTask<OmemoData> allData() override;
|
||||
virtual QXmppTask<OmemoData> allData() override;
|
||||
|
||||
QXmppTask<void> setOwnDevice(const std::optional<OwnDevice> &device) override;
|
||||
virtual QXmppTask<void> setOwnDevice(const std::optional<OwnDevice> &device) override;
|
||||
|
||||
QXmppTask<void> addSignedPreKeyPair(uint32_t keyId, const QXmppOmemoStorage::SignedPreKeyPair &keyPair) override;
|
||||
QXmppTask<void> removeSignedPreKeyPair(uint32_t keyId) override;
|
||||
virtual QXmppTask<void> addSignedPreKeyPair(uint32_t keyId, const QXmppOmemoStorage::SignedPreKeyPair &keyPair) override;
|
||||
virtual QXmppTask<void> removeSignedPreKeyPair(uint32_t keyId) override;
|
||||
|
||||
QXmppTask<void> addPreKeyPairs(const QHash<uint32_t, QByteArray> &keyPairs) override;
|
||||
QXmppTask<void> removePreKeyPair(uint32_t keyId) override;
|
||||
virtual QXmppTask<void> addPreKeyPairs(const QHash<uint32_t, QByteArray> &keyPairs) override;
|
||||
virtual QXmppTask<void> removePreKeyPair(uint32_t keyId) override;
|
||||
|
||||
QXmppTask<void> addDevice(const QString &jid, uint32_t deviceId, const Device &device) override;
|
||||
QXmppTask<void> removeDevice(const QString &jid, uint32_t deviceId) override;
|
||||
QXmppTask<void> removeDevices(const QString &jid) override;
|
||||
virtual QXmppTask<void> addDevice(const QString &jid, uint32_t deviceId, const Device &device) override;
|
||||
virtual QXmppTask<void> removeDevice(const QString &jid, uint32_t deviceId) override;
|
||||
virtual QXmppTask<void> removeDevices(const QString &jid) override;
|
||||
|
||||
QXmppTask<void> resetAll() override;
|
||||
virtual QXmppTask<void> resetAll() override;
|
||||
|
||||
bool hasOwnDevice();
|
||||
|
||||
void getDevices(const QString& jid, std::list<Shared::KeyInfo>& out) const;
|
||||
|
||||
private:
|
||||
Account* acc;
|
||||
std::optional<OwnDevice> ownDevice;
|
||||
|
@ -326,6 +326,20 @@ QXmppTask<void> TrustHandler::setSecurityPolicy(
|
||||
return Core::makeReadyTask();
|
||||
}
|
||||
|
||||
Core::TrustHandler::Keys Core::TrustHandler::getKeys(const QString& protocol, const QString& jid) const {
|
||||
std::map<QString, KeyCache*>::const_iterator itr = keysByProtocol.find(protocol);
|
||||
if (itr != keysByProtocol.end()) {
|
||||
try {
|
||||
Keys map = itr->second->getRecord(jid);
|
||||
return map;
|
||||
} catch (const DataBase::NotFound& e) {
|
||||
return Keys();
|
||||
}
|
||||
} else {
|
||||
return Keys();
|
||||
}
|
||||
}
|
||||
|
||||
Shared::TrustLevel Core::TrustHandler::convert(Core::TrustHandler::TL level)
|
||||
{
|
||||
switch (level) {
|
||||
|
@ -41,27 +41,29 @@ public:
|
||||
typedef std::map<QByteArray, Shared::TrustLevel> Keys;
|
||||
typedef DataBase::Cache<QString, Keys> KeyCache;
|
||||
|
||||
virtual QXmppTask<void> resetAll(CSR encryption);
|
||||
virtual QXmppTask<TL> trustLevel(CSR encryption, CSR keyOwnerJid, const QByteArray& keyId);
|
||||
virtual QXmppTask<HashSM> setTrustLevel(CSR encryption, CLSR keyOwnerJids, TL oldTrustLevel, TL newTrustLevel);
|
||||
virtual QXmppTask<HashSM> setTrustLevel(CSR encryption, const MultySB& keyIds, TL trustLevel);
|
||||
virtual QXmppTask<bool> hasKey(CSR encryption, CSR keyOwnerJid, QXmpp::TrustLevels trustLevels);
|
||||
virtual QXmppTask<HSHBTL> keys(CSR encryption, CLSR keyOwnerJids, QXmpp::TrustLevels trustLevels);
|
||||
virtual QXmppTask<QHash<TL, MultySB>> keys(CSR encryption, QXmpp::TrustLevels trustLevels);
|
||||
virtual QXmppTask<void> removeKeys(CSR encryption);
|
||||
virtual QXmppTask<void> removeKeys(CSR encryption, CSR keyOwnerJid);
|
||||
virtual QXmppTask<void> removeKeys(CSR encryption, CLBAR keyIds);
|
||||
virtual QXmppTask<void> addKeys(CSR encryption, CSR keyOwnerJid, CLBAR keyIds, TL trustLevel);
|
||||
virtual QXmppTask<QByteArray> ownKey(CSR encryption);
|
||||
virtual QXmppTask<void> resetOwnKey(CSR encryption);
|
||||
virtual QXmppTask<void> setOwnKey(CSR encryption, const QByteArray& keyId);
|
||||
virtual QXmppTask<QXmpp::TrustSecurityPolicy> securityPolicy(CSR encryption);
|
||||
virtual QXmppTask<void> resetSecurityPolicy(CSR encryption);
|
||||
virtual QXmppTask<void> setSecurityPolicy(CSR encryption, QXmpp::TrustSecurityPolicy securityPolicy);
|
||||
virtual QXmppTask<void> resetAll(CSR encryption) override;
|
||||
virtual QXmppTask<TL> trustLevel(CSR encryption, CSR keyOwnerJid, const QByteArray& keyId) override;
|
||||
virtual QXmppTask<HashSM> setTrustLevel(CSR encryption, CLSR keyOwnerJids, TL oldTrustLevel, TL newTrustLevel) override;
|
||||
virtual QXmppTask<HashSM> setTrustLevel(CSR encryption, const MultySB& keyIds, TL trustLevel) override;
|
||||
virtual QXmppTask<bool> hasKey(CSR encryption, CSR keyOwnerJid, QXmpp::TrustLevels trustLevels) override;
|
||||
virtual QXmppTask<HSHBTL> keys(CSR encryption, CLSR keyOwnerJids, QXmpp::TrustLevels trustLevels) override;
|
||||
virtual QXmppTask<QHash<TL, MultySB>> keys(CSR encryption, QXmpp::TrustLevels trustLevels) override;
|
||||
virtual QXmppTask<void> removeKeys(CSR encryption) override;
|
||||
virtual QXmppTask<void> removeKeys(CSR encryption, CSR keyOwnerJid) override;
|
||||
virtual QXmppTask<void> removeKeys(CSR encryption, CLBAR keyIds) override;
|
||||
virtual QXmppTask<void> addKeys(CSR encryption, CSR keyOwnerJid, CLBAR keyIds, TL trustLevel) override;
|
||||
virtual QXmppTask<QByteArray> ownKey(CSR encryption) override;
|
||||
virtual QXmppTask<void> resetOwnKey(CSR encryption) override;
|
||||
virtual QXmppTask<void> setOwnKey(CSR encryption, const QByteArray& keyId) override;
|
||||
virtual QXmppTask<QXmpp::TrustSecurityPolicy> securityPolicy(CSR encryption) override;
|
||||
virtual QXmppTask<void> resetSecurityPolicy(CSR encryption) override;
|
||||
virtual QXmppTask<void> setSecurityPolicy(CSR encryption, QXmpp::TrustSecurityPolicy securityPolicy) override;
|
||||
|
||||
static TL convert(Shared::TrustLevel level);
|
||||
static Shared::TrustLevel convert(TL level);
|
||||
|
||||
Keys getKeys(const QString& protocol, const QString& jid) const;
|
||||
|
||||
private:
|
||||
KeyCache* createNewCache(const QString& encryption);
|
||||
KeyCache* getCache(const QString& encryption);
|
||||
|
@ -17,6 +17,8 @@
|
||||
#include "vcardhandler.h"
|
||||
#include "core/account.h"
|
||||
|
||||
constexpr const char* ns_omemo_2 = "urn:xmpp:omemo:2";
|
||||
|
||||
Core::VCardHandler::VCardHandler(Account* account):
|
||||
QObject(),
|
||||
acc(account),
|
||||
@ -102,6 +104,20 @@ void Core::VCardHandler::onVCardReceived(const QXmppVCardIq& card) {
|
||||
|
||||
Shared::Info info(jid, Shared::EntryType::contact);
|
||||
item->handleResponseVCard(card, resource, info.getVCardRef());
|
||||
#ifdef WITH_OMEMO
|
||||
std::list<Shared::KeyInfo>& aks = info.getActiveKeysRef();
|
||||
acc->oh->getDevices(jid, aks);
|
||||
std::map<QByteArray, Shared::TrustLevel> trustLevels = acc->th->getKeys(ns_omemo_2, jid);
|
||||
|
||||
qDebug() << "OMEMO info for " << jid << " devices:" << aks.size() << ", trustLevels:" << trustLevels.size();
|
||||
for (Shared::KeyInfo& key : aks) {
|
||||
std::map<QByteArray, Shared::TrustLevel>::const_iterator itr = trustLevels.find(key.fingerPrint);
|
||||
if (itr != trustLevels.end()) {
|
||||
key.trustLevel = itr->second;
|
||||
qDebug() << "Found a trust level for a device!";
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
emit acc->infoReady(info);
|
||||
}
|
||||
|
2
external/qxmpp
vendored
2
external/qxmpp
vendored
@ -1 +1 @@
|
||||
Subproject commit d2c2acd4848f815d0dc3d108f8bc306f9015fc89
|
||||
Subproject commit 9d5762499fbddb3dd1ed8eeca16f9db70adc27d0
|
@ -160,7 +160,9 @@ static const TrustLevel TrustLevelHighest = TrustLevel::undecided;
|
||||
static const TrustLevel TrustLevelLowest = TrustLevel::authenticated;
|
||||
|
||||
enum class EncryptionProtocol {
|
||||
omemo
|
||||
omemo,
|
||||
omemo1,
|
||||
omemo2
|
||||
};
|
||||
Q_ENUM_NS(EncryptionProtocol)
|
||||
|
||||
|
@ -43,7 +43,7 @@ Shared::KeyInfo::KeyInfo():
|
||||
label(),
|
||||
lastInteraction(),
|
||||
trustLevel(TrustLevel::undecided),
|
||||
protocol(EncryptionProtocol::omemo),
|
||||
protocol(EncryptionProtocol::omemo2),
|
||||
currentDevice(false)
|
||||
{
|
||||
}
|
||||
|
@ -36,7 +36,7 @@ public:
|
||||
const QString& label,
|
||||
const QDateTime& lastInteraction,
|
||||
TrustLevel trustLevel,
|
||||
EncryptionProtocol protocol = EncryptionProtocol::omemo,
|
||||
EncryptionProtocol protocol = EncryptionProtocol::omemo2,
|
||||
bool currentDevice = false
|
||||
);
|
||||
KeyInfo();
|
||||
|
@ -134,5 +134,11 @@ void Models::Keys::setTrustLevel(int row, Shared::TrustLevel level) {
|
||||
dataChanged(index, index, {Keys::Dirty});
|
||||
}
|
||||
|
||||
void Models::Keys::clear() {
|
||||
beginResetModel();
|
||||
keys.clear();
|
||||
modified.clear();
|
||||
endResetModel();
|
||||
}
|
||||
|
||||
|
||||
|
@ -33,6 +33,7 @@ public:
|
||||
~Keys();
|
||||
|
||||
void addKey(const Shared::KeyInfo& info);
|
||||
void clear();
|
||||
|
||||
QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override;
|
||||
int rowCount(const QModelIndex& parent = QModelIndex()) const override;
|
||||
|
@ -24,6 +24,9 @@ UI::Info::Info(const QString& p_jid, QWidget* parent):
|
||||
m_ui(new Ui::Info()),
|
||||
contactGeneral(nullptr),
|
||||
contactContacts(nullptr),
|
||||
#ifdef WITH_OMEMO
|
||||
omemo(nullptr),
|
||||
#endif
|
||||
description(nullptr),
|
||||
overlay(new QWidget()),
|
||||
progress(new Progress(100)),
|
||||
@ -57,6 +60,9 @@ void UI::Info::setData(const Shared::Info& info) {
|
||||
initializeContactGeneral(jid, card, editable);
|
||||
initializeContactContacts(jid, card, editable);
|
||||
initializeDescription(card.getDescription(), editable);
|
||||
#ifdef WITH_OMEMO
|
||||
initializeOmemo(info.getActiveKeysRef());
|
||||
#endif
|
||||
type = info.getType();
|
||||
}
|
||||
break;
|
||||
@ -170,5 +176,24 @@ void UI::Info::clear() {
|
||||
description->deleteLater();
|
||||
description = nullptr;
|
||||
}
|
||||
|
||||
#ifdef WITH_OMEMO
|
||||
if (omemo != nullptr) {
|
||||
omemo->deleteLater();
|
||||
omemo = nullptr;
|
||||
}
|
||||
#endif
|
||||
|
||||
type = Shared::EntryType::none;
|
||||
}
|
||||
|
||||
#ifdef WITH_OMEMO
|
||||
void UI::Info::initializeOmemo(const std::list<Shared::KeyInfo>& keys) {
|
||||
if (omemo == nullptr) {
|
||||
omemo = new Omemo();
|
||||
m_ui->tabWidget->addTab(omemo, omemo->title());
|
||||
}
|
||||
omemo->setData(keys);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -17,6 +17,8 @@
|
||||
#ifndef UI_WIDGETS_INFO_H
|
||||
#define UI_WIDGETS_INFO_H
|
||||
|
||||
#include <list>
|
||||
|
||||
#include <QWidget>
|
||||
#include <QScopedPointer>
|
||||
#include <QGraphicsOpacityEffect>
|
||||
@ -30,6 +32,10 @@
|
||||
#include "contactgeneral.h"
|
||||
#include "contactcontacts.h"
|
||||
#include "description.h"
|
||||
#ifdef WITH_OMEMO
|
||||
#include "omemo/omemo.h"
|
||||
#endif
|
||||
|
||||
|
||||
namespace UI {
|
||||
namespace Ui
|
||||
@ -58,6 +64,9 @@ private:
|
||||
void initializeContactGeneral(const QString& jid, const Shared::VCard& card, bool editable);
|
||||
void initializeContactContacts(const QString& jid, const Shared::VCard& card, bool editable);
|
||||
void initializeDescription(const QString& description, bool editable);
|
||||
#ifdef WITH_OMEMO
|
||||
void initializeOmemo(const std::list<Shared::KeyInfo>& keys);
|
||||
#endif
|
||||
void initializeOverlay();
|
||||
void initializeButtonBox();
|
||||
void clear();
|
||||
@ -68,6 +77,9 @@ private:
|
||||
QScopedPointer<Ui::Info> m_ui;
|
||||
ContactGeneral* contactGeneral;
|
||||
ContactContacts* contactContacts;
|
||||
#ifdef WITH_OMEMO
|
||||
Omemo* omemo;
|
||||
#endif
|
||||
Description* description;
|
||||
QWidget* overlay;
|
||||
Progress* progress;
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include <random>
|
||||
constexpr uint8_t fingerprintLength = 32;
|
||||
|
||||
Omemo::Omemo(QWidget* parent):
|
||||
UI::Omemo::Omemo(QWidget* parent):
|
||||
QWidget(parent),
|
||||
m_ui(new Ui::Omemo()),
|
||||
keysDelegate(),
|
||||
@ -31,8 +31,6 @@ Omemo::Omemo(QWidget* parent):
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
generateMockData();
|
||||
|
||||
m_ui->keysView->setItemDelegate(&keysDelegate);
|
||||
m_ui->keysView->setModel(&keysModel);
|
||||
m_ui->unusedKeysView->setItemDelegate(&unusedKeysDelegate);
|
||||
@ -42,12 +40,12 @@ Omemo::Omemo(QWidget* parent):
|
||||
connect(m_ui->keysView, &QWidget::customContextMenuRequested, this, &Omemo::onActiveKeysContextMenu);
|
||||
}
|
||||
|
||||
Omemo::~Omemo()
|
||||
UI::Omemo::~Omemo()
|
||||
{
|
||||
contextMenu->deleteLater();
|
||||
}
|
||||
|
||||
void Omemo::generateMockData() {
|
||||
void UI::Omemo::generateMockData() {
|
||||
std::random_device rd;
|
||||
std::uniform_int_distribution<char> dist(CHAR_MIN, CHAR_MAX);
|
||||
for (int i = 0; i < 5; ++i) {
|
||||
@ -67,7 +65,19 @@ void Omemo::generateMockData() {
|
||||
}
|
||||
}
|
||||
|
||||
void Omemo::onActiveKeysContextMenu(const QPoint& pos) {
|
||||
void UI::Omemo::setData(const std::list<Shared::KeyInfo>& keys) {
|
||||
keysModel.clear();
|
||||
unusedKeysModel.clear();
|
||||
for (const Shared::KeyInfo& key : keys) {
|
||||
keysModel.addKey(key);
|
||||
}
|
||||
}
|
||||
|
||||
const QString UI::Omemo::title() const {
|
||||
return m_ui->OMEMOHeading->text();}
|
||||
|
||||
|
||||
void UI::Omemo::onActiveKeysContextMenu(const QPoint& pos) {
|
||||
contextMenu->clear();
|
||||
QModelIndex index = m_ui->keysView->indexAt(pos);
|
||||
if (index.isValid()) {
|
||||
|
@ -17,6 +17,8 @@
|
||||
#ifndef VCARD_OMEMO_H
|
||||
#define VCARD_OMEMO_H
|
||||
|
||||
#include <list>
|
||||
|
||||
#include <QWidget>
|
||||
#include <QScopedPointer>
|
||||
#include <QMenu>
|
||||
@ -24,7 +26,9 @@
|
||||
#include "ui/models/info/omemo/keys.h"
|
||||
#include "keydelegate.h"
|
||||
#include "shared/icons.h"
|
||||
#include "shared/keyinfo.h"
|
||||
|
||||
namespace UI {
|
||||
namespace Ui
|
||||
{
|
||||
class Omemo;
|
||||
@ -36,6 +40,9 @@ public:
|
||||
Omemo(QWidget* parent = nullptr);
|
||||
~Omemo();
|
||||
|
||||
void setData(const std::list<Shared::KeyInfo>& keys);
|
||||
const QString title() const;
|
||||
|
||||
private slots:
|
||||
void onActiveKeysContextMenu(const QPoint& pos);
|
||||
|
||||
@ -50,5 +57,5 @@ private:
|
||||
Models::Keys unusedKeysModel;
|
||||
QMenu* contextMenu;
|
||||
};
|
||||
|
||||
}
|
||||
#endif // VCARD_OMEMO_H
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Omemo</class>
|
||||
<widget class="QWidget" name="Omemo">
|
||||
<class>UI::Omemo</class>
|
||||
<widget class="QWidget" name="UI::Omemo">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
|
Loading…
Reference in New Issue
Block a user