mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 23:17:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Generate encrypted metadata on the fly

Browse source 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2017-12-20 22:04:26 +01:00
parent 5e23ca9658
commit 74bc9213c5
No known key found for this signature in database
GPG key ID: F941078878347C0C
2 changed files with 45 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/libsync/clientsideencryption.cpp
View file

@ -1100,23 +1100,23 @@ void ClientSideEncryption::folderEncryptedStatusError(int error)
qDebug() << "Failed to retrieve the status of the folders." << error;
}
FolderMetadata::FolderMetadata(AccountPtr account, const QByteArray& metadata) : _account(account), _metadata(metadata)
FolderMetadata::FolderMetadata(AccountPtr account, const QByteArray& metadata) : _account(account)
{
if (metadata.isEmpty()) {
qCInfo(lcCseMetadata()) << "Setupping Empty Metadata";
setupEmptyMetadata();
} else {
qCInfo(lcCseMetadata()) << "Setting up existing metadata";
setupExistingMetadata();
setupExistingMetadata(metadata);
}
}
void FolderMetadata::setupExistingMetadata()
void FolderMetadata::setupExistingMetadata(const QByteArray& metadata)
{
/* This is the json response from the server, it contains two extra objects that we are *not* interested.
* ocs and data.
*/
QJsonDocument doc = QJsonDocument::fromJson(_metadata);
QJsonDocument doc = QJsonDocument::fromJson(metadata);
qCInfo(lcCseMetadata()) << doc.toJson(QJsonDocument::Compact);
// The metadata is being retrieved as a string stored in a json.
@ -1229,32 +1229,57 @@ QByteArray FolderMetadata::decryptJsonObject(const QByteArray& encryptedMetadata
void FolderMetadata::setupEmptyMetadata() {
qDebug() << "Settint up empty metadata";
QByteArray newMetadataPass = EncryptionHelper::generateRandom(16);
QByteArray encryptedMetadataPass = encryptMetadataKey(newMetadataPass);
QByteArray decryptedMetadataPass = decryptMetadataKey(encryptedMetadataPass);
_metadataKeys.insert(0, newMetadataPass);
QString publicKey = _account->e2e()->_publicKey.toPem().toBase64();
QString displayName = _account->displayName();
QJsonObject recepient = {{
displayName, publicKey
}};
_sharing.append({displayName, publicKey});
}
QByteArray FolderMetadata::encryptedMetadata() {
qDebug() << "Generating metadata";
QJsonObject metadataKeys;
for (auto it = _metadataKeys.constBegin(), end = _metadataKeys.constEnd(); it != end; it++) {
const QByteArray encryptedKey = encryptMetadataKey(it.value());
metadataKeys.insert(QString::number(it.key()), QString(encryptedKey));
}
QJsonObject recepients;
for (auto it = _sharing.constBegin(), end = _sharing.constEnd(); it != end; it++) {
recepients.insert(it->first, it->second);
}
QJsonDocument recepientDoc;
recepientDoc.setObject(recepient);
recepientDoc.setObject(recepients);
QString sharingEncrypted = encryptJsonObject(recepientDoc.toJson(QJsonDocument::Compact), _metadataKeys.last());
QString sharingEncrypted = encryptJsonObject(
recepientDoc.toJson(QJsonDocument::Compact), newMetadataPass);
QJsonObject metadataKeys = {
{"0", QString(encryptedMetadataPass)}
};
QJsonObject metadata = {
{"metadataKeys", metadataKeys},
{"sharing", sharingEncrypted},
{"version", 1}
};
QJsonObject files = {
};
QJsonObject files;
for (auto it = _files.constBegin(), end = _files.constEnd(); it != end; it++) {
QJsonObject encrypted;
encrypted.insert("key", QString(it->encryptionKey.toBase64()));
encrypted.insert("filename", it->originalFilename);
encrypted.insert("mimetype", QString(it->mimetype));
encrypted.insert("version", it->fileVersion);
QJsonDocument encryptedDoc;
encryptedDoc.setObject(encrypted);
QString encryptedEncrypted = encryptJsonObject(encryptedDoc.toJson(QJsonDocument::Compact), _metadataKeys.last());
QJsonObject file;
file.insert("encrypted", encryptedEncrypted);
file.insert("initializationVector", QString(it->initializationVector.toBase64()));
file.insert("authenticationTag", QString(it->authenticationTag.toBase64()));
file.insert("metadataKey", _metadataKeys.lastKey());
files.insert(it->encryptedFilename, file);
}
QJsonObject metaObject = {
{"metadata", metadata},
@ -1263,12 +1288,7 @@ void FolderMetadata::setupEmptyMetadata() {
QJsonDocument internalMetadata;
internalMetadata.setObject(metaObject);
_metadata = internalMetadata.toJson();
qDebug() << "Generated Json" << _metadata;
}
QByteArray FolderMetadata::encryptedMetadata() {
return _metadata;
return internalMetadata.toJson();
}
bool ClientSideEncryption::isFolderEncrypted(const QString& path) {

3
src/libsync/clientsideencryption.h
View file

@ -108,7 +108,7 @@ private:
* to ease the port to Nlohmann Json API
*/
void setupEmptyMetadata();
void setupExistingMetadata();
void setupExistingMetadata(const QByteArray& metadata);
QByteArray encryptMetadataKey(const QByteArray& metadataKey) const;
QByteArray decryptMetadataKey(const QByteArray& encryptedKey) const;
@ -119,7 +119,6 @@ private:
QVector<EncryptedFile> _files;
QMap<int, QByteArray> _metadataKeys;
AccountPtr _account;
QByteArray _metadata;
QVector<QPair<QString, QString>> _sharing;
};