m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Began moving salt into encryptor

Browse Source
This commit is contained in:
Dan Finlay 2016-11-22 09:52:43 -08:00
parent ecfda5bcc5
commit 136296aad6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/scripts/keyring-controller.js
View File

@ -55,7 +55,7 @@ module.exports = class KeyringController extends EventEmitter {
return { return {
seedWords: this.configManager.getSeedWords(), seedWords: this.configManager.getSeedWords(),
isInitialized: (!!wallet || !!vault), isInitialized: (!!wallet || !!vault),
isUnlocked: !!this.key, isUnlocked: this.keyrings.length > 0,
isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(), // AUDIT this.configManager.getConfirmedDisclaimer(), isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(), // AUDIT this.configManager.getConfirmedDisclaimer(),
unconfTxs: this.configManager.unconfirmedTxs(), unconfTxs: this.configManager.unconfirmedTxs(),
transactions: this.configManager.getTxList(), transactions: this.configManager.getTxList(),
@ -137,7 +137,7 @@ module.exports = class KeyringController extends EventEmitter {
createNewVault (password, entropy, cb) { createNewVault (password, entropy, cb) {
const configManager = this.configManager const configManager = this.configManager
const salt = this.encryptor.generateSalt() const salt = this.getSalt()
configManager.setSalt(salt) configManager.setSalt(salt)
return this.migrateAndGetKey(password) return this.migrateAndGetKey(password)
@ -182,7 +182,7 @@ module.exports = class KeyringController extends EventEmitter {
submitPassword (password, cb) { submitPassword (password, cb) {
this.migrateAndGetKey(password) this.migrateAndGetKey(password)
.then((key) => { .then((key) => {
return this.unlockKeyrings(key) return this.unlockKeyrings(password)
}) })
.then((keyrings) => { .then((keyrings) => {
this.keyrings = keyrings this.keyrings = keyrings
@ -197,7 +197,7 @@ module.exports = class KeyringController extends EventEmitter {
} }
loadKey (password) { loadKey (password) {
const salt = this.configManager.getSalt() || this.encryptor.generateSalt() const salt = this.getSalt()
return this.encryptor.keyFromPassword(password + salt) return this.encryptor.keyFromPassword(password + salt)
.then((key) => { .then((key) => {
this.key = key this.key = key
@ -206,6 +206,11 @@ module.exports = class KeyringController extends EventEmitter {
}) })
} }
getSalt () {
const vault = this.configManager.getVault()
const salt = vault.salt || this.encryptor.generateSalt()
}
addNewKeyring (type, opts, cb) { addNewKeyring (type, opts, cb) {
const Keyring = this.getKeyringClassForType(type) const Keyring = this.getKeyringClassForType(type)
const keyring = new Keyring(opts) const keyring = new Keyring(opts)
@ -288,7 +293,7 @@ module.exports = class KeyringController extends EventEmitter {
}) })
} }
unlockKeyrings (key) { unlockKeyrings (password) {
const encryptedVault = this.configManager.getVault() const encryptedVault = this.configManager.getVault()
return this.encryptor.decryptWithKey(key, encryptedVault) return this.encryptor.decryptWithKey(key, encryptedVault)
.then((vault) => { .then((vault) => {