self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

Linter update (#1777)

Browse Source 
* Update eslint config

* Applied linter to lib

* Applied eslint config to CliClient/app

* Removed prettier due to https://github.com/prettier/prettier/pull/4765

* First pass on test units

* Applied linter config to test units

* Applied eslint config to clipper

* Applied to plugin dir

* Applied to root of ElectronClient

* Applied on RN root

* Applied on CLI root

* Applied on Clipper root

* Applied config to tools

* test hook

* test hook

* test hook

* Added pre-commit hook

* Applied rule no-trailing-spaces

* Make sure root packages are installed when installing sub-dir

* Added doc
This commit is contained in:
Laurent Cozic
2019-07-30 09:35:42 +02:00
committed by GitHub
parent b8fbaa2029
commit 71efff6827
208 changed files with 7715 additions and 5019 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ReactNativeClient/lib/services/EncryptionService.js
View File

@ -194,21 +194,21 @@ class EncryptionService {
return sjcl.codec.hex.fromBits(bitArray);
}
async seedSjcl() {
throw new Error('NOT TESTED');
// async seedSjcl() {
// throw new Error('NOT TESTED');
// Just putting this here in case it becomes needed
// Normally seeding random bytes is not needed for our use since
// we use shim.randomBytes directly to generate master keys.
// // Just putting this here in case it becomes needed
// // Normally seeding random bytes is not needed for our use since
// // we use shim.randomBytes directly to generate master keys.
const sjcl = shim.sjclModule;
const randomBytes = await shim.randomBytes(1024 / 8);
const hexBytes = randomBytes.map(a => {
return a.toString(16);
});
const hexSeed = sjcl.codec.hex.toBits(hexBytes.join(''));
sjcl.random.addEntropy(hexSeed, 1024, 'shim.randomBytes');
}
// const sjcl = shim.sjclModule;
// const randomBytes = await shim.randomBytes(1024 / 8);
// const hexBytes = randomBytes.map(a => {
// return a.toString(16);
// });
// const hexSeed = sjcl.codec.hex.toBits(hexBytes.join(''));
// sjcl.random.addEntropy(hexSeed, 1024, 'shim.randomBytes');
// }
async randomHexString(byteCount) {
const bytes = await shim.randomBytes(byteCount);
@ -458,7 +458,9 @@ class EncryptionService {
const cleanUp = async () => {
if (source) await source.close();
if (destination) await destination.close();
// eslint-disable-next-line require-atomic-updates
source = null;
// eslint-disable-next-line require-atomic-updates
destination = null;
};
@ -481,7 +483,9 @@ class EncryptionService {
const cleanUp = async () => {
if (source) await source.close();
if (destination) await destination.close();
// eslint-disable-next-line require-atomic-updates
source = null;
// eslint-disable-next-line require-atomic-updates
destination = null;
};
@ -526,14 +530,17 @@ class EncryptionService {
if (identifier !== 'JED') throw new Error('Invalid header (missing identifier): ' + headerHexaBytes.substr(0, 64));
const template = this.headerTemplate(version);
const size = parseInt(reader.read(6), 16);
// eslint-disable-next-line no-unused-vars
const size = parseInt(reader.read(6), 16); // Read the size and move the reader pointer forward
let output = {};
for (let i = 0; i < template.fields.length; i++) {
const m = template.fields[i];
const name = m[0];
const size = m[1];
const type = m[2];
let v = reader.read(m[1]);
let v = reader.read(size);
if (type === 'int') {
v = parseInt(v, 16);
@ -543,7 +550,7 @@ class EncryptionService {
throw new Error('Invalid type: ' + type);
}
output[m[0]] = v;
output[name] = v;
}
return output;