mirror
/
nheko
mirror of https://github.com/Nheko-Reborn/nheko
2
0
Fork 1
Code Issues Releases Wiki Activity

Shared secret with decimal and emoji works!

Browse Source
pull/270/head
CH Chethan Reddy 4 years ago
parent 41b6ef0c32
commit 67367d0004
6 changed files with 202 additions and 83 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      resources/qml/TimelineView.qml
  2. 26
      resources/qml/device-verification/DeviceVerification.qml
  3. 167
      src/DeviceVerificationFlow.cpp
  4. 10
      src/DeviceVerificationFlow.h
  5. 64
      src/timeline/TimelineViewManager.cpp
  6. 5
      src/timeline/TimelineViewManager.h

13
resources/qml/TimelineView.qml
Unescape View File

@ -103,18 +103,15 @@ Page {
id: deviceVerificationDialog id: deviceVerificationDialog
DeviceVerification {} DeviceVerification {}
} }
Component{
id: deviceVerificationFlow
DeviceVerificationFlow {}
}
Connections { Connections {
target: timelineManager target: timelineManager
onNewDeviceVerificationRequest: { onNewDeviceVerificationRequest: {
var newFlow = deviceVerificationFlow.createObject(timelineRoot, flow.userId = userId;
{userId : userId,sender: false,deviceId : deviceId,tranId:transactionId}); flow.sender = false;
deviceVerificationList.add(newFlow.tranId); flow.deviceId = deviceId;
flow.tranId = transactionId;
var dialog = deviceVerificationDialog.createObject(timelineRoot, var dialog = deviceVerificationDialog.createObject(timelineRoot,
{flow: newFlow,sender: false}); {flow: flow,sender: false});
dialog.show(); dialog.show();
} }
} }

26
resources/qml/device-verification/DeviceVerification.qml
Unescape View File

@ -78,7 +78,7 @@ ApplicationWindow {
onClicked: { onClicked: {
dialog.close(); dialog.close();
flow.cancelVerification(); flow.cancelVerification();
deviceVerificationList.remove(flow.tranId); // deviceVerificationList.remove(flow.tranId);
delete flow; delete flow;
} }
} }
@ -135,7 +135,7 @@ ApplicationWindow {
onClicked: { onClicked: {
dialog.close(); dialog.close();
flow.cancelVerification(); flow.cancelVerification();
deviceVerificationList.remove(flow.tranId); // deviceVerificationList.remove(flow.tranId);
delete flow; delete flow;
} }
} }
@ -179,7 +179,7 @@ ApplicationWindow {
onClicked: { onClicked: {
dialog.close(); dialog.close();
flow.cancelVerification(); flow.cancelVerification();
deviceVerificationList.remove(flow.tranId); // deviceVerificationList.remove(flow.tranId);
delete flow; delete flow;
} }
} }
@ -211,15 +211,15 @@ ApplicationWindow {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Label { Label {
font.pixelSize: Qt.application.font.pixelSize * 2 font.pixelSize: Qt.application.font.pixelSize * 2
text: "1234" text: flow.sasList[0]
} }
Label { Label {
font.pixelSize: Qt.application.font.pixelSize * 2 font.pixelSize: Qt.application.font.pixelSize * 2
text: "1234" text: flow.sasList[1]
} }
Label { Label {
font.pixelSize: Qt.application.font.pixelSize * 2 font.pixelSize: Qt.application.font.pixelSize * 2
text: "1234" text: flow.sasList[2]
} }
} }
@ -230,7 +230,7 @@ ApplicationWindow {
onClicked: { onClicked: {
dialog.close(); dialog.close();
flow.cancelVerification(); flow.cancelVerification();
deviceVerificationList.remove(flow.tranId); // deviceVerificationList.remove(flow.tranId);
delete flow; delete flow;
} }
} }
@ -345,7 +345,7 @@ ApplicationWindow {
ColumnLayout { ColumnLayout {
id: col id: col
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
property var emoji: emojis.mapping[Math.floor(Math.random()*64)] property var emoji: emojis.mapping[flow.sasList[index]]
Label { Label {
//height: font.pixelSize * 2 //height: font.pixelSize * 2
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
@ -369,7 +369,7 @@ ApplicationWindow {
onClicked: { onClicked: {
dialog.close(); dialog.close();
flow.cancelVerification(); flow.cancelVerification();
deviceVerificationList.remove(flow.tranId); // deviceVerificationList.remove(flow.tranId);
delete flow; delete flow;
} }
} }
@ -413,7 +413,7 @@ ApplicationWindow {
onClicked: { onClicked: {
dialog.close(); dialog.close();
flow.cancelVerification(); flow.cancelVerification();
deviceVerificationList.remove(flow.tranId); // deviceVerificationList.remove(flow.tranId);
delete flow; delete flow;
} }
} }
@ -451,7 +451,7 @@ ApplicationWindow {
text: "Close" text: "Close"
onClicked: { onClicked: {
dialog.close() dialog.close()
deviceVerificationList.remove(flow.tranId); // deviceVerificationList.remove(flow.tranId);
delete flow; delete flow;
} }
} }
@ -486,7 +486,7 @@ ApplicationWindow {
text: "Close" text: "Close"
onClicked: { onClicked: {
dialog.close() dialog.close()
deviceVerificationList.remove(flow.tranId); // deviceVerificationList.remove(flow.tranId);
delete flow; delete flow;
} }
} }
@ -521,7 +521,7 @@ ApplicationWindow {
text: "Close" text: "Close"
onClicked: { onClicked: {
dialog.close() dialog.close()
deviceVerificationList.remove(flow.tranId); // deviceVerificationList.remove(flow.tranId);
delete flow; delete flow;
} }
} }

167
src/DeviceVerificationFlow.cpp
Unescape View File

@ -15,32 +15,80 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *)
{ {
timeout = new QTimer(this); timeout = new QTimer(this);
timeout->setSingleShot(true); timeout->setSingleShot(true);
if (this->sender == true) this->sas = olm::client()->sas_init();
this->transaction_id = http::client()->generate_txn_id();
connect(timeout, &QTimer::timeout, this, [this]() { connect(timeout, &QTimer::timeout, this, [this]() {
emit timedout(); emit timedout();
this->deleteLater(); this->deleteLater();
}); });
connect(ChatPage::instance(), connect(ChatPage::instance(),
&ChatPage::recievedDeviceVerificationAccept, &ChatPage::recievedDeviceVerificationStart,
this,
[this](const mtx::events::collections::DeviceEvents &message) {
auto msg =
std::get<mtx::events::DeviceEvent<msgs::KeyVerificationAccept>>(message);
if (msg.content.transaction_id == this->transaction_id) {
std::cout << "Recieved Event Accept" << std::endl;
}
});
connect(ChatPage::instance(),
&ChatPage::recievedDeviceVerificationRequest,
this, this,
[this](const mtx::events::collections::DeviceEvents &message) { [this](const mtx::events::collections::DeviceEvents &message) {
auto msg = auto msg =
std::get<mtx::events::DeviceEvent<msgs::KeyVerificationRequest>>(message); std::get<mtx::events::DeviceEvent<msgs::KeyVerificationStart>>(message);
if (msg.content.transaction_id == this->transaction_id) { if (msg.content.transaction_id == this->transaction_id) {
std::cout << "Recieved Event Request" << std::endl; if (std::find(msg.content.key_agreement_protocols.begin(),
msg.content.key_agreement_protocols.end(),
"curve25519-hkdf-sha256") !=
msg.content.key_agreement_protocols.end() &&
std::find(msg.content.hashes.begin(),
msg.content.hashes.end(),
"sha256") != msg.content.hashes.end() &&
(std::find(msg.content.message_authentication_codes.begin(),
msg.content.message_authentication_codes.end(),
"hmac-sha256") !=
msg.content.message_authentication_codes.end() ||
std::find(msg.content.message_authentication_codes.begin(),
msg.content.message_authentication_codes.end(),
"hkdf-hmac-sha256") !=
msg.content.message_authentication_codes.end()) &&
(std::find(msg.content.short_authentication_string.begin(),
msg.content.short_authentication_string.end(),
mtx::events::msg::SASMethods::Decimal) !=
msg.content.short_authentication_string.end() ||
std::find(msg.content.short_authentication_string.begin(),
msg.content.short_authentication_string.end(),
mtx::events::msg::SASMethods::Emoji) !=
msg.content.short_authentication_string.end())) {
this->sendVerificationKey(); // Not sure about this maybe
// those optional methods
this->canonical_json = nlohmann::json(msg);
} else {
this->cancelVerification();
}
} }
}); });
connect(
ChatPage::instance(),
&ChatPage::recievedDeviceVerificationAccept,
this,
[this](const mtx::events::collections::DeviceEvents &message) {
auto msg =
std::get<mtx::events::DeviceEvent<msgs::KeyVerificationAccept>>(message);
if (msg.content.transaction_id == this->transaction_id) {
if ((msg.content.method ==
mtx::events::msg::VerificationMethods::SASv1) &&
(msg.content.key_agreement_protocol == "curve25519-hkdf-sha256") &&
(msg.content.hash == "sha256") &&
((msg.content.message_authentication_code == "hkdf-hmac-sha256") ||
(msg.content.message_authentication_code == "hmac-sha256"))) {
this->commitment = msg.content.commitment;
if (std::find(msg.content.short_authentication_string.begin(),
msg.content.short_authentication_string.end(),
mtx::events::msg::SASMethods::Emoji) !=
msg.content.short_authentication_string.end()) {
this->method = DeviceVerificationFlow::Method::Emoji;
} else {
this->method = DeviceVerificationFlow::Method::Decimal;
}
this->mac_method = msg.content.message_authentication_code;
this->sendVerificationKey();
} else {
this->cancelVerification();
}
}
});
connect(ChatPage::instance(), connect(ChatPage::instance(),
&ChatPage::recievedDeviceVerificationCancel, &ChatPage::recievedDeviceVerificationCancel,
this, this,
@ -48,19 +96,55 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *)
auto msg = auto msg =
std::get<mtx::events::DeviceEvent<msgs::KeyVerificationCancel>>(message); std::get<mtx::events::DeviceEvent<msgs::KeyVerificationCancel>>(message);
if (msg.content.transaction_id == this->transaction_id) { if (msg.content.transaction_id == this->transaction_id) {
std::cout << "Recieved Event Cancel" << std::endl; emit verificationCanceled();
}
});
connect(ChatPage::instance(),
&ChatPage::recievedDeviceVerificationKey,
this,
[this](const mtx::events::collections::DeviceEvents &message) {
auto msg =
std::get<mtx::events::DeviceEvent<msgs::KeyVerificationKey>>(message);
if (msg.content.transaction_id == this->transaction_id) {
std::cout << "Recieved Event Key" << std::endl;
} }
}); });
connect(
ChatPage::instance(),
&ChatPage::recievedDeviceVerificationKey,
this,
[this](const mtx::events::collections::DeviceEvents &message) {
auto msg = std::get<mtx::events::DeviceEvent<msgs::KeyVerificationKey>>(message);
if (msg.content.transaction_id == this->transaction_id) {
this->sas->set_their_key(msg.content.key);
std::string info;
if (this->sender == true) {
info = "MATRIX_KEY_VERIFICATION_SAS|" +
http::client()->user_id().to_string() + "|" +
http::client()->device_id() + "|" +
this->sas->public_key() + "|" +
this->toClient.to_string() + "|" +
this->deviceId.toStdString() + "|" + msg.content.key +
"|" + this->transaction_id;
} else {
info = "MATRIX_KEY_VERIFICATION_SAS|" +
this->toClient.to_string() + "|" +
this->deviceId.toStdString() + "|" + msg.content.key +
"|" + http::client()->user_id().to_string() + "|" +
http::client()->device_id() + "|" +
this->sas->public_key() + "|" + this->transaction_id;
}
if (this->method == DeviceVerificationFlow::Method::Emoji) {
this->sasList = this->sas->generate_bytes_emoji(info);
} else if (this->method == DeviceVerificationFlow::Method::Decimal) {
this->sasList = this->sas->generate_bytes_decimal(info);
}
if (this->sender == false) {
emit this->verificationRequestAccepted(this->method);
this->sendVerificationKey();
} else {
if (this->commitment ==
mtx::crypto::bin2base64_unpadded(mtx::crypto::sha256(
msg.content.key +
this->canonical_json["content"].dump()))) {
emit this->verificationRequestAccepted(this->method);
} else {
this->cancelVerification();
}
}
}
});
connect(ChatPage::instance(), connect(ChatPage::instance(),
&ChatPage::recievedDeviceVerificationMac, &ChatPage::recievedDeviceVerificationMac,
this, this,
@ -104,6 +188,12 @@ DeviceVerificationFlow::getSender()
return this->sender; return this->sender;
} }
std::vector<int>
DeviceVerificationFlow::getSasList()
{
return this->sasList;
}
void void
DeviceVerificationFlow::setTransactionId(QString transaction_id_) DeviceVerificationFlow::setTransactionId(QString transaction_id_)
{ {
@ -133,6 +223,8 @@ void
DeviceVerificationFlow::setSender(bool sender_) DeviceVerificationFlow::setSender(bool sender_)
{ {
this->sender = sender_; this->sender = sender_;
if (this->sender == true)
this->transaction_id = http::client()->generate_txn_id();
} }
//! accepts a verification //! accepts a verification
@ -147,23 +239,26 @@ DeviceVerificationFlow::acceptVerificationRequest()
req.key_agreement_protocol = "curve25519-hkdf-sha256"; req.key_agreement_protocol = "curve25519-hkdf-sha256";
req.hash = "sha256"; req.hash = "sha256";
req.message_authentication_code = "hkdf-hmac-sha256"; req.message_authentication_code = "hkdf-hmac-sha256";
req.short_authentication_string = {mtx::events::msg::SASMethods::Decimal, if (this->method == DeviceVerificationFlow::Method::Emoji)
mtx::events::msg::SASMethods::Emoji}; req.short_authentication_string = {mtx::events::msg::SASMethods::Emoji};
req.commitment = ""; else if (this->method == DeviceVerificationFlow::Method::Decimal)
req.short_authentication_string = {mtx::events::msg::SASMethods::Decimal};
emit this->verificationRequestAccepted(this->method); req.commitment = mtx::crypto::bin2base64_unpadded(
mtx::crypto::sha256(this->sas->public_key() + this->canonical_json.dump()));
body[this->toClient][this->deviceId.toStdString()] = req; body[this->toClient][this->deviceId.toStdString()] = req;
std::cout << "Accepting the Verification" << std::endl;
std::cout << json(body) << std::endl;
http::client() http::client()
->send_to_device<mtx::events::msg::KeyVerificationAccept, ->send_to_device<mtx::events::msg::KeyVerificationAccept,
mtx::events::EventType::KeyVerificationAccept>( mtx::events::EventType::KeyVerificationAccept>(
this->transaction_id, body, [this](mtx::http::RequestErr err) { this->transaction_id, body, [](mtx::http::RequestErr err) {
if (err) if (err)
nhlog::net()->warn("failed to accept verification request: {} {}", nhlog::net()->warn("failed to accept verification request: {} {}",
err->matrix_error.error, err->matrix_error.error,
static_cast<int>(err->status_code)); static_cast<int>(err->status_code));
emit this->verificationRequestAccepted(rand() % 2 ? Emoji : Decimal);
}); });
} }
//! starts the verification flow //! starts the verification flow
@ -183,6 +278,7 @@ DeviceVerificationFlow::startVerificationRequest()
mtx::events::msg::SASMethods::Emoji}; mtx::events::msg::SASMethods::Emoji};
body[this->toClient][this->deviceId.toStdString()] = req; body[this->toClient][this->deviceId.toStdString()] = req;
this->canonical_json = nlohmann::json(req);
http::client() http::client()
->send_to_device<mtx::events::msg::KeyVerificationStart, ->send_to_device<mtx::events::msg::KeyVerificationStart,
@ -192,7 +288,6 @@ DeviceVerificationFlow::startVerificationRequest()
nhlog::net()->warn("failed to start verification request: {} {}", nhlog::net()->warn("failed to start verification request: {} {}",
err->matrix_error.error, err->matrix_error.error,
static_cast<int>(err->status_code)); static_cast<int>(err->status_code));
std::cout << nlohmann::json(body).dump(2) << std::endl;
}); });
} }
//! sends a verification request //! sends a verification request
@ -236,6 +331,8 @@ DeviceVerificationFlow::cancelVerification()
body[this->toClient][deviceId.toStdString()] = req; body[this->toClient][deviceId.toStdString()] = req;
emit this->verificationCanceled();
http::client() http::client()
->send_to_device<mtx::events::msg::KeyVerificationCancel, ->send_to_device<mtx::events::msg::KeyVerificationCancel,
mtx::events::EventType::KeyVerificationCancel>( mtx::events::EventType::KeyVerificationCancel>(
@ -254,7 +351,7 @@ DeviceVerificationFlow::sendVerificationKey()
mtx::requests::ToDeviceMessages<mtx::events::msg::KeyVerificationKey> body; mtx::requests::ToDeviceMessages<mtx::events::msg::KeyVerificationKey> body;
mtx::events::msg::KeyVerificationKey req; mtx::events::msg::KeyVerificationKey req;
req.key = ""; req.key = this->sas->public_key();
req.transaction_id = this->transaction_id; req.transaction_id = this->transaction_id;
body[this->toClient][deviceId.toStdString()] = req; body[this->toClient][deviceId.toStdString()] = req;

10
src/DeviceVerificationFlow.h
Unescape View File

@ -7,6 +7,8 @@
class QTimer; class QTimer;
using sas_ptr = std::unique_ptr<mtx::crypto::SAS>;
class DeviceVerificationFlow : public QObject class DeviceVerificationFlow : public QObject
{ {
Q_OBJECT Q_OBJECT
@ -16,6 +18,7 @@ class DeviceVerificationFlow : public QObject
Q_PROPERTY(QString userId READ getUserId WRITE setUserId) Q_PROPERTY(QString userId READ getUserId WRITE setUserId)
Q_PROPERTY(QString deviceId READ getDeviceId WRITE setDeviceId) Q_PROPERTY(QString deviceId READ getDeviceId WRITE setDeviceId)
Q_PROPERTY(Method method READ getMethod WRITE setMethod) Q_PROPERTY(Method method READ getMethod WRITE setMethod)
Q_PROPERTY(std::vector<int> sasList READ getSasList)
public: public:
enum Method enum Method
@ -30,6 +33,7 @@ public:
QString getUserId(); QString getUserId();
QString getDeviceId(); QString getDeviceId();
Method getMethod(); Method getMethod();
std::vector<int> getSasList();
void setTransactionId(QString transaction_id_); void setTransactionId(QString transaction_id_);
bool getSender(); bool getSender();
void setUserId(QString userID); void setUserId(QString userID);
@ -37,6 +41,8 @@ public:
void setMethod(Method method_); void setMethod(Method method_);
void setSender(bool sender_); void setSender(bool sender_);
nlohmann::json canonical_json;
public slots: public slots:
//! sends a verification request //! sends a verification request
void sendVerificationRequest(); void sendVerificationRequest();
@ -66,6 +72,10 @@ private:
bool sender; bool sender;
QTimer *timeout = nullptr; QTimer *timeout = nullptr;
sas_ptr sas;
std::string mac_method;
std::string transaction_id; std::string transaction_id;
std::string commitment;
mtx::identifiers::User toClient; mtx::identifiers::User toClient;
std::vector<int> sasList;
}; };

64
src/timeline/TimelineViewManager.cpp
Unescape View File

@ -170,32 +170,44 @@ TimelineViewManager::TimelineViewManager(QSharedPointer<UserSettings> userSettin
&ChatPage::decryptSidebarChanged, &ChatPage::decryptSidebarChanged,
this, this,
&TimelineViewManager::updateEncryptedDescriptions); &TimelineViewManager::updateEncryptedDescriptions);
connect(dynamic_cast<ChatPage *>(parent), connect(
&ChatPage::recievedDeviceVerificationRequest, dynamic_cast<ChatPage *>(parent),
this, &ChatPage::recievedDeviceVerificationRequest,
[this](const mtx::events::collections::DeviceEvents &message) { this,
auto msg = [this](const mtx::events::collections::DeviceEvents &message) {
std::get<mtx::events::DeviceEvent<msgs::KeyVerificationRequest>>(message); auto msg =
QString tranID = QString::fromStdString(msg.content.transaction_id); std::get<mtx::events::DeviceEvent<msgs::KeyVerificationRequest>>(message);
QString deviceId = QString::fromStdString(msg.content.from_device); auto flow = new DeviceVerificationFlow(this);
QString userId = QString::fromStdString(msg.sender); if (!(this->dvList->exist(QString::fromStdString(msg.content.transaction_id)))) {
if (!(this->dvList->exist(tranID))) { if (std::find(msg.content.methods.begin(),
emit newDeviceVerificationRequest(tranID, userId, deviceId); msg.content.methods.end(),
} mtx::events::msg::VerificationMethods::SASv1) !=
}); msg.content.methods.end()) {
connect(dynamic_cast<ChatPage *>(parent), emit newDeviceVerificationRequest(
&ChatPage::recievedDeviceVerificationStart, std::move(flow),
this, QString::fromStdString(msg.content.transaction_id),
[this](const mtx::events::collections::DeviceEvents &message) { QString::fromStdString(msg.sender),
auto msg = QString::fromStdString(msg.content.from_device));
std::get<mtx::events::DeviceEvent<msgs::KeyVerificationStart>>(message); }
QString tranID = QString::fromStdString(msg.content.transaction_id); }
QString deviceId = QString::fromStdString(msg.content.from_device); });
QString userId = QString::fromStdString(msg.sender); connect(
if (!(this->dvList->exist(tranID))) { dynamic_cast<ChatPage *>(parent),
emit newDeviceVerificationRequest(tranID, userId, deviceId); &ChatPage::recievedDeviceVerificationStart,
} this,
}); [this](const mtx::events::collections::DeviceEvents &message) {
auto msg =
std::get<mtx::events::DeviceEvent<msgs::KeyVerificationStart>>(message);
auto flow = new DeviceVerificationFlow(this);
flow->canonical_json = nlohmann::json(msg.content);
if (!(this->dvList->exist(QString::fromStdString(msg.content.transaction_id)))) {
emit newDeviceVerificationRequest(
std::move(flow),
QString::fromStdString(msg.content.transaction_id),
QString::fromStdString(msg.sender),
QString::fromStdString(msg.content.from_device));
}
});
} }
void void

5
src/timeline/TimelineViewManager.h
Unescape View File

@ -67,7 +67,10 @@ signals:
void initialSyncChanged(bool isInitialSync); void initialSyncChanged(bool isInitialSync);
void replyingEventChanged(QString replyingEvent); void replyingEventChanged(QString replyingEvent);
void replyClosed(); void replyClosed();
void newDeviceVerificationRequest(QString transactionId, QString userId, QString deviceId); void newDeviceVerificationRequest(DeviceVerificationFlow *flow,
QString transactionId,
QString userId,
QString deviceId);
public slots: public slots:
void updateReadReceipts(const QString &room_id, const std::vector<QString> &event_ids); void updateReadReceipts(const QString &room_id, const std::vector<QString> &event_ids);

Write Preview
Loading…
Cancel
Save