Unlock previously opened databases with --pw-stdin #1087
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
phoerious
reviewed
Oct 19, 2017
src/gui/DatabaseTabWidget.cpp
Outdated
| @@ -129,7 +129,12 @@ void DatabaseTabWidget::openDatabase(const QString& fileName, const QString& pw, | |||
| while (i.hasNext()) { | |||
| i.next(); | |||
| if (i.value().canonicalFilePath == canonicalFilePath) { | |||
| setCurrentIndex(databaseIndex(i.key())); | |||
| if (!i.value().dbWidget->dbHasKey() && (!pw.isNull() || !keyFile.isEmpty())) { | |||
There was a problem hiding this comment.
I would prefer the logically equivalent !(pw.isNull() && keyFile.isEmpty()), which is more intuitive to understand.
There was a problem hiding this comment.
This logic sequence is used 15 lines below as well.
droidmonkey
force-pushed
the
hotfix/pw-stdin
branch
from
9a1944c
to
0f3ae25
Compare
|
PR updated, request final review and merge @phoerious |
phoerious
approved these changes
Oct 19, 2017
phoerious
added a commit
that referenced
this pull request
Oct 21, 2017
- Fixed entries with empty URLs being reported to KeePassHTTP clients [#1031] - Fixed YubiKey detection and enabled CLI tool for AppImage binary [#1100] - Added AppStream description [#1082] - Improved TOTP compatibility and added new Base32 implementation [#1069] - Fixed error handling when processing invalid cipher stream [#1099] - Fixed double warning display when opening a database [#1037] - Fixed unlocking databases with --pw-stdin [#1087] - Added ability to override QT_PLUGIN_PATH environment variable for AppImages [#1079] - Fixed transform seed not being regenerated when saving the database [#1068] - Fixed only one YubiKey slot being polled [#1048] - Corrected an issue with entry icons while merging [#1008] - Corrected desktop and tray icons in Snap package [#1030] - Fixed screen lock and Google fallback settings [#1029]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixes #590 by passing the provided password (via stdin) to a database that was already opened due to "open previously open databases"
How has this been tested?
Manually
Types of changes
Checklist:
-DWITH_ASAN=ON. [REQUIRED]