imlemented tiny aes enc

Author: Skycoder42

src/3rdparty/qpm.json

@@ -2,7 +2,7 @@
   "name": "",
   "description": "",
   "dependencies": [
-    "[email protected].1",
+    "[email protected].3",
     "[email protected]"
   ],
   "license": "NONE",

src/datasync/encryptor.h

@@ -21,6 +21,11 @@ class Encryptor : public QObject
 	//! Called from the engine to finalize the encryptor
 	virtual void finalize();
 
+	//! Returns the current encryption key
+	virtual QByteArray key() const = 0;
+	//! Sets the encryption key
+	virtual void setKey(const QByteArray &key) = 0;
+
 	//! Encrypts the given dataset
 	virtual QJsonValue encrypt(const ObjectKey &key, const QJsonObject &object, const QByteArray &keyProperty) const = 0;
 	//! Encrypts the given dataset

src/datasync/qtinyaesencryptor.cpp

@@ -1,31 +1,107 @@
 #include "qtinyaesencryptor_p.h"
 
 #include <QtCore/QJsonDocument>
+#include <QtCore/qcryptographichash.h>
 
 #include <qtinyaes.h>
 using namespace QtDataSync;
 
 QTinyAesEncryptor::QTinyAesEncryptor(QObject *parent) :
 	Encryptor(parent),
-	key()
+	_defaults(nullptr),
+	_key()
 {}
 
 void QTinyAesEncryptor::initialize(Defaults *defaults)
 {
-	key = defaults->property("encryptKey").toByteArray();
-	if(key.isNull()) {
-		for(auto i = 0; i < QTinyAes::KEYSIZES.first(); i++)
-			key += (char)qrand();
+	_defaults = defaults;
+	_key = _defaults->settings()->value(QStringLiteral("encryption/key")).toByteArray();
+	if(_key.isNull()) {
+		for(quint32 i = 0; i < QTinyAes::KEYSIZE; i++)
+			_key += (char)qrand();
+		_defaults->settings()->setValue(QStringLiteral("encryption/key"), _key);
 	}
 }
 
+QByteArray QTinyAesEncryptor::key() const
+{
+	return _key;
+}
+
+void QTinyAesEncryptor::setKey(const QByteArray &key)
+{
+	if((quint32)_key.size() != QTinyAes::KEYSIZE)
+		throw InvalidKeyException();
+	_key = key;
+	_defaults->settings()->setValue(QStringLiteral("encryption/key"), _key);
+}
+
 QJsonValue QTinyAesEncryptor::encrypt(const ObjectKey &key, const QJsonObject &object, const QByteArray &keyProperty) const
 {
+	QByteArray salt;
+	for(quint32 i = 0; i < 28; i++)//224 bits
+		salt += (char)qrand();
+	auto iv = QCryptographicHash::hash(salt + key.first + key.second.toUtf8() + keyProperty, QCryptographicHash::Sha3_224);
+	iv.resize(QTinyAes::BLOCKSIZE);
+
 	auto data = QJsonDocument(object).toBinaryData();
-	auto iv = "";
+	auto cipher = QTinyAes::cbcEncrypt( _key, iv, data);
+
+	QJsonObject result;
+	result[QStringLiteral("salt")] = QString::fromUtf8(salt.toBase64());
+	result[QStringLiteral("data")] = QString::fromUtf8(cipher.toBase64());
+	return result;
 }
 
 QJsonObject QTinyAesEncryptor::decrypt(const ObjectKey &key, const QJsonValue &data, const QByteArray &keyProperty) const
 {
+	auto obj = data.toObject();
+	auto salt = QByteArray::fromBase64(obj[QStringLiteral("salt")].toString().toUtf8());
+	if(salt.size() != 28)//224 bits
+		throw DecryptionFailedException();
+	auto iv = QCryptographicHash::hash(salt + key.first + key.second.toUtf8() + keyProperty, QCryptographicHash::Sha3_224);
+	iv.resize(QTinyAes::BLOCKSIZE);
 
+	auto cipher = QByteArray::fromBase64(obj[QStringLiteral("data")].toString().toUtf8());
+	if(cipher.size() % QTinyAes::KEYSIZE != 0)
+		throw DecryptionFailedException();
+
+	auto plain = QTinyAes::cbcDecrypt(_key, iv, cipher);
+	auto json = QJsonDocument::fromBinaryData(plain);
+	if(json.isObject())
+		return json.object();
+	else
+		throw DecryptionFailedException();
+}
+
+
+
+const char *InvalidKeyException::what() const noexcept
+{
+	return "The given key does not have the valid length of 128 bit!";
+}
+
+void InvalidKeyException::raise() const
+{
+	throw *this;
+}
+
+QException *InvalidKeyException::clone() const
+{
+	return new InvalidKeyException();
+}
+
+const char *DecryptionFailedException::what() const noexcept
+{
+	return "Failed to decrypt data returned from server. Maybe it's not encrypted?";
+}
+
+void DecryptionFailedException::raise() const
+{
+	throw *this;
+}
+
+QException *DecryptionFailedException::clone() const
+{
+	return new DecryptionFailedException();
 }

src/datasync/qtinyaesencryptor_p.h

@@ -4,8 +4,26 @@
 #include "qtdatasync_global.h"
 #include "encryptor.h"
 
+#include <QtCore/QException>
+
 namespace QtDataSync {
 
+class Q_DATASYNC_EXPORT InvalidKeyException : public QException
+{
+public:
+	const char *what() const noexcept override;
+	void raise() const override;
+	QException *clone() const override;
+};
+
+class Q_DATASYNC_EXPORT DecryptionFailedException : public QException
+{
+public:
+	const char *what() const noexcept override;
+	void raise() const override;
+	QException *clone() const override;
+};
+
 class Q_DATASYNC_EXPORT QTinyAesEncryptor : public Encryptor
 {
 	Q_OBJECT
@@ -15,11 +33,15 @@ class Q_DATASYNC_EXPORT QTinyAesEncryptor : public Encryptor
 
 	void initialize(Defaults *defaults) override;
 
+	QByteArray key() const override;
+	void setKey(const QByteArray &key) override;
+
 	QJsonValue encrypt(const ObjectKey &key, const QJsonObject &object, const QByteArray &keyProperty) const override;
 	QJsonObject decrypt(const ObjectKey &key, const QJsonValue &data, const QByteArray &keyProperty) const override;
 
 private:
-	QByteArray key;
+	Defaults *_defaults;
+	QByteArray _key;
 };
 
 }

src/datasync/remoteconnector.cpp

@@ -24,15 +24,9 @@ RemoteConnector::~RemoteConnector() {}
 
 void RemoteConnector::initialize(Defaults *defaults, Encryptor *)
 {
-	QT_WARNING_PUSH
-	QT_WARNING_DISABLE_DEPRECATED
-	initialize(defaults);
-	QT_WARNING_POP
 	d->defaults = defaults;
 }
 
-void RemoteConnector::initialize(Defaults *) {}
-
 void RemoteConnector::finalize() {}
 
 void RemoteConnector::resetUserId(QFutureInterface<QVariant> futureInterface, const QVariant &extraData, bool resetLocalStore)

src/datasync/remoteconnector.h

@@ -37,8 +37,6 @@ class Q_DATASYNC_EXPORT RemoteConnector : public QObject
 
 	//! Called from the engine to initialize the connector
 	virtual void initialize(Defaults *defaults, Encryptor *cryptor);
-	//! Called from the engine to initialize the connector
-	Q_DECL_DEPRECATED virtual void initialize(Defaults *defaults);
 	//! Called from the engine to finalize the connector
 	virtual void finalize();
 

tests/auto/datasync/WsRemoteConnectorTest/tst_wsremoteconnector.cpp

@@ -271,7 +271,6 @@ void WsRemoteConnectorTest::testSecondDevice()
 	QVERIFY(auth->isConnected());
 	for(auto i = 0; i < 10 && syncSpy.count() < 4; i++)
 		syncSpy.wait(500);
-	qDebug() << syncSpy;
 	QCOMPARE(syncSpy.count(), 4);
 	QCOMPARE(syncSpy[0][0], QVariant::fromValue(SyncController::Disconnected));
 	QCOMPARE(syncSpy[1][0], QVariant::fromValue(SyncController::Loading));