ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #245: Use a more unique nonce for the remote connection

pull/263/head
Jenkins nymea 2020-01-29 21:44:34 +01:00
parent 56b0570231 7d615293c5
commit 1554c568eb
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -416,11 +416,18 @@ void AWSConnector::onPublishReceived(const QString &topic, const QByteArray &pay
storeSyncedNameCache(m_clientName);
}
} else if (topic.startsWith(QString("%1/").arg(m_clientId)) && topic.contains("proxy")) {
QString token = jsonDoc.toVariant().toMap().value("token").toString();
QString timestamp = jsonDoc.toVariant().toMap().value("timestamp").toString();
QString serverUrl = jsonDoc.toVariant().toMap().value("serverUrl").toString();
QVariantMap payload = jsonDoc.toVariant().toMap();
QString token = payload.value("token").toString();
QString nonce;
// Backwards compatibility. Old protocol spec had "timestamp", keeping it for a while for backwards compatiblity
if (payload.contains("nonce")) {
nonce = payload.value("nonce").toString();
} else {
nonce = payload.value("timestamp").toString();
}
QString serverUrl = payload.value("serverUrl").toString();
static QHash<QString, QDateTime> dupes;
QString packetId = topic + token + timestamp;
QString packetId = topic + token + nonce;
if (dupes.contains(packetId)) {
qCDebug(dcAWS()) << "Dropping duplicate packet";
return;
@ -432,7 +439,7 @@ void AWSConnector::onPublishReceived(const QString &topic, const QByteArray &pay
}
}
qCDebug(dcAWS) << "Proxy remote connection request received";
proxyConnectionRequestReceived(token, timestamp, serverUrl);
proxyConnectionRequestReceived(token, nonce, serverUrl);
} 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();