Skip to content

feat: Validate keyChecksum length #859

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
merged 2 commits into from
Jan 9, 2025
Merged

feat: Validate keyChecksum length #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c312090
feat: Validate `keyChecksum` length
artonge Jan 9, 2025
79a87d8
chore(assets): Recompile assets
nextcloud-command Jan 9, 2025
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
2 changes: 1 addition & 1 deletion js/end_to_end_encryption-files.mjs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/end_to_end_encryption-files.mjs.map
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 10 additions & 3 deletions src/services/metadataUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,21 @@ export async function decryptMetadataInfo(metadata: Metadata, metadataPrivateKey
{ iv: base64ToBuffer(iv) },
)

const metadataInfo = JSON.parse(await unzipBuffer(compressedMetadataInfo))
const metadataInfo = JSON.parse(await unzipBuffer(compressedMetadataInfo)) as MetadataInfo

verifyMetadataKey(metadataInfo, metadataPrivateKey)
validateKeyChecksums(metadataInfo, metadata)
validateMetadataKey(metadataInfo, metadataPrivateKey)

return metadataInfo
}

export async function verifyMetadataKey(metadataInfo: MetadataInfo, metadataPrivateKey: CryptoKey): Promise<void> {
function validateKeyChecksums(metadataInfo: MetadataInfo, metadata: Metadata): void {
if (metadataInfo.keyChecksums?.length !== metadata.users?.length) {
throw new Error('Key checksums length does not match users length')
}
}

export async function validateMetadataKey(metadataInfo: MetadataInfo, metadataPrivateKey: CryptoKey): Promise<void> {
if (metadataInfo.keyChecksums === undefined) {
return
}
Expand Down
Loading