AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: report unified password change failure, impose minimum password length of 5, disallow empty passwords

Browse Source
This commit is contained in:
Sander van Grieken
2023-03-03 12:56:02 +01:00
parent 90355a150f
commit 0f596cf2e9
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/qml/components/PasswordDialog.qml
View File

@@ -74,7 +74,7 @@ ElDialog {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Ok") text: qsTr("Ok")
icon.source: '../../icons/confirmed.png' icon.source: '../../icons/confirmed.png'
enabled: confirmPassword ? pw_1.text == pw_2.text : true enabled: confirmPassword ? pw_1.text.length > 4 && pw_1.text == pw_2.text : true
onClicked: { onClicked: {
password = pw_1.text password = pw_1.text
passworddialog.accept() passworddialog.accept()

25
electrum/gui/qml/components/WalletDetails.qml
View File

@@ -508,18 +508,23 @@ Pane {
app.stack.pop() app.stack.pop()
} }
function onRequestNewPassword() { // new unified password (all wallets) function onRequestNewPassword() { // new unified password (all wallets)
var dialog = app.passwordDialog.createObject(app, var dialog = app.passwordDialog.createObject(app, {
{ confirmPassword: true,
'confirmPassword': true, title: qsTr('Enter new password'),
'title': qsTr('Enter new password'), infotext: qsTr('If you forget your password, you\'ll need to restore from seed. Please make sure you have your seed stored safely')
'infotext': qsTr('If you forget your password, you\'ll need to\ })
restore from seed. Please make sure you have your seed stored safely')
} )
dialog.accepted.connect(function() { dialog.accepted.connect(function() {
Daemon.setPassword(dialog.password) Daemon.setPassword(dialog.password)
}) })
dialog.open() dialog.open()
} }
function onPasswordChangeFailed() {
var dialog = app.messageDialog.createObject(app, {
title: qsTr('Error'),
text: qsTr('Password change failed')
})
dialog.open()
}
function onWalletDeleteError(code, message) { function onWalletDeleteError(code, message) {
if (code == 'unpaid_requests') { if (code == 'unpaid_requests') {
var dialog = app.messageDialog.createObject(app, {text: message, yesno: true }) var dialog = app.messageDialog.createObject(app, {text: message, yesno: true })
@@ -544,9 +549,9 @@ Pane {
target: Daemon.currentWallet target: Daemon.currentWallet
function onRequestNewPassword() { // new wallet password function onRequestNewPassword() { // new wallet password
var dialog = app.passwordDialog.createObject(app, { var dialog = app.passwordDialog.createObject(app, {
'confirmPassword': true, confirmPassword: true,
'title': qsTr('Enter new password'), title: qsTr('Enter new password'),
'infotext': qsTr('If you forget your password, you\'ll need to restore from seed. Please make sure you have your seed stored safely') infotext: qsTr('If you forget your password, you\'ll need to restore from seed. Please make sure you have your seed stored safely')
}) })
dialog.accepted.connect(function() { dialog.accepted.connect(function() {
Daemon.currentWallet.set_password(dialog.password) Daemon.currentWallet.set_password(dialog.password)

10
electrum/gui/qml/qedaemon.py
View File

@@ -127,6 +127,7 @@ class QEDaemon(AuthMixin, QObject):
newWalletWizardChanged = pyqtSignal() newWalletWizardChanged = pyqtSignal()
serverConnectWizardChanged = pyqtSignal() serverConnectWizardChanged = pyqtSignal()
loadingChanged = pyqtSignal() loadingChanged = pyqtSignal()
passwordChangeFailed = pyqtSignal()
walletLoaded = pyqtSignal([str,str], arguments=['name','path']) walletLoaded = pyqtSignal([str,str], arguments=['name','path'])
walletRequiresPassword = pyqtSignal([str,str], arguments=['name','path']) walletRequiresPassword = pyqtSignal([str,str], arguments=['name','path'])
@@ -316,11 +317,10 @@ class QEDaemon(AuthMixin, QObject):
@pyqtSlot(str) @pyqtSlot(str)
def setPassword(self, password): def setPassword(self, password):
assert self._use_single_password assert self._use_single_password
# map empty string password to None assert password
if password == '': if not self.daemon.update_password_for_directory(old_password=self._password, new_password=password):
password = None self.passwordChangeFailed.emit()
self._logger.debug('about to set password for ALL wallets') return
self.daemon.update_password_for_directory(old_password=self._password, new_password=password)
self._password = password self._password = password
@pyqtProperty(QENewWalletWizard, notify=newWalletWizardChanged) @pyqtProperty(QENewWalletWizard, notify=newWalletWizardChanged)