Skip to content

Commit 33662af

Browse files
committed
fix(encryption): adjust log output to help to debug
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
1 parent dcf4513 commit 33662af

3 files changed

Lines changed: 14 additions & 0 deletions

File tree

src/libsync/clientsideencryptionjobs.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,9 @@ bool LockEncryptFolderApiJob::finished()
369369
const auto obj = json.object().toVariantMap();
370370
const auto token = obj["ocs"].toMap()["data"].toMap()["e2e-token"].toByteArray();
371371

372+
#if defined NEXTCLOUD_DEV && NEXTCLOUD_DEV && defined QT_DEBUG
372373
qCDebug(lcCseJob()) << "lock folder finished with code" << retCode << " for:" << path() << " for fileId: " << _fileId << " token:" << token;
374+
#endif
373375

374376
if (!_account->e2e()->getPublicKey().isNull()) {
375377
const auto folderTokenEncrypted = EncryptionHelper::encryptStringAsymmetric(_account->e2e()->getCertificateInformation(), _account->e2e()->paddingMode(), *_account->e2e(), token);

src/libsync/encryptedfoldermetadatahandler.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,9 @@ void EncryptedFolderMetadataHandler::slotFolderEncryptedIdError(QNetworkReply *r
164164

165165
void EncryptedFolderMetadataHandler::slotMetadataReceived(const QJsonDocument &json, int statusCode)
166166
{
167+
#if defined NEXTCLOUD_DEV && NEXTCLOUD_DEV && defined QT_DEBUG
167168
qCDebug(lcFetchAndUploadE2eeFolderMetadataJob) << "Metadata Received, parsing it and decrypting" << json.toVariant();
169+
#endif
168170

169171
const auto job = qobject_cast<GetMetadataApiJob *>(sender());
170172
Q_ASSERT(job);

src/libsync/foldermetadata.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,9 @@ void FolderMetadata::initMetadata()
184184
void FolderMetadata::setupExistingMetadata(const QByteArray &metadata)
185185
{
186186
const auto doc = QJsonDocument::fromJson(metadata);
187+
#if defined NEXTCLOUD_DEV && NEXTCLOUD_DEV && defined QT_DEBUG
187188
qCDebug(lcCseMetadata()) << "Got existing metadata:" << doc.toJson(QJsonDocument::Compact);
189+
#endif
188190

189191
if (_existingMetadataVersion < MetadataVersion::Version1) {
190192
qCWarning(lcCseMetadata()) << "Could not setup metadata. Incorrect version" << _existingMetadataVersion;
@@ -220,9 +222,11 @@ void FolderMetadata::setupExistingMetadata(const QByteArray &metadata)
220222
}
221223

222224
if (_isRootEncryptedFolder) {
225+
#if defined NEXTCLOUD_DEV && NEXTCLOUD_DEV && defined QT_DEBUG
223226
QJsonDocument debugHelper;
224227
debugHelper.setArray(folderUsers);
225228
qCDebug(lcCseMetadata()) << "users: " << debugHelper.toJson(QJsonDocument::Compact);
229+
#endif
226230
}
227231

228232
for (auto it = folderUsers.constBegin(); it != folderUsers.constEnd(); ++it) {
@@ -777,6 +781,9 @@ QByteArray FolderMetadata::encryptedMetadata()
777781
qCWarning(lcCseMetadata) << "Metadata generation failed for file" << it->encryptedFilename;
778782
return {};
779783
}
784+
#if defined NEXTCLOUD_DEV && NEXTCLOUD_DEV && defined QT_DEBUG
785+
qCDebug(lcCseMetadata()) << file;
786+
#endif
780787
const auto isDirectory =
781788
it->mimetype.isEmpty() || it->mimetype == QByteArrayLiteral("inode/directory") || it->mimetype == QByteArrayLiteral("httpd/unix-directory");
782789
if (isDirectory) {
@@ -794,6 +801,9 @@ QByteArray FolderMetadata::encryptedMetadata()
794801
}
795802

796803
QJsonObject cipherText = {{counterKey, QJsonValue::fromVariant(newCounter())}, {filesKey, files}, {foldersKey, folders}};
804+
#if defined NEXTCLOUD_DEV && NEXTCLOUD_DEV && defined QT_DEBUG
805+
qCDebug(lcCseMetadata()) << cipherText;
806+
#endif
797807

798808
const auto isChecksumsArrayValid = (!_isRootEncryptedFolder && keyChecksums.isEmpty()) || (_isRootEncryptedFolder && !keyChecksums.isEmpty());
799809
Q_ASSERT(isChecksumsArrayValid);

0 commit comments

Comments
 (0)