split attachmnent logic between what is used on main and renderer
Audric Ackermann
3 years ago
parent
9f8920ef2c
commit
0ebc1d7e92
@ -1 +0,0 @@
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
import { SignalService } from '../../protobuf';
|
||||
|
||||
export type BinaryString = string;
|
||||
|
||||
export type CipherTextObject = {
|
||||
type: SignalService.Envelope.Type;
|
||||
body: BinaryString;
|
||||
};
|
||||
|
||||
export type KeyPair = {
|
||||
pubKey: ArrayBuffer;
|
||||
privKey: ArrayBuffer;
|
||||
};
|
||||
|
||||
interface CurveSync {
|
||||
generateKeyPair(): KeyPair;
|
||||
createKeyPair(privKey: ArrayBuffer): KeyPair;
|
||||
verifySignature(pubKey: ArrayBuffer, msg: ArrayBuffer, sig: ArrayBuffer): void;
|
||||
calculateSignature(privKey: ArrayBuffer, message: ArrayBuffer): ArrayBuffer;
|
||||
validatePubKeyFormat(pubKey: ArrayBuffer): ArrayBuffer;
|
||||
}
|
||||
|
||||
interface CurveAsync {
|
||||
generateKeyPair(): Promise<KeyPair>;
|
||||
createKeyPair(privKey: ArrayBuffer): Promise<KeyPair>;
|
||||
verifySignature(pubKey: ArrayBuffer, msg: ArrayBuffer, sig: ArrayBuffer): Promise<void>;
|
||||
calculateSignature(privKey: ArrayBuffer, message: ArrayBuffer): Promise<ArrayBuffer>;
|
||||
validatePubKeyFormat(pubKey: ArrayBuffer): Promise<ArrayBuffer>;
|
||||
}
|
||||
|
||||
export interface CurveInterface extends CurveSync {
|
||||
async: CurveAsync;
|
||||
}
|
||||
|
||||
export interface CryptoInterface {
|
||||
encrypt(key: ArrayBuffer, data: ArrayBuffer, iv: ArrayBuffer): Promise<ArrayBuffer>;
|
||||
decrypt(key: ArrayBuffer, data: ArrayBuffer, iv: ArrayBuffer): Promise<ArrayBuffer>;
|
||||
calculateMAC(key: ArrayBuffer, data: ArrayBuffer): Promise<ArrayBuffer>;
|
||||
verifyMAC(data: ArrayBuffer, key: ArrayBuffer, mac: ArrayBuffer, length: number): Promise<void>;
|
||||
getRandomBytes(size: number): ArrayBuffer;
|
||||
}
|
||||
|
||||
|
||||
export interface LibsignalProtocol {
|
||||
Curve: CurveInterface;
|
||||
crypto: CryptoInterface;
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
@ -1,167 +0,0 @@
|
||||
// // eslint-disable-next-line import/no-extraneous-dependencies
|
||||
// const esbuild = require('esbuild');
|
||||
// const path = require('path');
|
||||
// const glob = require('glob');
|
||||
|
||||
// const ROOT_DIR = path.join(__dirname, '..');
|
||||
// const DIST_DIR = path.join(ROOT_DIR, 'dist');
|
||||
|
||||
// const watch = process.argv.some(argv => argv === '-w' || argv === '--watch');
|
||||
// const isProd = process.argv.some(argv => argv === '-prod' || argv === '--prod');
|
||||
|
||||
// const nodeDefaults = {
|
||||
// platform: 'node',
|
||||
// target: 'node16',
|
||||
// sourcemap: isProd ? false : 'inline',
|
||||
// // Otherwise React components get renamed
|
||||
// // See: https://github.com/evanw/esbuild/issues/1147
|
||||
// keepNames: true,
|
||||
// logLevel: 'info',
|
||||
// watch,
|
||||
// };
|
||||
|
||||
// const defaultBundle = {
|
||||
// ...nodeDefaults,
|
||||
// // define: {
|
||||
// // 'process.env.NODE_ENV': isProd ? '"production"' : '"development"',
|
||||
// // },
|
||||
// bundle: true,
|
||||
// external: [
|
||||
// // Native libraries
|
||||
// // 'better-sqlite3',
|
||||
// 'electron',
|
||||
// // 'sass',
|
||||
// // 'bytebuffer',
|
||||
// // 'lodash',
|
||||
// // 'react',
|
||||
// // 'react-dom',
|
||||
// // Things that don't bundle well
|
||||
// // 'backbone',
|
||||
// 'got',
|
||||
// // 'jquery',
|
||||
// 'node-fetch',
|
||||
// // 'proxy-agent',
|
||||
|
||||
// 'ip2country',
|
||||
// // 'react-redux',
|
||||
// // 'react-qr-svg',
|
||||
// // 'reselect',
|
||||
// // 'redux',
|
||||
// // '@reduxjs/toolkit',
|
||||
// 'styled-components',
|
||||
// // 'react-contexify',
|
||||
// 'filesize',
|
||||
// 'redux-persist',
|
||||
// 'redux-promise-middleware',
|
||||
// 'emoji-mart',
|
||||
// 'mic-recorder-to-mp3',
|
||||
// // 'react-intersection-observer',
|
||||
// // 'react-h5-audio-player',
|
||||
// 'semver',
|
||||
// 'os',
|
||||
// // 'react-toastify',
|
||||
// 'libsodium-wrappers-sumo',
|
||||
// 'fs-extra',
|
||||
// 'blueimp-load-image',
|
||||
// 'blob-util',
|
||||
// // 'redux-logger',
|
||||
// 'rimraf',
|
||||
// 'better-sqlite3',
|
||||
// 'glob',
|
||||
// 'rc-slider',
|
||||
// // 'react-virtualized',
|
||||
// 'rc-slider',
|
||||
// // 'react-draggable',
|
||||
// // 'react-mentions',
|
||||
|
||||
// // Large libraries
|
||||
// // See: https://esbuild.github.io/api/#analyze
|
||||
// 'moment',
|
||||
// ],
|
||||
// };
|
||||
|
||||
// // App, tests, and scripts
|
||||
// esbuild.build({
|
||||
// ...nodeDefaults,
|
||||
// format: 'cjs',
|
||||
// mainFields: ['browser', 'main'],
|
||||
// entryPoints: glob
|
||||
// .sync('{app,ts}/**/*.{ts,tsx}', {
|
||||
// nodir: true,
|
||||
// root: ROOT_DIR,
|
||||
// })
|
||||
// .filter(file => !file.endsWith('.d.ts')),
|
||||
// outdir: path.join(DIST_DIR),
|
||||
// });
|
||||
|
||||
// // App, tests, and scripts
|
||||
|
||||
// // build main renderer
|
||||
// esbuild.build({
|
||||
// ...defaultBundle,
|
||||
// format: 'cjs',
|
||||
// platform: 'node',
|
||||
// mainFields: ['browser', 'main', 'module'],
|
||||
// inject: [path.join(ROOT_DIR, 'node_modules', 'jquery', 'dist', 'jquery.min.js')],
|
||||
// entryPoints: ['./ts/mains/main_renderer.ts'],
|
||||
// outfile: path.join(DIST_DIR, 'electron_renderer.js'),
|
||||
// });
|
||||
|
||||
// // build main_node
|
||||
// esbuild.build({
|
||||
// ...defaultBundle,
|
||||
// format: 'cjs',
|
||||
// mainFields: ['main'],
|
||||
// entryPoints: ['./ts/mains/main_node.ts'],
|
||||
// outfile: path.join(DIST_DIR, 'electron_main.js'),
|
||||
// });
|
||||
|
||||
// // Preload bundle
|
||||
// // eslint-disable-next-line more/no-then
|
||||
// esbuild.buildSync({
|
||||
// ...defaultBundle,
|
||||
// format: 'cjs',
|
||||
// entryPoints: ['preload.ts'],
|
||||
// outdir: path.join(DIST_DIR),
|
||||
// });
|
||||
// esbuild.buildSync({
|
||||
// ...defaultBundle,
|
||||
// entryPoints: [path.join(ROOT_DIR, 'dist', 'preload.js')],
|
||||
// inject: [path.join(ROOT_DIR, 'libtextsecure', 'libsignal-protocol.js')],
|
||||
// outfile: path.join(DIST_DIR, 'preload.bundled.js'),
|
||||
// });
|
||||
|
||||
// // HEIC worker
|
||||
// // esbuild.build({
|
||||
// // ...bundleDefaults,
|
||||
// // entryPoints: [path.join(ROOT_DIR, 'ts', 'workers', 'heicConverterWorker.ts')],
|
||||
// // outfile: path.join(DIST_DIR, 'ts', 'workers', 'heicConverter.bundle.js'),
|
||||
// // });
|
||||
|
||||
// // // SQL worker
|
||||
// // const libDir = path.join('..', '..', 'node_modules', 'better-sqlite3');
|
||||
// // const bindingFile = path.join(libDir, 'build', 'Release', 'better_sqlite3.node');
|
||||
|
||||
// // esbuild.build({
|
||||
// // ...nodeDefaults,
|
||||
// // bundle: true,
|
||||
|
||||
// // plugins: [
|
||||
// // {
|
||||
// // name: 'bindings',
|
||||
// // setup(build) {
|
||||
// // build.onResolve({ filter: /^bindings$/ }, () => ({
|
||||
// // path: path.join(ROOT_DIR, 'ts', 'sql', 'mainWorkerBindings.ts'),
|
||||
// // }));
|
||||
|
||||
// // build.onResolve({ filter: /^better_sqlite3\.node$/ }, () => ({
|
||||
// // path: bindingFile,
|
||||
// // external: true,
|
||||
// // }));
|
||||
// // },
|
||||
// // },
|
||||
// // ],
|
||||
|
||||
// // entryPoints: [path.join(ROOT_DIR, 'ts', 'sql', 'mainWorker.ts')],
|
||||
// // outfile: path.join(DIST_DIR, 'ts', 'sql', 'mainWorker.bundle.js'),
|
||||
// // });
|
||||
@ -0,0 +1,63 @@
|
||||
import { getSodiumNode } from './sodiumNode';
|
||||
|
||||
export async function decryptAttachmentBufferNode(
|
||||
encryptingKey: Uint8Array,
|
||||
bufferIn: ArrayBuffer
|
||||
) {
|
||||
const sodium = await getSodiumNode();
|
||||
|
||||
const header = new Uint8Array(
|
||||
bufferIn.slice(0, sodium.crypto_secretstream_xchacha20poly1305_HEADERBYTES)
|
||||
);
|
||||
|
||||
const encryptedBuffer = new Uint8Array(
|
||||
bufferIn.slice(sodium.crypto_secretstream_xchacha20poly1305_HEADERBYTES)
|
||||
);
|
||||
try {
|
||||
/* Decrypt the stream: initializes the state, using the key and a header */
|
||||
const state = sodium.crypto_secretstream_xchacha20poly1305_init_pull(header, encryptingKey);
|
||||
// what if ^ this call fail (? try to load as a unencrypted attachment?)
|
||||
|
||||
const messageTag = sodium.crypto_secretstream_xchacha20poly1305_pull(state, encryptedBuffer);
|
||||
// we expect the final tag to be there. If not, we might have an issue with this file
|
||||
// maybe not encrypted locally?
|
||||
if (messageTag.tag === sodium.crypto_secretstream_xchacha20poly1305_TAG_FINAL) {
|
||||
return messageTag.message;
|
||||
}
|
||||
} catch (e) {
|
||||
// tslint:disable: no-console
|
||||
console.error('Failed to load the file as an encrypted one', e);
|
||||
}
|
||||
return new Uint8Array();
|
||||
}
|
||||
|
||||
export async function encryptAttachmentBufferNode(
|
||||
encryptingKey: Uint8Array,
|
||||
bufferIn: ArrayBuffer
|
||||
) {
|
||||
const sodium = await getSodiumNode();
|
||||
|
||||
try {
|
||||
const uintArrayIn = new Uint8Array(bufferIn);
|
||||
|
||||
/* Set up a new stream: initialize the state and create the header */
|
||||
const { state, header } = sodium.crypto_secretstream_xchacha20poly1305_init_push(encryptingKey);
|
||||
/* Now, encrypt the buffer. */
|
||||
const bufferOut = sodium.crypto_secretstream_xchacha20poly1305_push(
|
||||
state,
|
||||
uintArrayIn,
|
||||
null,
|
||||
sodium.crypto_secretstream_xchacha20poly1305_TAG_FINAL
|
||||
);
|
||||
|
||||
const encryptedBufferWithHeader = new Uint8Array(bufferOut.length + header.length);
|
||||
encryptedBufferWithHeader.set(header);
|
||||
encryptedBufferWithHeader.set(bufferOut, header.length);
|
||||
|
||||
return { encryptedBufferWithHeader, header };
|
||||
} catch (e) {
|
||||
console.error('encryptAttachmentBuffer error: ', e);
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
import * as wrappers from 'libsodium-wrappers-sumo';
|
||||
|
||||
export async function getSodiumNode() {
|
||||
// don't ask me why, but when called from node we have to do this as the types are incorrect?!
|
||||
const anyWrappers = wrappers as any;
|
||||
await anyWrappers.ready;
|
||||
return anyWrappers;
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
// createDeleter :: AttachmentsPath ->
|
||||
// RelativePath ->
|
||||
// IO Unit
|
||||
|
||||
import { isString } from 'lodash';
|
||||
import path from 'path';
|
||||
import fse from 'fs-extra';
|
||||
|
||||
export const createDeleter = (root: string) => {
|
||||
if (!isString(root)) {
|
||||
throw new TypeError("'root' must be a path");
|
||||
}
|
||||
|
||||
return async (relativePath: string) => {
|
||||
if (!isString(relativePath)) {
|
||||
throw new TypeError("'relativePath' must be a string");
|
||||
}
|
||||
|
||||
const absolutePath = path.join(root, relativePath);
|
||||
const normalized = path.normalize(absolutePath);
|
||||
if (!normalized.startsWith(root)) {
|
||||
throw new Error('Invalid relative path');
|
||||
}
|
||||
await fse.remove(absolutePath);
|
||||
};
|
||||
};
|
||||
|
||||
const PATH = 'attachments.noindex';
|
||||
|
||||
// getPath :: AbsolutePath -> AbsolutePath
|
||||
export const getAttachmentsPath = (userDataPath: string) => {
|
||||
if (!isString(userDataPath)) {
|
||||
throw new TypeError("'userDataPath' must be a string");
|
||||
}
|
||||
return path.join(userDataPath, PATH);
|
||||
};
|
||||
@ -1,153 +0,0 @@
|
||||
/* eslint-disable class-methods-use-this */
|
||||
|
||||
/*const path = require('path');
|
||||
|
||||
const HtmlWebpackPlugin = require('html-webpack-plugin');
|
||||
|
||||
const optimization = {
|
||||
nodeEnv: false,
|
||||
removeAvailableModules: true,
|
||||
removeEmptyChunks: true,
|
||||
providedExports: true,
|
||||
minimize: false,
|
||||
// minimizer: [new TerserPlugin({ parallel: true })],
|
||||
// splitChunks: true,
|
||||
};
|
||||
|
||||
const EXTERNAL_MODULE = new Set([
|
||||
'backbone',
|
||||
'better-sqlite3',
|
||||
'fsevents',
|
||||
'got',
|
||||
'jquery',
|
||||
'node-fetch',
|
||||
]);
|
||||
|
||||
module.exports = [
|
||||
{
|
||||
// bundling mode
|
||||
|
||||
mode: 'development', // mode: 'production',
|
||||
devtool: false,
|
||||
|
||||
optimization,
|
||||
|
||||
// entry files
|
||||
resolve: {
|
||||
extensions: ['.ts', '.tsx', '.js', '.json'],
|
||||
},
|
||||
entry: './ts/mains/main_node.ts',
|
||||
target: 'electron-main',
|
||||
module: {
|
||||
// loaders
|
||||
|
||||
rules: [
|
||||
{
|
||||
test: /\.js$/,
|
||||
loader: `node-bindings-loader`,
|
||||
},
|
||||
{
|
||||
test: /\.node$/,
|
||||
loader: `node-loader`,
|
||||
},
|
||||
{
|
||||
test: /\.tsx?$/,
|
||||
include: /ts/,
|
||||
use: [
|
||||
{
|
||||
loader: 'ts-loader',
|
||||
options: {
|
||||
transpileOnly: true,
|
||||
experimentalWatchApi: true,
|
||||
},
|
||||
},
|
||||
],
|
||||
exclude: /node_modules/,
|
||||
},
|
||||
],
|
||||
},
|
||||
// output bundles (location)
|
||||
|
||||
output: {
|
||||
path: path.resolve(__dirname, 'dist'),
|
||||
filename: 'electron_main.js',
|
||||
},
|
||||
},
|
||||
// {
|
||||
// entry: './preload.ts',
|
||||
// mode: 'development',
|
||||
// output: {
|
||||
// path: path.resolve(__dirname, 'dist'),
|
||||
// filename: 'preload.bundled.js',
|
||||
// },
|
||||
// target: 'electron-main',
|
||||
// resolve: {
|
||||
// extensions: ['.ts', '.tsx', '.js', '.json'],
|
||||
// mainFields: ['browser', 'main'],
|
||||
// },
|
||||
// externals: [
|
||||
// ({ request = '' }, callback) => {
|
||||
// if (EXTERNAL_MODULE.has(request)) {
|
||||
// return callback(undefined, `commonjs2 ${request}`);
|
||||
// }
|
||||
|
||||
// callback();
|
||||
// },
|
||||
// ],
|
||||
// module: {
|
||||
// rules: [
|
||||
// {
|
||||
// test: /\.tsx?$/,
|
||||
// include: [path.resolve(__dirname), path.resolve(__dirname, 'js')],
|
||||
// exclude: /node_modules/,
|
||||
|
||||
// use: [
|
||||
// {
|
||||
// loader: 'ts-loader',
|
||||
// options: { transpileOnly: true },
|
||||
// },
|
||||
// ],
|
||||
// },
|
||||
// ],
|
||||
// },
|
||||
// },
|
||||
|
||||
// {
|
||||
// mode: 'development',
|
||||
// entry: './ts/mains/main_renderer.ts',
|
||||
// target: 'electron-renderer',
|
||||
// devtool: false,
|
||||
// resolve: {
|
||||
// extensions: ['.ts', '.tsx', '.js', '.json'],
|
||||
// },
|
||||
// module: {
|
||||
// rules: [
|
||||
// {
|
||||
// test: /\.tsx?$/,
|
||||
// include: [path.resolve(__dirname, 'ts'), path.resolve(__dirname, 'js')],
|
||||
// exclude: /node_modules/,
|
||||
|
||||
// use: [
|
||||
// {
|
||||
// loader: 'ts-loader',
|
||||
// options: {
|
||||
// transpileOnly: true,
|
||||
// experimentalWatchApi: true,
|
||||
// },
|
||||
// },
|
||||
// ],
|
||||
// },
|
||||
// ],
|
||||
// },
|
||||
// optimization,
|
||||
// output: {
|
||||
// path: path.resolve(__dirname, 'dist', 'js'),
|
||||
// filename: 'electron_renderer.js',
|
||||
// },
|
||||
// plugins: [
|
||||
// new HtmlWebpackPlugin({
|
||||
// template: './background.html',
|
||||
// }),
|
||||
// ],
|
||||
// },
|
||||
];
|
||||
Loading…
Reference in New Issue