0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from ente-io/chacha20

Browse source 
Switch to libsodium for decrypting metadata and thumbnails
This commit is contained in:
Vishnu Mohandas 2020-09-27 22:54:19 +05:30 • committed by GitHub
commit ce308a8e0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 87 additions and 8632 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6859
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

5
package.json
View file

@ -11,8 +11,10 @@
"dependencies": {
"axios": "^0.20.0",
"bootstrap": "^4.5.2",
"comlink": "^4.3.0",
"formik": "^2.1.5",
"http-proxy-middleware": "^1.0.5",
"libsodium-wrappers": "^0.7.8",
"next": "9.5.3",
"node-forge": "^0.10.0",
"react": "16.13.1",
@ -32,5 +34,8 @@
"next-on-netlify": "^2.4.0",
"typescript": "^4.0.2",
"worker-plugin": "^5.0.0"
},
"standard": {
"parser": "babel-eslint"
}
}

45
src/services/fileService.ts
View file

@ -1,13 +1,28 @@
import aescrypt from "utils/aescrypt";
import { getEndpoint } from "utils/common/apiUtil";
import { decrypt } from "utils/crypto/aes";
import { strToUint8 } from "utils/crypto/common";
import HTTPService from "./HTTPService";
import * as Comlink from "comlink";
const decryptMetadata: any = typeof window !== 'undefined'
&& Comlink.wrap(new Worker("worker/decryptMetadata.worker.js", { type: 'module' }));
const decryptThumbnail: any = typeof window !== 'undefined'
&& Comlink.wrap(new Worker("worker/decryptThumbnail.worker.js", { type: 'module' }));
const ENDPOINT = getEndpoint();
export interface decryptionParams {
encryptedKey: string;
keyDecryptionNonce: string;
header: string;
nonce: string;
};
export interface fileData {
id: number;
file: {
decryptionParams: decryptionParams;
},
thumbnail: {
decryptionParams: decryptionParams;
},
metadata: {
currentTime: number;
modificationTime: number;
@ -19,27 +34,15 @@ export interface fileData {
src: string,
w: number,
h: number,
encryptedPassword: string;
encryptedPasswordIV: string;
file?: string;
data?: string;
};
const getFileDataUsingWorker = (data: any, key: string) => {
return new Promise((resolve) => {
const worker = new Worker('worker/decryptMetadata.worker.js', { type: 'module' });
const onWorkerMessage = (event) => resolve(event.data);
worker.addEventListener('message', onWorkerMessage);
worker.postMessage({ data, key });
});
const getFileMetaDataUsingWorker = (data: any, key: string) => {
return decryptMetadata({ data, key });
}
const getFileUsingWorker = (data: any, key: string) => {
return new Promise((resolve) => {
const worker = new Worker('worker/decryptFile.worker.js', { type: 'module' });
const onWorkerMessage = (event) => resolve(event.data);
worker.addEventListener('message', onWorkerMessage);
worker.postMessage({ data, key });
});
return decryptThumbnail({ data, key });
}
export const getFiles = async (sinceTime: string, token: string, limit: string, key: string) => {
@ -47,7 +50,7 @@ export const getFiles = async (sinceTime: string, token: string, limit: string,
sinceTime, token, limit,
});
const promises: Promise<fileData>[] = resp.data.diff.map((data) => getFileDataUsingWorker(data, key));
const promises: Promise<fileData>[] = resp.data.diff.map((data) => getFileMetaDataUsingWorker(data, key));
const decrypted = await Promise.all(promises);
return decrypted;
@ -62,6 +65,6 @@ export const getPreview = async (token: string, data: fileData, key: string) =>
...data,
file: resp.data,
}, key);
const url = URL.createObjectURL(new Blob([decrypted.file]));
const url = URL.createObjectURL(new Blob([decrypted.data]));
return url;
}

1697
src/utils/aescrypt/aescrypt.js
View file

File diff suppressed because it is too large Load diff

21
src/utils/aescrypt/index.ts
View file

@ -1,21 +0,0 @@
import { aescrypt } from './aescrypt';
const decrypt = (file: Uint8Array, password: String, binaryResponse: Boolean = false) => {
return new Promise((resolve, reject) => {
try {
aescrypt.decrypt(file, password, !binaryResponse, ({ data, error}) => {
if (error) {
console.log(error);
reject(error);
}
resolve(data);
});
} catch (e) {
reject(e);
}
});
}
export default {
decrypt,
}

19
src/worker/decryptFile.worker.js
View file

@ -1,19 +0,0 @@
import { decrypt } from "utils/crypto/aes";
import { strToUint8 } from "utils/crypto/common";
import aescrypt from 'utils/aescrypt';
function decryptFile(event) {
const main = async () => {
const data = event.data.data;
const key = event.data.key;
const password = await decrypt(data.encryptedPassword, key, data.encryptedPasswordIV);
const file = await aescrypt.decrypt(data.file, atob(password), true);
self.postMessage({
id: data.id,
file: file,
});
}
main();
}
self.addEventListener('message', decryptFile);

34
src/worker/decryptMetadata.worker.js
View file

@ -1,19 +1,23 @@
import { decrypt } from "utils/crypto/aes";
import * as Comlink from 'comlink';
import { base64ToUint8 } from "utils/crypto/common";
import aescrypt from 'utils/aescrypt';
import sodium from 'libsodium-wrappers';
function decryptFile(event) {
const main = async () => {
const data = event.data.data;
const key = event.data.key;
const password = await decrypt(data.encryptedPassword, key, data.encryptedPasswordIV);
const metadata = await aescrypt.decrypt(base64ToUint8(data.encryptedMetadata), atob(password));
self.postMessage({
...data,
metadata: JSON.parse(metadata)
});
}
main();
async function decryptMetadata(event) {
console.log(event);
const { data } = event;
await sodium.ready;
const key = sodium.crypto_secretbox_open_easy(
base64ToUint8(data.metadata.decryptionParams.encryptedKey),
base64ToUint8(data.metadata.decryptionParams.keyDecryptionNonce),
base64ToUint8(event.key));
const metadata = sodium.crypto_secretbox_open_easy(
base64ToUint8(data.metadata.encryptedData),
base64ToUint8(data.metadata.decryptionParams.nonce),
key);
return {
...data,
metadata: JSON.parse(new TextDecoder().decode(metadata))
};
}
self.addEventListener('message', decryptFile);
Comlink.expose(decryptMetadata, self);

22
src/worker/decryptThumbnail.worker.js Normal file
View file

@ -0,0 +1,22 @@
import * as Comlink from 'comlink';
import { base64ToUint8 } from "utils/crypto/common";
import sodium from 'libsodium-wrappers';
async function decryptThumbnail(event) {
const { data } = event;
await sodium.ready;
const key = sodium.crypto_secretbox_open_easy(
base64ToUint8(data.thumbnail.decryptionParams.encryptedKey),
base64ToUint8(data.thumbnail.decryptionParams.keyDecryptionNonce),
base64ToUint8(event.key));
const thumbnail = sodium.crypto_secretbox_open_easy(
new Uint8Array(data.file),
base64ToUint8(data.thumbnail.decryptionParams.nonce),
key);
return {
id: data.id,
data: thumbnail,
};
}
Comlink.expose(decryptThumbnail, self);

17
yarn.lock
View file

@ -2076,6 +2076,11 @@ color-name@~1.1.4:
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
comlink@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/comlink/-/comlink-4.3.0.tgz#80b3366baccd87897dab3638ebfcfae28b2f87c7"
integrity sha512-mu4KKKNuW8TvkfpW/H88HBPeILubBS6T94BdD1VWBXNXfiyqVtwUCVNO1GeNOBTsIswzsMjWlycYr+77F5b84g==
commander@^2.20.0:
version "2.20.3"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@ -3450,6 +3455,18 @@ levenary@^1.1.1:
dependencies:
leven "^3.1.0"
libsodium-wrappers@^0.7.8:
version "0.7.8"
resolved "https://registry.yarnpkg.com/libsodium-wrappers/-/libsodium-wrappers-0.7.8.tgz#d95cdf3e7236c2aef76844bf8e1929ba9eef3e9e"
integrity sha512-PDhPWXBqd/SaqAFUBgH2Ux7b3VEEJgyD6BQB+VdNFJb9PbExGr/T/myc/MBoSvl8qLzfm0W0IVByOQS5L1MrCg==
dependencies:
libsodium "0.7.8"
libsodium@0.7.8:
version "0.7.8"
resolved "https://registry.yarnpkg.com/libsodium/-/libsodium-0.7.8.tgz#fbd12247b7b1353f88d8de1cbc66bc1a07b2e008"
integrity sha512-/Qc+APf0jbeWSaeEruH0L1/tbbT+sbf884ZL0/zV/0JXaDPBzYkKbyb/wmxMHgAHzm3t6gqe7bOOXAVwfqVikQ==
loader-runner@^2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"