mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-04 21:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Jonathan White 2021-01-31 16:47:35 -05:00
parent 4e90cb5818
commit 61b85183f9
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
13 changed files with 158 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/sshagent/SSHAgent.cpp
View file

@ -19,6 +19,9 @@
#include "SSHAgent.h"
#include "core/Config.h"
#include "core/Database.h"
#include "core/Group.h"
#include "core/Metadata.h"
#include "crypto/ssh/BinaryStream.h"
#include "crypto/ssh/OpenSSHKey.h"
#include "sshagent/KeeAgentSettings.h"
@ -31,11 +34,6 @@
Q_GLOBAL_STATIC(SSHAgent, s_sshAgent);
SSHAgent::~SSHAgent()
{
removeAllIdentities();
}
SSHAgent* SSHAgent::instance()
{
return s_sshAgent;
@ -427,18 +425,15 @@ void SSHAgent::setAutoRemoveOnLock(const OpenSSHKey& key, bool autoRemove)
}
}
void SSHAgent::databaseLocked()
void SSHAgent::databaseLocked(QSharedPointer<Database> db)
{
auto* widget = qobject_cast<DatabaseWidget*>(sender());
if (!widget) {
if (!db) {
return;
}
QUuid databaseUuid = widget->database()->uuid();
auto it = m_addedKeys.begin();
while (it != m_addedKeys.end()) {
if (it.value().first != databaseUuid) {
if (it.value().first != db->uuid()) {
++it;
continue;
}
@ -452,16 +447,14 @@ void SSHAgent::databaseLocked()
}
}
void SSHAgent::databaseUnlocked()
void SSHAgent::databaseUnlocked(QSharedPointer<Database> db)
{
auto* widget = qobject_cast<DatabaseWidget*>(sender());
if (!widget) {
if (!db || !isEnabled()) {
return;
}
for (Entry* e : widget->database()->rootGroup()->entriesRecursive()) {
if (widget->database()->metadata()->recycleBinEnabled()
&& e->group() == widget->database()->metadata()->recycleBin()) {
for (Entry* e : db->rootGroup()->entriesRecursive()) {
if (db->metadata()->recycleBinEnabled() && e->group() == db->metadata()->recycleBin()) {
continue;
}
@ -483,7 +476,7 @@ void SSHAgent::databaseUnlocked()
// Add key to agent; ignore errors if we have previously added the key
bool known_key = m_addedKeys.contains(key);
if (!addIdentity(key, settings, widget->database()->uuid()) && !known_key) {
if (!addIdentity(key, settings, db->uuid()) && !known_key) {
emit error(m_error);
}
}