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

SSH Agent: Use database location to resolve relative key file path

Browse source 
Closes #5225
This commit is contained in:
Toni Spets 2021-04-04 09:36:51 +03:00 • committed by Jonathan White
parent ed0ece304d
commit 9b8feed3ed
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/gui/entry/EditEntryWidget.cpp
View file

@ -701,6 +701,7 @@ bool EditEntryWidget::getOpenSSHKey(OpenSSHKey& key, bool decrypt)
if (!settings.toOpenSSHKey(m_mainUi->usernameComboBox->lineEdit()->text(), if (!settings.toOpenSSHKey(m_mainUi->usernameComboBox->lineEdit()->text(),
m_mainUi->passwordEdit->text(), m_mainUi->passwordEdit->text(),
m_db->filePath(),
m_advancedUi->attachmentsWidget->entryAttachments(), m_advancedUi->attachmentsWidget->entryAttachments(),
key, key,
decrypt)) { decrypt)) {

19
src/sshagent/KeeAgentSettings.cpp
View file

@ -17,6 +17,7 @@
*/ */
#include "KeeAgentSettings.h" #include "KeeAgentSettings.h"
#include "core/Database.h"
#include "core/Tools.h" #include "core/Tools.h"
KeeAgentSettings::KeeAgentSettings() KeeAgentSettings::KeeAgentSettings()
@ -389,7 +390,8 @@ bool KeeAgentSettings::keyConfigured() const
*/ */
bool KeeAgentSettings::toOpenSSHKey(const Entry* entry, OpenSSHKey& key, bool decrypt) bool KeeAgentSettings::toOpenSSHKey(const Entry* entry, OpenSSHKey& key, bool decrypt)
{ {
return toOpenSSHKey(entry->username(), entry->password(), entry->attachments(), key, decrypt); return toOpenSSHKey(
entry->username(), entry->password(), entry->database()->filePath(), entry->attachments(), key, decrypt);
} }
/** /**
@ -399,6 +401,7 @@ bool KeeAgentSettings::toOpenSSHKey(const Entry* entry, OpenSSHKey& key, bool de
* *
* @param username username to set on key if empty * @param username username to set on key if empty
* @param password password to decrypt key if needed * @param password password to decrypt key if needed
* @param databasePath path to database file this key is loaded from
* @param attachments attachments to read an attachment key from * @param attachments attachments to read an attachment key from
* @param key output key object * @param key output key object
* @param decrypt avoid private key decryption if possible (old RSA keys are always decrypted) * @param decrypt avoid private key decryption if possible (old RSA keys are always decrypted)
@ -406,6 +409,7 @@ bool KeeAgentSettings::toOpenSSHKey(const Entry* entry, OpenSSHKey& key, bool de
*/ */
bool KeeAgentSettings::toOpenSSHKey(const QString& username, bool KeeAgentSettings::toOpenSSHKey(const QString& username,
const QString& password, const QString& password,
const QString& databasePath,
const EntryAttachments* attachments, const EntryAttachments* attachments,
OpenSSHKey& key, OpenSSHKey& key,
bool decrypt) bool decrypt)
@ -423,10 +427,19 @@ bool KeeAgentSettings::toOpenSSHKey(const QString& username,
fileName = m_attachmentName; fileName = m_attachmentName;
privateKeyData = attachments->value(fileName); privateKeyData = attachments->value(fileName);
} else { } else {
QFile localFile(fileNameEnvSubst()); QString fileNameSubst = fileNameEnvSubst();
QFileInfo localFileInfo(localFile); QFileInfo localFileInfo(fileNameSubst);
// resolve relative private key path from database location
if (localFileInfo.isRelative()) {
QFileInfo databaseFileInfo(databasePath);
localFileInfo = QFileInfo(databaseFileInfo.absolutePath() + QDir::separator() + fileNameSubst);
}
fileName = localFileInfo.fileName(); fileName = localFileInfo.fileName();
QFile localFile(localFileInfo.absoluteFilePath());
if (localFile.fileName().isEmpty()) { if (localFile.fileName().isEmpty()) {
m_error = QCoreApplication::translate("KeeAgentSettings", "Private key is empty"); m_error = QCoreApplication::translate("KeeAgentSettings", "Private key is empty");
return false; return false;

1
src/sshagent/KeeAgentSettings.h
View file

@ -44,6 +44,7 @@ public:
bool toOpenSSHKey(const Entry* entry, OpenSSHKey& key, bool decrypt); bool toOpenSSHKey(const Entry* entry, OpenSSHKey& key, bool decrypt);
bool toOpenSSHKey(const QString& username, bool toOpenSSHKey(const QString& username,
const QString& password, const QString& password,
const QString& databasePath,
const EntryAttachments* attachments, const EntryAttachments* attachments,
OpenSSHKey& key, OpenSSHKey& key,
bool decrypt); bool decrypt);