Merge pull request #854 from nextcloud/artonge/chore/cleanups

chore: E2EE in browser cleanups

Author: artonge

js/end_to_end_encryption-files.mjs

@@ -50,7 +50,7 @@ const buttons = computed(() => [
 			{{ t('end_to_end_encryption', 'The server could serve malicious source code to extract the secret that protects your files.') }}
 
 			<NcCheckboxRadioSwitch v-model="confirmToggle"
-				required="true"
+				:required="true"
 				data-cy-e2ee-mnemonic-prompt="i_understand_the_risks"
 				type="switch">
 				{{ t('end_to_end_encryption', 'I understand the risks') }}

js/end_to_end_encryption-files.mjs.map

@@ -11,11 +11,6 @@ import { decryptWithAES, decryptWithRSA, exportAESKey, loadAESPrivateKey, sha256
 
 /* eslint-disable jsdoc/require-jsdoc */
 
-export async function getMetadataInfo(fileId: string, metadataPrivateKey: CryptoKey): Promise<MetadataInfo> {
-	logger.debug('Getting metadata info', { fileId })
-	return await decryptMetadataInfo(await getMetadata(fileId), metadataPrivateKey)
-}
-
 export async function decryptMetadataInfo(metadata: Metadata, metadataPrivateKey: CryptoKey): Promise<MetadataInfo> {
 	logger.debug('Decrypting metadata info', { metadata })
 
@@ -29,12 +24,12 @@ export async function decryptMetadataInfo(metadata: Metadata, metadataPrivateKey
 
 	const metadataInfo = JSON.parse(await unzipBuffer(compressedMetadataInfo))
 
-	verifyMetadataInfo(metadataInfo, metadataPrivateKey)
+	verifyMetadataKey(metadataInfo, metadataPrivateKey)
 
 	return metadataInfo
 }
 
-export async function verifyMetadataInfo(metadataInfo: MetadataInfo, metadataPrivateKey: CryptoKey): Promise<void> {
+export async function verifyMetadataKey(metadataInfo: MetadataInfo, metadataPrivateKey: CryptoKey): Promise<void> {
 	if (metadataInfo.keyChecksums === undefined) {
 		return
 	}

src/components/MnemonicPromptDialog.vue

@@ -8,10 +8,7 @@
 import logger from './logger.ts'
 import type { PrivateKeyInfo } from '../models.ts'
 import { decryptWithAES, loadRSAPrivateKey } from './crypto.ts'
-import { base64ToBuffer, bufferToString } from './utils.ts'
-
-const PEM_HEADER = '-----BEGIN PRIVATE KEY-----'
-const PEM_FOOTER = '-----END PRIVATE KEY-----'
+import { bufferToString, pemToBuffer } from './utils.ts'
 
 export async function decryptPrivateKey(privateKeyInfo: PrivateKeyInfo, mnemonic: string): Promise<CryptoKey> {
 	logger.debug('Decrypting private key', { privateKeyInfo, mnemonic })
@@ -24,7 +21,8 @@ export async function decryptPrivateKey(privateKeyInfo: PrivateKeyInfo, mnemonic
 		{ iv: privateKeyInfo.iv, tagLength: 128 },
 	)
 
-	return loadPemKey(atob(bufferToString(new Uint8Array(rawPrivateKey))))
+	const pemKey = atob(bufferToString(new Uint8Array(rawPrivateKey)))
+	return loadRSAPrivateKey(pemToBuffer(pemKey))
 }
 
 async function mnemonicToPrivateKey(mnemonic: string, salt: Uint8Array): Promise<CryptoKey> {
@@ -49,16 +47,3 @@ async function mnemonicToPrivateKey(mnemonic: string, salt: Uint8Array): Promise
 		['decrypt', 'encrypt'],
 	)
 }
-
-async function loadPemKey(pem: string): Promise<CryptoKey> {
-	logger.debug('Loading PEM key', { pem })
-
-	const pemContents = pem
-		.substring(
-			PEM_HEADER.length,
-			pem.length - PEM_FOOTER.length - 1,
-		)
-		.replace(/\n/g, '')
-
-	return loadRSAPrivateKey(base64ToBuffer(pemContents))
-}

src/services/metadataUtils.ts

@@ -24,3 +24,17 @@ export function bufferToHex(buffer: Uint8Array): string {
 export function base64ToBuffer(base64Str: string): Uint8Array {
 	return stringToBuffer(atob(base64Str))
 }
+
+const PEM_HEADER = '-----BEGIN PRIVATE KEY-----'
+const PEM_FOOTER = '-----END PRIVATE KEY-----'
+
+export function pemToBuffer(pem: string): Uint8Array {
+	const pemContents = pem
+		.substring(
+			PEM_HEADER.length,
+			pem.length - PEM_FOOTER.length - 1,
+		)
+		.replace(/\n/g, '')
+
+	return base64ToBuffer(pemContents)
+}