Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-22 22:49:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

user: use fixed salt to derive key for encryption

Browse Source
This commit is contained in:
thecodrr
2020-04-13 15:36:51 +05:00
parent ffa1e3b15c
commit a462a02f56
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/database/storage.js
View File

@@ -23,7 +23,7 @@ export default class Storage {
decrypt(password, cipher) { decrypt(password, cipher) {
return this.storage.decrypt(password, cipher); return this.storage.decrypt(password, cipher);
} }
deriveKey(password) { deriveKey(password, salt) {
return this.storage.deriveKey(password, null, true); return this.storage.deriveKey(password, salt, true);
} }
} }

6
packages/core/models/user.js
View File

@@ -16,7 +16,7 @@ export default class User {
async key() { async key() {
const user = await this.get(); const user = await this.get();
return user.key; return { key: user.key, salt: user.salt };
} }
async set(user) { async set(user) {
@@ -31,7 +31,7 @@ export default class User {
password, password,
grant_type: "password", grant_type: "password",
}); });
const key = await this.context.deriveKey(password); const key = await this.context.deriveKey(password, response.payload.salt);
let user = userFromResponse(response, key); let user = userFromResponse(response, key);
await this.context.write("user", user); await this.context.write("user", user);
} }
@@ -69,7 +69,7 @@ export default class User {
password, password,
email, email,
}); });
const key = await this.context.deriveKey(password); const key = await this.context.deriveKey(password, response.payload.salt);
let user = userFromResponse(response, key); let user = userFromResponse(response, key);
await this.context.write("user", user); await this.context.write("user", user);
} }