Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix keyfile from/to parameter collision #3961



Copy link

wizzk42 commented Dec 1, 2019

Remove 'k' parameter for source database key file since it is already used to specify the key for the target database of the merge

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Testing strategy

rebuild and merged two databases with different keys using keepassxc-cli


  • I have read the CONTRIBUTING document. [REQUIRED]
  • My code follows the code style of this project. [REQUIRED]
  • All new and existing tests passed. [REQUIRED]
  • I have compiled and verified my code with -DWITH_ASAN=ON. [REQUIRED]
  • My change requires a change to the documentation, and I have updated it accordingly.
  • I have added tests to cover my changes.
Copy link

louib left a comment

@wizzk42 good catch! Can you also update the man page, and if possible add a unit test for that?

src/cli/Merge.cpp Show resolved Hide resolved
@wizzk42 wizzk42 force-pushed the wizzk42:fix/cli-merge-key-from-param branch 4 times, most recently from 68948f9 to 32e4eaf Dec 8, 2019
@wizzk42 wizzk42 requested a review from louib Dec 8, 2019
@droidmonkey droidmonkey added this to the v2.5.2 milestone Dec 11, 2019
Copy link

louib left a comment

Some last comments, almost there 🎉

tests/TestCliMerge.cpp Outdated Show resolved Hide resolved
tests/CMakeLists.txt Outdated Show resolved Hide resolved

This comment has been minimized.

Copy link

droidmonkey commented Dec 12, 2019

This needs to be rebased on 2.5.2

Rename 'k' to 'f' because 'k' is already used to specify the key for the target database of the merge

* Remove short -f option from keepassxc-cli.1
* Remove -f option from keepassxc-cli merge
* Add test cases covering cli options for merge
* Add functional test for merge with keys
@droidmonkey droidmonkey force-pushed the wizzk42:fix/cli-merge-key-from-param branch from 32e4eaf to df438b2 Dec 21, 2019
@droidmonkey droidmonkey dismissed louib’s stale review Dec 21, 2019

changes were made

@droidmonkey droidmonkey changed the base branch from develop to release/2.5.2 Dec 21, 2019
@droidmonkey droidmonkey merged commit 0654ffc into keepassxreboot:release/2.5.2 Dec 21, 2019
5 checks passed
5 checks passed
Code Format (KeepassXC) TeamCity build finished
CodeFactor No issues found.
MacOS (KeepassXC) TeamCity build finished
Ubuntu Linux (KeepassXC) TeamCity build finished
Windows 10 (KeepassXC) TeamCity build finished
droidmonkey added a commit that referenced this pull request Jan 4, 2020

- Browser: Show UI warning when entering invalid URLs [#3912]
- Browser: Option to use an entry only for HTTP auth [#3927]


- Disable the user interface when merging or saving the database [#3991]
- Ability to hide protected attribute after reveal [#3877]
- Remove mention of "snaps" in Windows and macOS [#3879]
- CLI: Merge parameter for source database key file (--key-file-from) [#3961]
- Improve GUI tests reliability on Hi-DPI displays [#4075]
- Disable deprecation warnings to allow building with Qt 5.14+ [#4075]
- OPVault: Use 'otp' attribute for TOTP field imports [#4075]


- Fix crashes when saving a database to cloud storage [#3991]
- Fix crash when pressing enter twice while opening database [#3885]
- Fix handling of HTML when displayed in the entry preview panel [#3910]
- Fix start minimized to tray on Linux [#3899]
- Fix Auto Open with key file only databases [#4075]
- Fix escape key closing the standalone password generator [#3892]
- macOS: Fix monospace font usage in password field and notes [#4075]
- macOS: Fix building on macOS 10.9 to 10.11 [#3946]
- Fix TOTP setup dialog not closing on database lock [#4075]
- Browser: Fix condition where additional URLs are ignored [#4033]
- Browser: Fix subdomain matching to return only relevant site entries [#3854]
- Secret Service: Fix multiple crashes and incompatibilities [#3871, #4009, #4074]
- Secret Service: Fix searching of entries [#4008, #4036]
- Secret Service: Fix behavior when exposed group is recycled [#3914]
- CLI: Release the database instance before exiting interactive mode [#3889]
- Fix (most) memory leaks in tests [#3922]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants
You can’t perform that action at this time.