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

Re-Add keys on database unlock #2982

Merged
merged 1 commit into from Apr 11, 2019

Conversation

Projects
None yet
2 participants
@droidmonkey
Copy link
Member

commented Apr 11, 2019

Type of change

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

Description and Context

  • Keys that were previously added do not show an error message (they are most likely still in the agent)
  • Shifted to using the KeeAgentSettings class to guide behavior of addIdentity function
  • Fixes #2902

Testing strategy

Tested on Windows using Pageant.

Checklist:

  • 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.
Re-Add keys on database unlock
* Keys that were previously added do not show an error message (they are most likely still in the agent)
* Shifted to using the KeeAgentSettings class to guide behavior of addIdentity function
* Fixes #2902

@droidmonkey droidmonkey added this to the v2.4.1 milestone Apr 11, 2019

@droidmonkey droidmonkey requested review from hifi and phoerious Apr 11, 2019

@hifi

hifi approved these changes Apr 11, 2019

Copy link
Member

left a comment

Looks good to me. Ignoring errors when adding a known key seems like the best approach.

@droidmonkey

This comment has been minimized.

Copy link
Member Author

commented Apr 11, 2019

The error is 99.9% going to be the key is already added since the key list is not populated unless a key has been added successfully in the past.

@droidmonkey droidmonkey merged commit c195452 into release/2.4.1 Apr 11, 2019

4 checks passed

CodeFactor No issues found.
Details
MacOS (KeepassXC) TeamCity build finished
Details
Ubuntu Linux (KeepassXC) TeamCity build finished
Details
Windows 10 (KeepassXC) TeamCity build finished
Details

@droidmonkey droidmonkey deleted the hotfix/sshagent branch Apr 11, 2019

droidmonkey added a commit that referenced this pull request Apr 12, 2019

Release 2.4.1
- Fix database deletion when using unsafe saves to a different file system [#2889]
- Fix opening databases with legacy key files that contain '/' [#2872]
- Fix opening database files from the command line [#2919]
- Fix crash when editing master key [#2836]
- Fix multiple issues with apply button behavior [#2947]
- Fix issues on application startup (tab order, --pw-stdin, etc.) [#2830]
- Fix building without WITH_XC_KEESHARE
- Fix reference entry coloring on macOS dark mode [#2984]
- Hide window when performing entry auto-type on macOS [#2969]
- Improve UX of update checker; reduce checks to every 7 days [#2968]
- KeeShare improvements [#2946, #2978, #2824]
- Re-enable Ctrl+C to copy password from search box [#2947]
- Add KeePassXC-Browser integration for Brave browser [#2933]
- SSH Agent: Re-Add keys on database unlock [#2982]
- SSH Agent: Only remove keys on app exit if they are removed on lock [#2985]
- CLI: Add --no-password option [#2708]
- CLI: Improve database extraction to XML [#2698]
- CLI: Don't call mandb on build [#2774]
- CLI: Add debug info [#2714]
- Improve support for Snap theming [#2832]
- Add support for building on Haiku OS [#2859]
- Ctrl+PgDn now goes to the next tab and Ctrl+PgUp to the previous
- Fix compiling on GCC 5 / Xenial [#2990]
- Add .gitrev output to tarball for third-party builds [#2970]
- Add WITH_XC_UPDATECHECK compile flag to toggle the update checker [#2968]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.