Skip to content

[stable-4.0] [stable-33.0] feat(e2ee): add basic support for e2ee metadata format 2.1 #9611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgallien merged 1 commit into from
Mar 12, 2026
Merged

[stable-4.0] [stable-33.0] feat(e2ee): add basic support for e2ee metadata format 2.1 #9611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/libsync/foldermetadata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,8 @@ void FolderMetadata::setupVersionFromExistingMetadata(const QByteArray &metadata
_existingMetadataVersion = MetadataVersion::Version1_2;
} else if (versionStringFromMetadata == QStringLiteral("2.0") || versionStringFromMetadata == QStringLiteral("2")) {
_existingMetadataVersion = MetadataVersion::Version2_0;
} else if (versionStringFromMetadata == QStringLiteral("2.1")) {
_existingMetadataVersion = MetadataVersion::Version2_1;
} else if (versionStringFromMetadata == QStringLiteral("1.0")
|| versionStringFromMetadata == QStringLiteral("1.1")) {
// We used to have an intermediate 1.1 after applying a security-vulnerability fix for metadata keys.
Expand Down Expand Up @@ -838,6 +840,7 @@ quint64 FolderMetadata::newCounter() const
EncryptionStatusEnums::ItemEncryptionStatus FolderMetadata::fromMedataVersionToItemEncryptionStatus(const MetadataVersion metadataVersion)
{
switch (metadataVersion) {
case FolderMetadata::MetadataVersion::Version2_1:
case FolderMetadata::MetadataVersion::Version2_0:
return SyncFileItem::EncryptionStatus::EncryptedMigratedV2_0;
case FolderMetadata::MetadataVersion::Version1_2:
Expand Down
18 changes: 10 additions & 8 deletions src/libsync/foldermetadata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,6 @@ class OWNCLOUDSYNC_EXPORT FolderMetadata : public QObject
QByteArray encryptedMetadataKey;
};

// based on api-version and "version" key in metadata JSON
enum MetadataVersion {
VersionUndefined = -1,
Version1,
Version1_2,
Version2_0,
};

struct UserWithFileDropEntryAccess {
QString userId;
QByteArray decryptedFiledropKey;
Expand Down Expand Up @@ -90,6 +82,16 @@ class OWNCLOUDSYNC_EXPORT FolderMetadata : public QObject
};
Q_ENUM(CertificateType)

// based on api-version and "version" key in metadata JSON
enum class MetadataVersion {
VersionUndefined = -1,
Version1,
Version1_2,
Version2_0,
Version2_1,
};
Q_ENUM(MetadataVersion)

FolderMetadata(AccountPtr account, const QString &remoteFolderRoot, FolderType folderType = FolderType::Nested);
/*
* construct metadata based on RootEncryptedFolderInfo
Expand Down
Loading