Skip to content

Commit

Permalink
Add SAS Method choice and Add send_to_device API call
Browse files Browse the repository at this point in the history
  • Loading branch information
@Chethan2k1
Chethan2k1 committed Jun 7, 2020
1 parent 7f0fd1a commit e0df0cd
Show file tree
Hide file tree
Showing 4 changed files with 151 additions and 31 deletions.
19 changes: 18 additions & 1 deletion resources/qml/UserProfile.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,25 +107,42 @@ ApplicationWindow{
}
}
Button{
id: verifyButton
text:"Verify"
onClicked: {
var dialog = deviceVerificationDialog.createObject(userProfileDialog,
{flow: deviceVerificationFlow,sender: true});
{flow: deviceVerificationFlow,sender: false});
deviceVerificationFlow.userId = user_data.userId
deviceVerificationFlow.deviceId = model.deviceID
dialog.show();
}
contentItem: Text {
text: verifyButton.text
color: colors.background
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
}
}
}
}

Button{
id: okbutton
text:"OK"
onClicked: userProfileDialog.close()
anchors.margins: {
right:10
bottom:10
}

contentItem: Text {
text: okbutton.text
color: colors.background
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}

Layout.alignment: Qt.AlignRight | Qt.AlignBottom
}
}
Expand Down
16 changes: 16 additions & 0 deletions resources/qml/device-verification/DeviceVerification.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,22 @@ ApplicationWindow {
verticalAlignment: Text.AlignVCenter
}

RowLayout {
RadioButton {
Layout.alignment: Qt.AlignLeft
text: "Decimal"
onClicked: { flow.method = DeviceVerificationFlow.Decimal }
}
Item {
Layout.fillWidth: true
}
RadioButton {
Layout.alignment: Qt.AlignRight
text: "Emoji"
onClicked: { flow.method = DeviceVerificationFlow.Emoji }
}
}

RowLayout {
Button {
Layout.alignment: Qt.AlignLeft
Expand Down
131 changes: 103 additions & 28 deletions src/DeviceVerificationFlow.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#include "DeviceVerificationFlow.h"

#include <MatrixClient.h>
#include "Logging.h"
#include <QDateTime>
#include <QDebug> // only for debugging
#include <QTimer>
#include <iostream> // only for debugging

static constexpr int TIMEOUT = 2 * 60 * 1000; // 2 minutes

Expand All @@ -18,11 +19,42 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *)
timeout->start(TIMEOUT);
}

std::string
DeviceVerificationFlow::generate_txn_id()
QString
DeviceVerificationFlow::getUserId()
{
this->transaction_id = mtx::client::utils::random_token(32, false);
return this->transaction_id;
toClient = mtx::identifiers::parse<mtx::identifiers::User>((this->userId).toStdString());
std::cout << http::client()->device_id() << std::endl;
return this->userId;
}

QString
DeviceVerificationFlow::getDeviceId()
{
return this->deviceId;
}

DeviceVerificationFlow::Method
DeviceVerificationFlow::getMethod()
{
return this->method;
}

void
DeviceVerificationFlow::setUserId(QString userID)
{
this->userId = userID;
}

void
DeviceVerificationFlow::setDeviceId(QString deviceID)
{
this->deviceId = deviceID;
}

void
DeviceVerificationFlow::setMethod(DeviceVerificationFlow::Method method_)
{
this->method = method_;
}

//! accepts a verification
Expand All @@ -34,32 +66,53 @@ DeviceVerificationFlow::acceptVerificationRequest()

req.transaction_id = this->transaction_id;
req.method = mtx::events::msg::VerificationMethods::SASv1;
req.key_agreement_protocol = "";
req.hash = "";
req.key_agreement_protocol = "curve25519";
req.hash = "sha256";
req.message_authentication_code = "";
// req.short_authentication_string = "";
req.commitment = "";

emit verificationRequestAccepted(rand() % 2 ? Emoji : Decimal);
emit this->verificationRequestAccepted(this->method);

// Yet to add send to_device message
body[this->toClient][this->deviceId.toStdString()] = req;

http::client()
->send_to_device<mtx::events::msg::KeyVerificationAccept,
mtx::events::EventType::KeyVerificationAccept>(
"m.key.verification.accept", body, [](mtx::http::RequestErr err) {
if (err)
nhlog::net()->warn("failed to accept verification request: {} {}",
err->matrix_error.error,
static_cast<int>(err->status_code));
// emit this->verificationRequestAccepted(rand() % 2 ? Emoji : Decimal);
});
}
//! starts the verification flow
void
DeviceVerificationFlow::startVerificationRequest()
{
mtx::requests::ToDeviceMessages<mtx::events::msg::KeyVerificationAccept> body;
mtx::events::msg::KeyVerificationAccept req;

// req.from_device = "";
req.transaction_id = this->transaction_id;
req.method = mtx::events::msg::VerificationMethods::SASv1;
req.key_agreement_protocol = {};
// req.hashes = {};
req.message_authentication_code = {};
mtx::requests::ToDeviceMessages<mtx::events::msg::KeyVerificationStart> body;
mtx::events::msg::KeyVerificationStart req;

req.from_device = http::client()->device_id();
req.transaction_id = this->transaction_id;
req.method = mtx::events::msg::VerificationMethods::SASv1;
req.key_agreement_protocols = {};
req.hashes = {};
req.message_authentication_codes = {};
// req.short_authentication_string = "";

// Yet to add send to_device message
body[this->toClient][this->deviceId.toStdString()] = req;

http::client()
->send_to_device<mtx::events::msg::KeyVerificationStart,
mtx::events::EventType::KeyVerificationStart>(
"m.key.verification.start", body, [](mtx::http::RequestErr err) {
if (err)
nhlog::net()->warn("failed to start verification request: {} {}",
err->matrix_error.error,
static_cast<int>(err->status_code));
});
}
//! sends a verification request
void
Expand All @@ -70,13 +123,25 @@ DeviceVerificationFlow::sendVerificationRequest()
mtx::requests::ToDeviceMessages<mtx::events::msg::KeyVerificationRequest> body;
mtx::events::msg::KeyVerificationRequest req;

req.from_device = "";
req.transaction_id = generate_txn_id();
this->transaction_id = http::client()->generate_txn_id();

req.from_device = http::client()->device_id();
req.transaction_id = this->transaction_id;
req.methods.resize(1);
req.methods[0] = mtx::events::msg::VerificationMethods::SASv1;
req.timestamp = (uint64_t)CurrentTime.toTime_t();

// Yet to add send to_device message
body[this->toClient][this->deviceId.toStdString()] = req;

http::client()
->send_to_device<mtx::events::msg::KeyVerificationRequest,
mtx::events::EventType::KeyVerificationRequest>(
"m.key.verification.request", body, [](mtx::http::RequestErr err) {
if (err)
nhlog::net()->warn("failed to send verification request: {} {}",
err->matrix_error.error,
static_cast<int>(err->status_code));
});
}
//! cancels a verification flow
void
Expand All @@ -86,12 +151,22 @@ DeviceVerificationFlow::cancelVerification()
mtx::events::msg::KeyVerificationCancel req;

req.transaction_id = this->transaction_id;
req.reason = "";
req.code = "";

this->deleteLater();

// Yet to add send to_device message
// TODO: Add Proper Error Messages and Code
req.reason = "Device Verification Cancelled";
req.code = "400";

body[this->toClient][deviceId.toStdString()] = req;

http::client()
->send_to_device<mtx::events::msg::KeyVerificationCancel,
mtx::events::EventType::KeyVerificationCancel>(
"m.key.verification.cancel", body, [this](mtx::http::RequestErr err) {
if (err)
nhlog::net()->warn("failed to cancel verification request: {} {}",
err->matrix_error.error,
static_cast<int>(err->status_code));
this->deleteLater();
});
}
//! Completes the verification flow
void
Expand Down
16 changes: 14 additions & 2 deletions src/DeviceVerificationFlow.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

#include <MatrixClient.h>
#include <QObject>

class QTimer;
Expand All @@ -8,6 +9,9 @@ class DeviceVerificationFlow : public QObject
{
Q_OBJECT
// Q_CLASSINFO("RegisterEnumClassesUnscoped", "false")
Q_PROPERTY(QString userId READ getUserId WRITE setUserId)
Q_PROPERTY(QString deviceId READ getDeviceId WRITE setDeviceId)
Q_PROPERTY(Method method READ getMethod WRITE setMethod)

public:
enum Method
Expand All @@ -18,6 +22,12 @@ class DeviceVerificationFlow : public QObject
Q_ENUM(Method)

DeviceVerificationFlow(QObject *parent = nullptr);
QString getUserId();
QString getDeviceId();
Method getMethod();
void setUserId(QString userID);
void setDeviceId(QString deviceID);
void setMethod(Method method_);

public slots:
//! sends a verification request
Expand All @@ -38,9 +48,11 @@ public slots:
void verificationCanceled();

private:
//! generates a unique transaction id
std::string generate_txn_id();
QString userId;
QString deviceId;
Method method;

QTimer *timeout = nullptr;
std::string transaction_id;
mtx::identifiers::User toClient;
};

0 comments on commit e0df0cd

Please sign in to comment.