ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to use nonce

Browse Source
This commit is contained in:
Michael Zanetti 2018-09-01 01:20:30 +02:00
parent 3816ade6b7
commit 699065f689
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnymea-core/cloud/awsconnector.cpp
View File

@ -468,9 +468,9 @@ void AWSConnector::onSubscriptionReceived(const QMQTT::Message &message)
// silently drop our own things (should not be subscribed to that in the first place)
} else if (topic.startsWith(QString("%1/eu-west-1:").arg(m_clientId)) && topic.contains("proxy")) {
QString token = jsonDoc.toVariant().toMap().value("token").toString();
qlonglong timestamp = jsonDoc.toVariant().toMap().value("timestamp").toLongLong();
QString timestamp = jsonDoc.toVariant().toMap().value("timestamp").toString();
static QHash<QString, QDateTime> dupes;
QString packetId = topic + token + QString::number(timestamp);
QString packetId = topic + token + timestamp;
if (dupes.contains(packetId)) {
qCDebug(dcAWS()) << "Dropping duplicate packet";
return;
@ -482,7 +482,7 @@ void AWSConnector::onSubscriptionReceived(const QMQTT::Message &message)
}
}
qCDebug(dcAWS) << "Proxy remote connection request received";
proxyConnectionRequestReceived(token);
proxyConnectionRequestReceived(token, timestamp);
} else if (topic == QString("%1/notify/response").arg(m_clientId)) {
int transactionId = jsonDoc.toVariant().toMap().value("id").toInt();
int status = jsonDoc.toVariant().toMap().value("status").toInt();

2
libnymea-core/cloud/awsconnector.h
View File

@ -64,7 +64,7 @@ signals:
void pushNotificationSent(int id, int status);
void turnCredentialsReceived(const QVariantMap &turnCredentials);
void proxyConnectionRequestReceived(const QString &token);
void proxyConnectionRequestReceived(const QString &token, const QString &nonce);
private slots:
void doConnect();

5
libnymea-core/cloud/cloudtransport.cpp
View File

@ -65,13 +65,14 @@ bool CloudTransport::stopServer()
return true;
}
void CloudTransport::connectToCloud(const QString &token)
void CloudTransport::connectToCloud(const QString &token, const QString &nonce)
{
qCDebug(dcCloud()) << "Connecting to remote proxy server" << m_proxyUrl.toString();
ConnectionContext context;
context.clientId = QUuid::createUuid();
context.token = token;
context.nonce = nonce;
QString identifier = QString("nymea:core (%1)").arg(NymeaCore::instance()->configuration()->serverName());
context.proxyConnection = new RemoteProxyConnection(NymeaCore::instance()->configuration()->serverUuid().toString(), identifier, this);
m_connections.insert(context.proxyConnection, context);
@ -110,7 +111,7 @@ void CloudTransport::transportReady()
proxyConnection->proxyServerVersion() << "API version:" << proxyConnection->proxyServerApiVersion();
ConnectionContext context = m_connections.value(proxyConnection);
context.proxyConnection->authenticate(context.token);
context.proxyConnection->authenticate(context.token, context.nonce);
}
void CloudTransport::transportDataReady(const QByteArray &data)

3
libnymea-core/cloud/cloudtransport.h
View File

@ -42,7 +42,7 @@ public:
signals:
public slots:
void connectToCloud(const QString &token);
void connectToCloud(const QString &token, const QString &nonce);
void remoteConnectionStateChanged(remoteproxyclient::RemoteProxyConnection::State state);
private slots:
@ -56,6 +56,7 @@ private:
public:
QUuid clientId;
QString token;
QString nonce;
remoteproxyclient::RemoteProxyConnection* proxyConnection;
};
QHash<remoteproxyclient::RemoteProxyConnection*, ConnectionContext> m_connections;