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

Merge pull request #3 from ente-io/shared_collections

Browse source 
Decrypt shared collection files
This commit is contained in:
Pushkar Anand 2020-11-20 12:33:31 +05:30 • committed by GitHub
commit 274b45fa0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/pages/generate/index.tsx
View file

@ -58,7 +58,7 @@ export default function Generate() {
const kekHash = await cryptoWorker.hash(kek);
const encryptedKeyAttributes = await cryptoWorker.encrypt(key, kek);
const keyPair = await cryptoWorker.generateKeyPair();
const encryptedKeyPairAttributes = await cryptoWorker.encrypt(keyPair.privateKey, kek);
const encryptedKeyPairAttributes = await cryptoWorker.encrypt(keyPair.privateKey, key);
const keyAttributes = {
kekSalt: await cryptoWorker.toB64(kekSalt),
kekHash: kekHash,

14
src/services/fileService.ts
View file

@ -54,8 +54,15 @@ const getCollectionKey = async (collection: collection, key: Uint8Array) => {
await worker.fromB64(collection.keyDecryptionNonce),
key);
} else {
// TODO
decryptedKey = null;
const keyAttributes = getData(LS_KEYS.KEY_ATTRIBUTES);
const secretKey = await worker.decrypt(
await worker.fromB64(keyAttributes.encryptedSecretKey),
await worker.fromB64(keyAttributes.secretKeyDecryptionNonce),
key);
decryptedKey = await worker.boxSealOpen(
await worker.fromB64(collection.encryptedKey),
await worker.fromB64(keyAttributes.publicKey),
secretKey);
}
return {
...collection,
@ -81,9 +88,6 @@ export const getFiles = async (sinceTime: string, token: string, limit: string,
var files: Array<file> = [];
for (const index in collections) {
const collection = collections[index];
if (collection.key == null) {
continue;
}
const resp = await HTTPService.get(`${ENDPOINT}/collections/diff`, {
'collectionID': collection.id.toString(), sinceTime, token, limit,
});

5
src/utils/crypto/libsodium.ts
View file

@ -92,6 +92,11 @@ export async function generateKeyPair() {
return sodium.crypto_box_keypair();
}
export async function boxSealOpen(input: Uint8Array, publicKey: Uint8Array, secretKey: Uint8Array) {
await sodium.ready;
return sodium.crypto_box_seal_open(input, publicKey, secretKey);
}
export async function fromB64(input: string) {
await sodium.ready;
return sodium.from_base64(input, sodium.base64_variants.ORIGINAL);

4
src/worker/crypto.worker.js
View file

@ -57,6 +57,10 @@ export class Crypto {
return libsodium.generateKeyPair();
}
async boxSealOpen(input, publicKey, secretKey) {
return libsodium.boxSealOpen(input, publicKey, secretKey)
}
async fromString(string) {
return libsodium.fromString(string);
}