Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-20 15:26:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make password management errors immediately fatal

Browse source
This commit is contained in:
Ben Gotow 2017-11-30 17:07:23 +00:00
parent e72ca4bb2b
commit 114dc47535
4 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -72,3 +72,4 @@ client_secret.json
**.so*
**.bin
**.tar.gz
/app/mailsync.dSYM

1
app/internal_packages/composer-templates/lib/template-store.es6
View file

@ -154,6 +154,7 @@ class TemplateStore extends MailspringStore {
const dialog = require('electron').remote.dialog;
dialog.showErrorBox('Template Creation Error', message);
}
_displayDialog(title, message, buttons) {
const dialog = require('electron').remote.dialog;
return (

1
app/src/flux/stores/identity-store.es6
View file

@ -80,6 +80,7 @@ class IdentityStore extends MailspringStore {
if (nextToken && nextToken !== this._identity.token) {
// Note: We /must/ await this because calling config.set below
// will try to retrieve the password via getPassword.
// If this fails, the app may quit here.
await KeyManager.replacePassword(KEYCHAIN_NAME, nextToken);
}

31
app/src/key-manager.es6
View file

@ -23,7 +23,7 @@ class KeyManager {
delete keys[`${account.emailAddress}-refresh-token`];
await this._writeKeyHash(keys);
} catch (err) {
this._handleError(err);
this._reportFatalError(err);
}
}
@ -35,7 +35,7 @@ class KeyManager {
keys[`${account.emailAddress}-refresh-token`] = account.settings.refresh_token;
await this._writeKeyHash(keys);
} catch (err) {
this._handleError(err);
this._reportFatalError(err);
}
const next = account.clone();
delete next.settings.imap_password;
@ -59,7 +59,7 @@ class KeyManager {
keys[keyName] = newVal;
await this._writeKeyHash(keys);
} catch (err) {
this._handleError(err);
this._reportFatalError(err);
}
}
@ -69,7 +69,7 @@ class KeyManager {
delete keys[keyName];
await this._writeKeyHash(keys);
} catch (err) {
this._handleError(err);
this._reportFatalError(err);
}
}
@ -78,7 +78,7 @@ class KeyManager {
const keys = await this._getKeyHash();
return keys[keyName];
} catch (err) {
this._handleError(err);
this._reportFatalError(err);
}
}
@ -95,12 +95,21 @@ class KeyManager {
await keytar.setPassword(this.SERVICE_NAME, this.KEY_NAME, JSON.stringify(keys));
}
_handleError(err) {
remote.dialog.showErrorBox(
'Password Management Error',
"We couldn't store your password securely! For more information, visit http://support.getmailspring.com/hc/en-us/articles/115001875571"
);
AppEnv.reportError(err);
_reportFatalError(err) {
let more = '';
if (process.platform === 'linux') {
more = 'Make sure you have `libsecret` installed and a keyring is present. ';
}
remote.dialog.showMessageBox({
type: 'error',
buttons: ['Quit'],
message: `Mailspring could not store your password securely. ${more} For more information, visit http://support.getmailspring.com/hc/en-us/articles/115001875571`,
});
// tell the app to exit and rethrow the error to ensure code relying
// on the passwords being saved never runs (saving identity for example)
remote.app.quit();
throw err;
}
}