Skip to content

Commit

Permalink
Fixes backup keys export/import; improves print flow
Browse files Browse the repository at this point in the history
Resolves brave#13274
Resolves brave#7512
Resolves brave#7511
Resolves brave#11419

Auditors:

Test Plan:
  • Loading branch information
NejcZdovc committed Feb 23, 2018
1 parent e1738ad commit 6c186ec
Show file tree
Hide file tree
Showing 11 changed files with 149 additions and 22 deletions.
63 changes: 41 additions & 22 deletions app/browser/api/ledger.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const config = require('../../../js/constants/buildConfig')
const tabs = require('../../browser/tabs')
const locale = require('../../locale')
const getSetting = require('../../../js/settings').getSetting
const {fileUrl, getSourceAboutUrl, isSourceAboutUrl} = require('../../../js/lib/appUrlUtil')
const {getSourceAboutUrl, isSourceAboutUrl} = require('../../../js/lib/appUrlUtil')
const urlParse = require('../../common/urlParse')
const ruleSolver = require('../../extensions/brave/content/scripts/pageInformation')
const request = require('../../../js/lib/request')
Expand All @@ -48,6 +48,7 @@ const ledgerNotifications = require('./ledgerNotifications')
const ledgerVideoCache = require('../../common/cache/ledgerVideoCache')
const updater = require('../../updater')
const promoCodeFirstRunStorage = require('../../promoCodeFirstRunStorage')
const appUrlUtil = require('../../../js/lib/appUrlUtil')

// Caching
let locationDefault = 'NOOP'
Expand Down Expand Up @@ -250,7 +251,7 @@ const onBootStateFile = (state) => {
}

const promptForRecoveryKeyFile = () => {
const defaultRecoveryKeyFilePath = path.join(electron.app.getPath('userData'), '/brave_wallet_recovery.txt')
const defaultRecoveryKeyFilePath = path.join(electron.app.getPath('downloads'), '/brave_wallet_recovery.txt')
if (process.env.SPECTRON) {
// skip the dialog for tests
console.log(`for test, trying to recover keys from path: ${defaultRecoveryKeyFilePath}`)
Expand All @@ -264,7 +265,7 @@ const promptForRecoveryKeyFile = () => {
extensions: [['txt']],
includeAllFiles: false
}, (files) => {
return (files && files.length ? files[0] : null)
appActions.onFileRecoveryKeys((files && files.length ? files[0] : null))
})
}
}
Expand Down Expand Up @@ -1049,37 +1050,54 @@ const backupKeys = (state, backupAction) => {
]

const message = messageLines.join(os.EOL)
const filePath = path.join(electron.app.getPath('userData'), '/brave_wallet_recovery.txt')
const defaultFilePath = path.join(electron.app.getPath('downloads'), '/brave_wallet_recovery.txt')

const fs = require('fs')
fs.writeFile(filePath, message, (err) => {
if (err) {
console.error(err)
} else {
tabs.create({url: fileUrl(filePath)}, (webContents) => {
if (backupAction === 'print') {
webContents.print({silent: false, printBackground: false})
} else {
webContents.downloadURL(fileUrl(filePath), true)

if (backupAction === 'print') {
tabs.create({url: appUrlUtil.aboutUrls.get('about:printkeys')})
return
}

const dialog = electron.dialog
const BrowserWindow = electron.BrowserWindow

dialog.showDialog(BrowserWindow.getFocusedWindow(), {
type: 'select-saveas-file',
defaultPath: defaultFilePath,
extensions: [['txt']],
includeAllFiles: false
}, (files) => {
const file = files && files.length ? files[0] : null
if (file) {
fs.writeFileSync(file, message, (err) => {
if (err) {
console.error('Problem saving backup keys')
}
})
}
})
}

const fileRecoveryKeys = (state, recoveryKeyFile) => {
if (!recoveryKeyFile) {
// user canceled from dialog, we abort without error
return state
}

const result = loadKeysFromBackupFile(state, recoveryKeyFile)
const recoveryKey = result.recoveryKey || ''
state = result.state

return recoverKeys(state, false, recoveryKey)
}

const recoverKeys = (state, useRecoveryKeyFile, key) => {
let recoveryKey

if (useRecoveryKeyFile) {
let recoveryKeyFile = promptForRecoveryKeyFile()
if (!recoveryKeyFile) {
// user canceled from dialog, we abort without error
return state
}

const result = loadKeysFromBackupFile(state, recoveryKeyFile)
recoveryKey = result.recoveryKey || ''
state = result.state
promptForRecoveryKeyFile()
return state
}

if (!recoveryKey) {
Expand Down Expand Up @@ -2755,6 +2773,7 @@ const getMethods = () => {
claimPromotion,
onPromotionResponse,
getBalance,
fileRecoveryKeys,
getPromotion,
onPublisherTimestamp,
checkVerifiedStatus,
Expand Down
5 changes: 5 additions & 0 deletions app/browser/reducers/ledgerReducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ const ledgerReducer = (state, action, immutableAction) => {
)
break
}
case appConstants.APP_ON_FILE_RECOVERY_KEYS:
{
state = ledgerApi.fileRecoveryKeys(state, action.get('file'))
break
}
case appConstants.APP_SHUTTING_DOWN:
{
state = ledgerApi.quit(state)
Expand Down
5 changes: 5 additions & 0 deletions app/browser/tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,11 @@ const updateAboutDetails = (tabId) => {
sendAboutDetails(tabId, messages.DOWNLOADS_UPDATED, {
downloads: downloads.toJS()
})
} else if (location === 'about:printkeys') {
const phrase = ledgerState.getInfoProp(appState, 'passphrase')
sendAboutDetails(tabId, messages.PRINTKEYS_UPDATED, {
passphrase: phrase
})
} else if (location === 'about:passwords') {
autofill.getAutofillableLogins((result) => {
sendAboutDetails(tabId, messages.PASSWORD_DETAILS_UPDATED, result)
Expand Down
21 changes: 21 additions & 0 deletions app/extensions/brave/about-printkeys.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!DOCTYPE html>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<html>
<head>
<meta charset="utf-8">
<meta name="availableLanguages" content="">
<meta name="defaultLanguage" content="en-US">
<meta name='theme-color' content='#ff5000'>
<meta name="referrer" content="no-referrer">
<link rel="shortcut icon"type="image/x-icon" href="img/favicon.ico">
<title data-l10n-id="printKeysTitle"></title>
<script src="ext/l20n.min.js"></script>
<script src="gen/aboutPages.entry.js" async></script>
<link rel="localization" href="locales/{locale}/app.properties">
</head>
<body>
<div id="appContainer"/>
</body>
</html>
1 change: 1 addition & 0 deletions app/extensions/brave/locales/en-US/app.properties
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ phone=Phone
postalCode=Postal Code
prefsRestart=Do you want to restart now?
preventMoreAlerts=Prevent this page from creating additional dialogs
printKeysTitle=Backup keys
reconciliationNotification=Good news! Brave will pay your favorite publisher sites in less than 24 hours.
redirectedResources={{redirectedResourcesSize}} Resources upgraded to HTTPS
releaseNotes=Release Notes
Expand Down
63 changes: 63 additions & 0 deletions app/renderer/about/ledger/printKeys.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')
const format = require('date-fns/format')
const {StyleSheet, css} = require('aphrodite/no-important')
const ipc = window.chrome.ipcRenderer

// Constants
const messages = require('../../../../js/constants/messages')

class PrintKeys extends React.Component {
constructor (props) {
super(props)
this.state = {
passphrase: ''
}

ipc.on(messages.PRINTKEYS_UPDATED, (e, detail) => {
if (detail) {
this.setState({
passphrase: detail && detail.passphrase
})
}
})
}

componentDidUpdate (prevProps, prevState) {
if (prevState.passphrase !== this.state.passphrase) {
setTimeout(() => {
window.print()
}, 500)
}
}

render () {
const date = format(new Date(), 'MM/DD/YYYY')

return <div className={css(styles.content)}>
<div data-l10n-id='ledgerBackupText1' />
<div>
<span data-l10n-id='ledgerBackupText2' /> {date}
</div>
<br />
<div>
<span data-l10n-id='ledgerBackupText4' /> <b>{this.state.passphrase}</b>
</div>
<br />
<div data-l10n-id='ledgerBackupText5' />
</div>
}
}

const styles = StyleSheet.create({
content: {
fontWeight: '400',
color: '#3b3b3b',
fontSize: '16px'
}
})

module.exports = <PrintKeys />
3 changes: 3 additions & 0 deletions js/about/entry.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ switch (getBaseUrl(getSourceAboutUrl(window.location.href))) {
case 'about:bookmarks':
getElementOp = import('../../app/renderer/about/bookmarks/bookmarks')
break
case 'about:printkeys':
getElementOp = import('../../app/renderer/about/ledger/printKeys')
break
case 'about:certerror':
getElementOp = import('./certerror')
break
Expand Down
7 changes: 7 additions & 0 deletions js/actions/appActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -1913,6 +1913,13 @@ const appActions = {
})
},

onFileRecoveryKeys: function (file) {
dispatch({
actionType: appConstants.APP_ON_FILE_RECOVERY_KEYS,
file
})
},

checkReferralActivity: function () {
dispatch({
actionType: appConstants.APP_CHECK_REFERRAL_ACTIVITY
Expand Down
1 change: 1 addition & 0 deletions js/constants/appConstants.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ const appConstants = {
APP_ON_LEDGER_CALLBACK: _,
APP_ON_TIME_UNTIL_RECONCILE: _,
APP_ON_LEDGER_RUN: _,
APP_ON_FILE_RECOVERY_KEYS: _,
APP_ON_NETWORK_CONNECTED: _,
APP_ON_RESET_RECOVERY_STATUS: _,
APP_ON_LEDGER_INIT_READ: _,
Expand Down
1 change: 1 addition & 0 deletions js/constants/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ const messages = {
EXTENSIONS_UPDATED: _,
ADBLOCK_UPDATED: _,
DOWNLOADS_UPDATED: _,
PRINTKEYS_UPDATED: _,
NEWTAB_DATA_UPDATED: _,
VERSION_INFORMATION_UPDATED: _,
// About pages from contentScript
Expand Down
1 change: 1 addition & 0 deletions js/lib/appUrlUtil.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ module.exports.aboutUrls = new Immutable.Map({
'about:safebrowsing': module.exports.getBraveExtUrl('about-safebrowsing.html'),
'about:styles': module.exports.getBraveExtUrl('about-styles.html'),
'about:contributions': module.exports.getBraveExtUrl('about-contributions.html'),
'about:printkeys': module.exports.getBraveExtUrl('about-printkeys.html'),
'about:welcome': module.exports.getBraveExtUrl('about-welcome.html')
})

Expand Down

0 comments on commit 6c186ec

Please sign in to comment.