keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

up

This commit is contained in:
antelle 2020-05-31 13:00:35 +02:00
parent a08e3c7d27
commit 835acff637
No known key found for this signature in database
GPG Key ID: 63C9777AAB7C563C
5 changed files with 1870 additions and 990 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
desktop/app.js
View File

@ -756,21 +756,14 @@ function loadSettingsEncryptionKey() {
}
const keytar = reqNative('keytar');
return new Promise((resolve, reject) => {
keytar.getPassword('KeeWeb', 'settings-key', (err, key) => {
if (err) {
return reject('Error loading settings key from keytar');
}
if (key) {
return resolve(Buffer.from(key, 'hex'));
}
key = require('crypto').randomBytes(48);
keytar.setPassword('KeeWeb', 'settings-key', key.toString('hex'), err => {
if (err) {
return reject('Error saving settings key in keytar');
}
migrateOldConfigs(key).then(() => resolve(key));
});
return keytar.getPassword('KeeWeb', 'settings-key').then(key => {
if (key) {
return Buffer.from(key, 'hex');
}
key = require('crypto').randomBytes(48);
return keytar.setPassword('KeeWeb', 'settings-key', key.toString('hex')).then(() => {
return migrateOldConfigs(key).then(() => key);
});
});
});

4
desktop/package-lock.json generated
View File

@ -5,8 +5,8 @@
"requires": true,
"dependencies": {
"@keeweb/keeweb-native-modules": {
"version": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.3.2/keeweb-native-modules.tgz",
"integrity": "sha512-4bDKPnzN5g5cfD6t980UM1SLOtA6zR09XeFNYle3VcXuxaOOF0Z1Bv1Z0DSdJZ0/8S87EiB7i1uN+lnYbQV5NA=="
"version": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.3.5/keeweb-native-modules.tgz",
"integrity": "sha512-rTJqip7SFDVEGdrWtpFQ0hiSqxmjVl1rVPegFTvA9WhObkSqfj2ORbmS1+EmuCD7pzDCd+T4Q71sdSaLzuDPtw=="
},
"node-stream-zip": {
"version": "1.4.2",

2
desktop/package.json
View File

@ -16,7 +16,7 @@
"license": "MIT",
"readme": "../README.md",
"dependencies": {
"@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.3.2/keeweb-native-modules.tgz",
"@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.3.5/keeweb-native-modules.tgz",
"node-stream-zip": "^1.4.2"
},
"devDependencies": {}

2799
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

32
package.json
View File

@ -10,15 +10,15 @@
"url": "https://github.com/keeweb/keeweb"
},
"dependencies": {
"@babel/core": "^7.9.6",
"@babel/plugin-external-helpers": "^7.8.3",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-proposal-optional-chaining": "^7.9.0",
"@babel/preset-env": "^7.9.6",
"@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.3.2/keeweb-native-modules.tgz",
"@babel/core": "^7.10.2",
"@babel/plugin-external-helpers": "^7.10.1",
"@babel/plugin-proposal-class-properties": "^7.10.1",
"@babel/plugin-proposal-optional-chaining": "^7.10.1",
"@babel/preset-env": "^7.10.2",
"@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.3.5/keeweb-native-modules.tgz",
"adm-zip": "^0.4.14",
"argon2-browser": "1.13.0",
"autoprefixer": "^9.7.6",
"autoprefixer": "^9.8.0",
"babel-cli": "^6.26.0",
"babel-eslint": "^10.1.0",
"babel-loader": "8.1.0",
@ -29,9 +29,9 @@
"chai": "^4.2.0",
"cross-env": "^7.0.2",
"dompurify": "^2.0.11",
"electron": "^8.3.0",
"electron-builder": "^22.6.0",
"eslint": "^7.0.0",
"electron": "^9.0.0",
"electron-builder": "^22.7.0",
"eslint": "^7.1.0",
"eslint-config-prettier": "^6.11.0",
"eslint-config-standard": "^14.1.1",
"eslint-plugin-babel": "^5.3.0",
@ -52,7 +52,7 @@
"grunt-contrib-htmlmin": "3.1.0",
"grunt-contrib-watch": "1.1.0",
"grunt-electron": "11.0.0",
"grunt-eslint": "22.0.0",
"grunt-eslint": "23.0.0",
"grunt-gitinfo": "github:keeweb/grunt-gitinfo#b61aaed",
"grunt-inline-alt": "github:keeweb/grunt-inline-alt#ec9f6ad",
"grunt-string-replace": "1.3.1",
@ -67,9 +67,9 @@
"kdbxweb": "1.6.0",
"load-grunt-tasks": "5.1.0",
"lodash": "^4.17.15",
"marked": "^1.0.0",
"marked": "^1.1.0",
"mini-css-extract-plugin": "^0.9.0",
"mocha": "^7.1.2",
"mocha": "^7.2.0",
"morphdom": "^2.6.1",
"node-sass": "^4.14.1",
"node-stream-zip": "1.11.1",
@ -87,16 +87,16 @@
"string-replace-webpack-plugin": "0.1.3",
"strip-sourcemap-loader": "0.0.1",
"sumchecker": "^3.0.1",
"terser-webpack-plugin": "^3.0.1",
"terser-webpack-plugin": "^3.0.2",
"time-grunt": "2.0.0",
"url-loader": "^4.1.0",
"webpack": "^4.43.0",
"webpack-bundle-analyzer": "^3.7.0",
"webpack-bundle-analyzer": "^3.8.0",
"webpack-dev-server": "^3.11.0"
},
"optionalDependencies": {
"grunt-appdmg": "github:keeweb/grunt-appdmg#874ad83",
"keytar": "^5.6.0"
"keytar": "^6.0.1"
},
"scripts": {
"start": "grunt",