mirror of https://github.com/keeweb/keeweb
upgraded modules, fixed argon2
antelle
parent
77ffb13549
commit
91a15c4b5e
|
|
@ -20,7 +20,8 @@
|
|||
"no-mixed-operators": "off",
|
||||
"prefer-promise-reject-errors": "off",
|
||||
"standard/no-callback-literal": "off",
|
||||
"import/no-webpack-loader-syntax": "off"
|
||||
"import/no-webpack-loader-syntax": "off",
|
||||
"object-curly-spacing": "off"
|
||||
},
|
||||
"parserOptions": {
|
||||
"sourceType": "module",
|
||||
|
|
|
|||
13
Gruntfile.js
13
Gruntfile.js
|
|
@ -3,6 +3,8 @@
|
|||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
|
||||
const sass = require('node-sass');
|
||||
|
||||
const StringReplacePlugin = require('string-replace-webpack-plugin');
|
||||
const StatsPlugin = require('stats-webpack-plugin');
|
||||
|
||||
|
|
@ -46,7 +48,7 @@ module.exports = function(grunt) {
|
|||
entry: {
|
||||
app: 'app',
|
||||
vendor: ['jquery', 'underscore', 'backbone', 'kdbxweb', 'baron', 'pikaday', 'file-saver', 'jsqrcode',
|
||||
'argon2-wasm', 'argon2-browser']
|
||||
'argon2-wasm', 'argon2']
|
||||
},
|
||||
output: {
|
||||
path: path.resolve('.', 'tmp/js'),
|
||||
|
|
@ -71,7 +73,7 @@ module.exports = function(grunt) {
|
|||
pikaday: 'pikaday/pikaday.js',
|
||||
filesaver: 'FileSaver.js/FileSaver.min.js',
|
||||
qrcode: 'jsqrcode/dist/qrcode.min.js',
|
||||
'argon2': 'argon2-browser/docs/dist/argon2.min.js',
|
||||
argon2: 'argon2-browser/dist/argon2.min.js',
|
||||
hbs: 'handlebars/runtime.js',
|
||||
'argon2-wasm': 'argon2-browser/dist/argon2.wasm',
|
||||
templates: path.join(__dirname, 'app/templates')
|
||||
|
|
@ -100,7 +102,7 @@ module.exports = function(grunt) {
|
|||
},
|
||||
{ test: /\.json$/, loader: 'json-loader' },
|
||||
{ test: /argon2\.wasm$/, loader: 'base64-loader' },
|
||||
{ test: /argon2\.min\.js/, loader: 'raw-loader' },
|
||||
{ test: /argon2(\.min)?\.js/, loader: 'raw-loader' },
|
||||
{ test: /\.scss$/, loader: 'raw-loader' }
|
||||
]
|
||||
},
|
||||
|
|
@ -142,7 +144,7 @@ module.exports = function(grunt) {
|
|||
baron: 'baron/baron.js',
|
||||
filesaver: 'FileSaver.js/FileSaver.js',
|
||||
qrcode: 'jsqrcode/dist/qrcode.js',
|
||||
'argon2': 'argon2-browser/docs/dist/argon2.js'
|
||||
argon2: 'argon2-browser/dist/argon2.js'
|
||||
})
|
||||
})
|
||||
});
|
||||
|
|
@ -271,7 +273,8 @@ module.exports = function(grunt) {
|
|||
sass: {
|
||||
options: {
|
||||
sourceMap: false,
|
||||
includePaths: ['./node_modules']
|
||||
includePaths: ['./node_modules'],
|
||||
implementation: sass
|
||||
},
|
||||
dist: {
|
||||
files: {
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ const Launcher = {
|
|||
return this.req('path').join(...parts);
|
||||
},
|
||||
writeFile: function(path, data, callback) {
|
||||
this.req('fs').writeFile(path, new window.Buffer(data), callback);
|
||||
this.req('fs').writeFile(path, window.Buffer.from(data), callback);
|
||||
},
|
||||
readFile: function(path, encoding, callback) {
|
||||
this.req('fs').readFile(path, encoding, (err, contents) => {
|
||||
|
|
|
|||
|
|
@ -226,7 +226,7 @@ const Updater = {
|
|||
const verify = Launcher.req('crypto').createVerify('RSA-SHA256');
|
||||
verify.write(zipFileData.slice(0, zip.centralDirectory.headerOffset + 22));
|
||||
verify.end();
|
||||
const signature = new window.Buffer(zip.comment, 'hex');
|
||||
const signature = window.Buffer.from(zip.comment, 'hex');
|
||||
if (!verify.verify(publicKey, signature)) {
|
||||
return 'Invalid signature';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -132,8 +132,7 @@ const GroupModel = MenuItemModel.extend({
|
|||
return (filter && filter.includeDisabled ||
|
||||
this.group.enableSearching !== false &&
|
||||
!this.group.uuid.equals(this.file.db.meta.entryTemplatesGroup)
|
||||
) &&
|
||||
(!filter || !filter.autoType || this.group.enableAutoType !== false);
|
||||
) && (!filter || !filter.autoType || this.group.enableAutoType !== false);
|
||||
},
|
||||
|
||||
getOwnSubGroups: function() {
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ const KdbxwebInit = {
|
|||
const loadTimeout = setTimeout(() => reject('timeout'), 5000);
|
||||
try {
|
||||
const ts = logger.ts();
|
||||
const argon2LoaderCode = require('argon2-browser');
|
||||
const argon2LoaderCode = require('argon2');
|
||||
const wasmBinaryBase64 = require('argon2-wasm');
|
||||
|
||||
const KB = 1024 * 1024;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
60
package.json
60
package.json
|
|
@ -11,8 +11,8 @@
|
|||
},
|
||||
"dependencies": {},
|
||||
"devDependencies": {
|
||||
"argon2-browser": "1.3.0",
|
||||
"babel-core": "6.25.0",
|
||||
"argon2-browser": "1.5.2",
|
||||
"babel-core": "6.26.3",
|
||||
"babel-loader": "7.0.0",
|
||||
"babel-preset-es2015": "6.24.1",
|
||||
"backbone": "1.3.3",
|
||||
|
|
@ -21,59 +21,59 @@
|
|||
"bourbon": "4.2.7",
|
||||
"cssnano": "3.10.0",
|
||||
"electron": "^1.7.9",
|
||||
"eslint": "^3.19.0",
|
||||
"eslint-config-standard": "10.2.1",
|
||||
"eslint-plugin-import": "^2.3.0",
|
||||
"eslint-plugin-node": "^5.0.0",
|
||||
"eslint-plugin-promise": "3.5.0",
|
||||
"eslint-plugin-standard": "3.0.1",
|
||||
"eslint": "^5.12.0",
|
||||
"eslint-config-standard": "12.0.0",
|
||||
"eslint-plugin-import": "^2.14.0",
|
||||
"eslint-plugin-node": "^8.0.1",
|
||||
"eslint-plugin-promise": "4.0.1",
|
||||
"eslint-plugin-standard": "4.0.0",
|
||||
"exports-loader": "0.6.4",
|
||||
"file-saver": "1.3.3",
|
||||
"font-awesome": "4.7.0",
|
||||
"get-folder-size": "1.0.0",
|
||||
"grunt": "1.0.1",
|
||||
"grunt": "1.0.3",
|
||||
"grunt-concurrent": "2.3.1",
|
||||
"grunt-contrib-clean": "1.1.0",
|
||||
"grunt-contrib-clean": "2.0.0",
|
||||
"grunt-contrib-compress": "1.4.3",
|
||||
"grunt-contrib-copy": "1.0.0",
|
||||
"grunt-contrib-deb": "github:keeweb/grunt-contrib-deb#e9b6e9f",
|
||||
"grunt-contrib-htmlmin": "2.4.0",
|
||||
"grunt-contrib-uglify": "3.0.1",
|
||||
"grunt-contrib-watch": "1.0.0",
|
||||
"grunt-electron": "5.0.0",
|
||||
"grunt-eslint": "19.0.0",
|
||||
"grunt-contrib-htmlmin": "3.0.0",
|
||||
"grunt-contrib-uglify": "4.0.0",
|
||||
"grunt-contrib-watch": "1.1.0",
|
||||
"grunt-electron": "9.0.1",
|
||||
"grunt-eslint": "21.0.0",
|
||||
"grunt-gitinfo": "0.1.8",
|
||||
"grunt-inline-alt": "0.3.10",
|
||||
"grunt-postcss": "0.8.0",
|
||||
"grunt-sass": "2.0.0",
|
||||
"grunt-postcss": "0.9.0",
|
||||
"grunt-sass": "3.0.2",
|
||||
"grunt-string-replace": "1.3.1",
|
||||
"grunt-webpack": "2.0.1",
|
||||
"handlebars": "4.0.10",
|
||||
"handlebars-loader": "1.5.0",
|
||||
"grunt-webpack": "3.1.3",
|
||||
"handlebars": "4.0.12",
|
||||
"handlebars-loader": "1.7.1",
|
||||
"html-minifier": "3.5.2",
|
||||
"jquery": "3.1.1",
|
||||
"jquery": "3.3.1",
|
||||
"json-loader": "^0.5.4",
|
||||
"jsqrcode": "github:antelle/jsqrcode#0.1.3",
|
||||
"kdbxweb": "1.2.2",
|
||||
"load-grunt-tasks": "3.5.2",
|
||||
"node-sass": "^4.5.3",
|
||||
"node-stream-zip": "1.3.7",
|
||||
"kdbxweb": "1.2.6",
|
||||
"load-grunt-tasks": "4.0.0",
|
||||
"node-sass": "^4.11.0",
|
||||
"node-stream-zip": "1.7.0",
|
||||
"normalize.css": "5.0.0",
|
||||
"pikaday": "1.5.1",
|
||||
"pkcs15-smartcard-sign": "^1.0.0",
|
||||
"raw-loader": "0.5.1",
|
||||
"stats-webpack-plugin": "0.6.0",
|
||||
"stats-webpack-plugin": "0.7.0",
|
||||
"string-replace-webpack-plugin": "0.1.3",
|
||||
"strip-sourcemap-loader": "0.0.1",
|
||||
"sumchecker": "^2.0.2",
|
||||
"time-grunt": "1.4.0",
|
||||
"uglify-loader": "2.0.0",
|
||||
"time-grunt": "2.0.0",
|
||||
"uglify-loader": "3.0.0",
|
||||
"webpack": "^2.6.1",
|
||||
"webpack-dev-server": "^2.4.5"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"grunt-appdmg": "0.4.0",
|
||||
"keytar": "^4.0.3"
|
||||
"grunt-appdmg": "1.0.0",
|
||||
"keytar": "^4.3.0"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "grunt",
|
||||
|
|
|
|||
Loading…
Reference in New Issue