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

Merge branch 'master' into develop 

# Conflicts:
#	release-notes.md
pull/1348/head
antelle 2019-10-16 22:49:45 +02:00
parent 57af428b9e 92215e8817
commit 7a22746f67
8 changed files with 140 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/scripts/storage/impl/storage-webdav.js
View File

@ -100,9 +100,9 @@ class StorageWebDav extends StorageBase {
const that = this;
this._request(
{
...saveOpts,
op: 'Save:stat',
method: 'HEAD',
...saveOpts
method: 'HEAD'
},
(err, xhr, stat) => {
let useTmpPath = this.appSettings.webdavSaveMethod !== 'put';
@ -120,12 +120,12 @@ class StorageWebDav extends StorageBase {
if (useTmpPath) {
that._request(
{
...saveOpts,
op: 'Save:put',
method: 'PUT',
path: tmpPath,
data,
nostat: true,
...saveOpts
nostat: true
},
err => {
if (err) {
@ -133,17 +133,17 @@ class StorageWebDav extends StorageBase {
}
that._request(
{
...saveOpts,
op: 'Save:stat',
method: 'HEAD',
...saveOpts
method: 'HEAD'
},
(err, xhr, stat) => {
if (err) {
that._request({
...saveOpts,
op: 'Save:delete',
method: 'DELETE',
path: tmpPath,
...saveOpts
path: tmpPath
});
return cb(err, xhr, stat);
}
@ -156,10 +156,10 @@ class StorageWebDav extends StorageBase {
rev
);
that._request({
...saveOpts,
op: 'Save:delete',
method: 'DELETE',
path: tmpPath,
...saveOpts
path: tmpPath
});
return cb({ revConflict: true }, xhr, stat);
}
@ -176,6 +176,7 @@ class StorageWebDav extends StorageBase {
}
that._request(
{
...saveOpts,
op: 'Save:move',
method: 'MOVE',
path: tmpPath,
@ -183,8 +184,7 @@ class StorageWebDav extends StorageBase {
headers: {
Destination: encodeURI(movePath),
'Overwrite': 'T'
},
...saveOpts
}
},
err => {
if (err) {
@ -192,9 +192,9 @@ class StorageWebDav extends StorageBase {
}
that._request(
{
...saveOpts,
op: 'Save:stat',
method: 'HEAD',
...saveOpts
method: 'HEAD'
},
(err, xhr, stat) => {
cb(err, xhr, stat);
@ -209,11 +209,11 @@ class StorageWebDav extends StorageBase {
} else {
that._request(
{
...saveOpts,
op: 'Save:put',
method: 'PUT',
data,
nostat: true,
...saveOpts
nostat: true
},
err => {
if (err) {
@ -221,9 +221,9 @@ class StorageWebDav extends StorageBase {
}
that._request(
{
...saveOpts,
op: 'Save:stat',
method: 'HEAD',
...saveOpts
method: 'HEAD'
},
(err, xhr, stat) => {
cb(err, xhr, stat);

1
app/scripts/util/features.js
View File

@ -16,6 +16,7 @@ const Features = {
!isDesktop &&
!/^http(s?):\/\/((localhost:8085)|((app|beta)\.keeweb\.info))/.test(location.href),
needFixClicks: /Edge\/14/.test(navigator.appVersion),
canUseWasmInWebWorker: !isDesktop && !/Chrome/.test(navigator.appVersion),
supportsTitleBarStyles() {
return this.isMac;

170
app/scripts/util/kdbxweb/kdbxweb-init.js
View File

@ -1,5 +1,6 @@
import kdbxweb from 'kdbxweb';
import { Logger } from 'util/logger';
import { Features } from 'util/features';
const logger = new Logger('argon2');
@ -43,69 +44,116 @@ const KdbxwebInit = {
totalMemory
);
const memoryDecl = `var wasmMemory=new WebAssembly.Memory({initial:${initialMemory},maximum:${totalMemory}});`;
const moduleDecl =
'var Module={' +
'wasmJSMethod: "native-wasm",' +
'wasmBinary: Uint8Array.from(atob("' +
wasmBinaryBase64 +
'"), c => c.charCodeAt(0)),' +
'print(...args) { postMessage({op:"log",args}) },' +
'printErr(...args) { postMessage({op:"log",args}) },' +
'postRun:' +
this.workerPostRun.toString() +
',' +
'calcHash:' +
this.calcHash.toString() +
',' +
'wasmMemory:wasmMemory,' +
'buffer:wasmMemory.buffer,' +
'TOTAL_MEMORY:' +
initialMemory * WASM_PAGE_SIZE +
'}';
const script = argon2LoaderCode.replace(/^var Module.*?}/, memoryDecl + moduleDecl);
const blob = new Blob([script], { type: 'application/javascript' });
const objectUrl = URL.createObjectURL(blob);
const worker = new Worker(objectUrl);
const onMessage = e => {
switch (e.data.op) {
case 'log':
logger.debug(...e.data.args);
break;
case 'postRun':
logger.debug('WebAssembly runtime loaded', logger.ts(ts));
URL.revokeObjectURL(objectUrl);
if (Features.canUseWasmInWebWorker) {
const memoryDecl = `var wasmMemory=new WebAssembly.Memory({initial:${initialMemory},maximum:${totalMemory}});`;
const moduleDecl =
'var Module={' +
'wasmJSMethod: "native-wasm",' +
'wasmBinary: Uint8Array.from(atob("' +
wasmBinaryBase64 +
'"), c => c.charCodeAt(0)),' +
'print(...args) { postMessage({op:"log",args}) },' +
'printErr(...args) { postMessage({op:"log",args}) },' +
'postRun:' +
this.workerPostRun.toString() +
',' +
'calcHash:' +
this.calcHash.toString() +
',' +
'wasmMemory:wasmMemory,' +
'buffer:wasmMemory.buffer,' +
'TOTAL_MEMORY:' +
initialMemory * WASM_PAGE_SIZE +
'}';
const script = argon2LoaderCode.replace(
/^var Module.*?}/,
memoryDecl + moduleDecl
);
const blob = new Blob([script], { type: 'application/javascript' });
const objectUrl = URL.createObjectURL(blob);
const worker = new Worker(objectUrl);
const onMessage = e => {
switch (e.data.op) {
case 'log':
logger.debug(...e.data.args);
break;
case 'postRun':
logger.debug(
'WebAssembly runtime loaded (web worker)',
logger.ts(ts)
);
URL.revokeObjectURL(objectUrl);
clearTimeout(loadTimeout);
worker.removeEventListener('message', onMessage);
this.runtimeModule = {
hash(args) {
return new Promise((resolve, reject) => {
worker.postMessage(args);
const onHashMessage = e => {
worker.removeEventListener(
'message',
onHashMessage
);
worker.terminate();
KdbxwebInit.runtimeModule = null;
if (!e.data || e.data.error || !e.data.hash) {
const ex =
(e.data && e.data.error) ||
'unexpected error';
logger.error('Worker error', ex);
reject(ex);
} else {
resolve(e.data.hash);
}
};
worker.addEventListener('message', onHashMessage);
});
}
};
resolve(this.runtimeModule);
break;
default:
logger.error('Unknown message', e.data);
URL.revokeObjectURL(objectUrl);
reject('Load error');
}
};
worker.addEventListener('message', onMessage);
} else {
// Chrome and Electron crash if we use WASM in WebWorker
// see https://github.com/keeweb/keeweb/issues/1263
const wasmMemory = new WebAssembly.Memory({
initial: initialMemory,
maximum: totalMemory
});
global.Module = {
wasmJSMethod: 'native-wasm',
wasmBinary: Uint8Array.from(atob(wasmBinaryBase64), c => c.charCodeAt(0)),
print(...args) {
logger.debug(...args);
},
printErr(...args) {
logger.debug(...args);
},
postRun: () => {
logger.debug('WebAssembly runtime loaded (main thread)', logger.ts(ts));
clearTimeout(loadTimeout);
worker.removeEventListener('message', onMessage);
this.runtimeModule = {
hash(args) {
return new Promise((resolve, reject) => {
worker.postMessage(args);
const onHashMessage = e => {
worker.removeEventListener('message', onHashMessage);
worker.terminate();
KdbxwebInit.runtimeModule = null;
if (!e.data || e.data.error || !e.data.hash) {
const ex =
(e.data && e.data.error) || 'unexpected error';
logger.error('Worker error', ex);
reject(ex);
}
resolve(e.data.hash);
};
worker.addEventListener('message', onHashMessage);
});
resolve({
hash: args => {
const hash = this.calcHash(global.Module, args);
global.Module.unloadRuntime();
global.Module = undefined;
return Promise.resolve(hash);
}
};
resolve(this.runtimeModule);
break;
default:
logger.error('Unknown message', e.data);
URL.revokeObjectURL(objectUrl);
reject('Load error');
}
};
worker.addEventListener('message', onMessage);
});
},
wasmMemory,
buffer: wasmMemory.buffer,
TOTAL_MEMORY: initialMemory * WASM_PAGE_SIZE
};
// eslint-disable-next-line no-eval
eval(argon2LoaderCode);
}
} catch (err) {
reject(err);
}

2
desktop/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "KeeWeb",
"version": "1.11.9",
"version": "1.11.10",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
desktop/package.json
View File

@ -1,6 +1,6 @@
{
"name": "KeeWeb",
"version": "1.11.9",
"version": "1.11.10",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "main.js",
"homepage": "https://keeweb.info",

8
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "keeweb",
"version": "1.11.9",
"version": "1.11.10",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -1369,9 +1369,9 @@
}
},
"argon2-browser": {
"version": "1.11.1",
"resolved": "https://registry.npmjs.org/argon2-browser/-/argon2-browser-1.11.1.tgz",
"integrity": "sha512-C+WsBLSkwQExkDYB7vriugrBTXq2z+fTRDlGWqr2zm89TaKo7zYtSGARMgoBxpDnmNNzduNlZJmpY2j0Dp7ZOQ=="
"version": "1.12.0",
"resolved": "https://registry.npmjs.org/argon2-browser/-/argon2-browser-1.12.0.tgz",
"integrity": "sha512-qdEW311acXGGLTjslqO5f7cKG3foP6QUkeuav9au00aRY/B5AvNrqAVlL47a2MUdr6i7dx8Xp+5OreRGoXvCgQ=="
},
"argparse": {
"version": "1.0.10",

4
package.json
View File

@ -1,6 +1,6 @@
{
"name": "keeweb",
"version": "1.11.9",
"version": "1.11.10",
"description": "Free cross-platform password manager compatible with KeePass",
"main": "Gruntfile.js",
"private": true,
@ -14,7 +14,7 @@
"@babel/plugin-external-helpers": "^7.2.0",
"@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/preset-env": "^7.6.2",
"argon2-browser": "1.11.1",
"argon2-browser": "1.12.0",
"autoprefixer": "^9.6.1",
"babel-cli": "^6.26.0",
"babel-eslint": "^10.0.3",

4
release-notes.md
View File

@ -9,6 +9,10 @@ Release notes
`+` #480: option to launch the app minimized
`-` fix #1273: untranslated menu items
##### v1.11.10 (2019-10-16)
`-` fix #1305: WebDAV issues
`-` fix #1263: desktop apps crashes when argon2 is used
##### v1.11.9 (2019-10-13)
`-` fix #1300: selecting auto-type sequence items issues
`-` fix #1290: generator popup positioning in custom themes