bruno/remotely-save
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

promisify data

Browse Source
This commit is contained in:
fyears 2021-11-03 00:15:23 +08:00
parent cef623f493
commit 6431182ec3
3 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/encrypt.ts
View File

@ -1,16 +1,17 @@
import * as crypto from "crypto"; import { randomBytes, pbkdf2, createDecipheriv, createCipheriv } from "crypto";
import { promisify } from "util";
import * as base32 from "hi-base32"; import * as base32 from "hi-base32";
import { bufferToArrayBuffer, arrayBufferToBuffer } from "./misc"; import { bufferToArrayBuffer, arrayBufferToBuffer } from "./misc";
const DEFAULT_ITER = 10000; const DEFAULT_ITER = 10000;
export const encryptBuffer = ( export const encryptBuffer = async (
buf: Buffer, buf: Buffer,
password: string, password: string,
rounds: number = DEFAULT_ITER rounds: number = DEFAULT_ITER
) => { ) => {
const salt = crypto.randomBytes(8); const salt = await promisify(randomBytes)(8);
const derivedKey = crypto.pbkdf2Sync( const derivedKey = await promisify(pbkdf2)(
password, password,
salt, salt,
rounds, rounds,
@ -19,7 +20,7 @@ export const encryptBuffer = (
); );
const key = derivedKey.slice(0, 32); const key = derivedKey.slice(0, 32);
const iv = derivedKey.slice(32, 32 + 16); const iv = derivedKey.slice(32, 32 + 16);
const cipher = crypto.createCipheriv("aes-256-cbc", key, iv); const cipher = createCipheriv("aes-256-cbc", key, iv);
cipher.write(buf); cipher.write(buf);
cipher.end(); cipher.end();
const encrypted = cipher.read(); const encrypted = cipher.read();
@ -27,14 +28,14 @@ export const encryptBuffer = (
return res; return res;
}; };
export const decryptBuffer = ( export const decryptBuffer = async (
buf: Buffer, buf: Buffer,
password: string, password: string,
rounds: number = DEFAULT_ITER rounds: number = DEFAULT_ITER
) => { ) => {
const prefix = buf.slice(0, 8); const prefix = buf.slice(0, 8);
const salt = buf.slice(8, 16); const salt = buf.slice(8, 16);
const derivedKey = crypto.pbkdf2Sync( const derivedKey = await promisify(pbkdf2)(
password, password,
salt, salt,
rounds, rounds,
@ -43,49 +44,53 @@ export const decryptBuffer = (
); );
const key = derivedKey.slice(0, 32); const key = derivedKey.slice(0, 32);
const iv = derivedKey.slice(32, 32 + 16); const iv = derivedKey.slice(32, 32 + 16);
const decipher = crypto.createDecipheriv("aes-256-cbc", key, iv); const decipher = createDecipheriv("aes-256-cbc", key, iv);
decipher.write(buf.slice(16)); decipher.write(buf.slice(16));
decipher.end(); decipher.end();
const decrypted = decipher.read(); const decrypted = decipher.read();
return decrypted as Buffer; return decrypted as Buffer;
}; };
export const encryptArrayBuffer = ( export const encryptArrayBuffer = async (
arrBuf: ArrayBuffer, arrBuf: ArrayBuffer,
password: string, password: string,
rounds: number = DEFAULT_ITER rounds: number = DEFAULT_ITER
) => { ) => {
return bufferToArrayBuffer( return bufferToArrayBuffer(
encryptBuffer(arrayBufferToBuffer(arrBuf), password, rounds) await encryptBuffer(arrayBufferToBuffer(arrBuf), password, rounds)
); );
}; };
export const decryptArrayBuffer = ( export const decryptArrayBuffer = async (
arrBuf: ArrayBuffer, arrBuf: ArrayBuffer,
password: string, password: string,
rounds: number = DEFAULT_ITER rounds: number = DEFAULT_ITER
) => { ) => {
return bufferToArrayBuffer( return bufferToArrayBuffer(
decryptBuffer(arrayBufferToBuffer(arrBuf), password, rounds) await decryptBuffer(arrayBufferToBuffer(arrBuf), password, rounds)
); );
}; };
export const encryptStringToBase32 = ( export const encryptStringToBase32 = async (
text: string, text: string,
password: string, password: string,
rounds: number = DEFAULT_ITER rounds: number = DEFAULT_ITER
) => { ) => {
return base32.encode(encryptBuffer(Buffer.from(text), password, rounds)); return base32.encode(
await encryptBuffer(Buffer.from(text), password, rounds)
);
}; };
export const decryptBase32ToString = ( export const decryptBase32ToString = async (
text: string, text: string,
password: string, password: string,
rounds: number = DEFAULT_ITER rounds: number = DEFAULT_ITER
) => { ) => {
return decryptBuffer( return (
Buffer.from(base32.decode.asBytes(text)), await decryptBuffer(
password, Buffer.from(base32.decode.asBytes(text)),
rounds password,
rounds
)
).toString(); ).toString();
}; };

4
src/s3.ts
View File

@ -109,7 +109,7 @@ export const uploadToRemote = async (
const localContent = await vault.adapter.readBinary(fileOrFolderPath); const localContent = await vault.adapter.readBinary(fileOrFolderPath);
let remoteContent = localContent; let remoteContent = localContent;
if (password !== "") { if (password !== "") {
remoteContent = encryptArrayBuffer(localContent, password); remoteContent = await encryptArrayBuffer(localContent, password);
} }
const body = arrayBufferToBuffer(remoteContent); const body = arrayBufferToBuffer(remoteContent);
await s3Client.send( await s3Client.send(
@ -214,7 +214,7 @@ export const downloadFromRemote = async (
); );
let localContent = remoteContent; let localContent = remoteContent;
if (password !== "") { if (password !== "") {
localContent = decryptArrayBuffer(remoteContent, password); localContent = await decryptArrayBuffer(remoteContent, password);
} }
await vault.adapter.writeBinary(fileOrFolderPath, localContent, { await vault.adapter.writeBinary(fileOrFolderPath, localContent, {
mtime: mtime, mtime: mtime,

4
src/sync.ts
View File

@ -62,7 +62,7 @@ export const ensembleMixedStates = async (
const remoteEncryptedKey = entry.Key; const remoteEncryptedKey = entry.Key;
let key = remoteEncryptedKey; let key = remoteEncryptedKey;
if (password !== "") { if (password !== "") {
key = decryptBase32ToString(remoteEncryptedKey, password); key = await decryptBase32ToString(remoteEncryptedKey, password);
} }
const backwardMapping = await getSyncMetaMappingByRemoteKeyS3( const backwardMapping = await getSyncMetaMappingByRemoteKeyS3(
db, db,
@ -299,7 +299,7 @@ export const doActualSync = async (
if (password !== "") { if (password !== "") {
remoteEncryptedKey = state.remote_encrypted_key; remoteEncryptedKey = state.remote_encrypted_key;
if (remoteEncryptedKey === undefined || remoteEncryptedKey === "") { if (remoteEncryptedKey === undefined || remoteEncryptedKey === "") {
remoteEncryptedKey = encryptStringToBase32(key, password); remoteEncryptedKey = await encryptStringToBase32(key, password);
} }
} }