mirror of
https://github.com/Foundry376/Mailspring.git
synced 2024-09-23 08:46:07 +08:00
40f9e5172a
* Fix private key email-adder, add "no private key" error The decrypt UI is seriously confusing some people. This commit adds an error message that should at least stop them from trying to decrypt a message without a private key to speak of. Also, there was a dumb hardcoded true in validAddress. * Adds incorrect passphrase notification; enables carriage return for popover The passphrase popover was woefully inadequate. It didn't tell users when they had the wrong password - it just closed without saying anything - and you couldn't even use carriage return to submit the password. This commit fixes those mistakes by buffing out passphrase-popover.cjsx. * Adds private key popover to decrypt button The decrypt UI was confusing and didn't provide the user with an option to get a key imported from the message view. This mondo commit adds an entirely new popover so that the user never again will be forced to go to the preferences page. * Adds more forgiving encrypted block parsing * Overhauls decryption error handling The decrypt UI didn't clearly communicate error messages from the failure in PGPKeyStore.decrypt up to the user. This commit adds nice error surfacing as well as some pretty colors. * Fix encrypt modal key miscount error via getKeyContents coercion On Linux and Windows, fs.watch double-triggers on some actions in the key folder, for reasons that aren't super clear. This was causing issues where the encrypt modal would report not having a key loaded even though the key was totally loaded and saved. This commit sort of kludgily forces the modal to run getKeyContents for every key it has saved right before it returns them all. This would probably be better fixed with a refactor the the PGP Keystore. * remember to close popover, d'oh * patch key picker modal styling for Linux and Windows * response to review
81 lines
2.6 KiB
CoffeeScript
81 lines
2.6 KiB
CoffeeScript
{React, Actions} = require 'nylas-exports'
|
|
Identity = require './identity'
|
|
PGPKeyStore = require './pgp-key-store'
|
|
_ = require 'underscore'
|
|
fs = require 'fs'
|
|
pgp = require 'kbpgp'
|
|
|
|
module.exports =
|
|
class PassphrasePopover extends React.Component
|
|
constructor: ->
|
|
@state = {
|
|
passphrase: ""
|
|
placeholder: "PGP private key password"
|
|
error: false
|
|
mounted: true
|
|
}
|
|
|
|
componentDidMount: ->
|
|
@_mounted = true
|
|
|
|
componentWillUnmount: ->
|
|
@_mounted = false
|
|
|
|
@propTypes:
|
|
identity: React.PropTypes.instanceOf(Identity)
|
|
addresses: React.PropTypes.array
|
|
|
|
render: ->
|
|
classNames = if @state.error then "key-passphrase-input form-control bad-passphrase" else "key-passphrase-input form-control"
|
|
<div className="passphrase-popover">
|
|
<input type="password" value={@state.passphrase} placeholder={@state.placeholder} className={classNames} onChange={@_onPassphraseChange} onKeyUp={@_onKeyUp} />
|
|
<button className="btn btn-toolbar" onClick={@_validatePassphrase}>Done</button>
|
|
</div>
|
|
|
|
_onPassphraseChange: (event) =>
|
|
@setState
|
|
passphrase: event.target.value
|
|
placeholder: "PGP private key password"
|
|
error: false
|
|
|
|
_onKeyUp: (event) =>
|
|
if event.keyCode == 13
|
|
@_validatePassphrase()
|
|
|
|
_validatePassphrase: () =>
|
|
passphrase = @state.passphrase
|
|
for emailIndex of @props.addresses
|
|
email = @props.addresses[emailIndex]
|
|
privateKeys = PGPKeyStore.privKeys(address: email, timed: false)
|
|
for keyIndex of privateKeys
|
|
# check to see if the password unlocks the key
|
|
key = privateKeys[keyIndex]
|
|
fs.readFile(key.keyPath, (err, data) =>
|
|
pgp.KeyManager.import_from_armored_pgp {
|
|
armored: data
|
|
}, (err, km) =>
|
|
if err
|
|
console.warn err
|
|
else
|
|
km.unlock_pgp { passphrase: passphrase }, (err) =>
|
|
if err
|
|
if parseInt(keyIndex, 10) == privateKeys.length - 1
|
|
if parseInt(emailIndex, 10) == @props.addresses.length - 1
|
|
# every key has been tried, the password failed on all of them
|
|
if @_mounted
|
|
@setState
|
|
passphrase: ""
|
|
placeholder: "Incorrect password"
|
|
error: true
|
|
else
|
|
# the password unlocked a key; that key should be used
|
|
@_onDone()
|
|
)
|
|
|
|
_onDone: =>
|
|
if @props.identity?
|
|
@props.onPopoverDone(@state.passphrase, @props.identity)
|
|
else
|
|
@props.onPopoverDone(@state.passphrase)
|
|
Actions.closePopover()
|