Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-23 05:01:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

SSH Agent: Fix attachment data not updating before apply

Browse Source 
Fixes regression since #3833 was merged
This commit is contained in:
Toni Spets 2020-04-05 08:34:50 +03:00 committed by Jonathan White
parent 92a7fe33bd
commit 9e17d52e8e
3 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/entry/EditEntryWidget.cpp
View File

@ -673,7 +673,11 @@ bool EditEntryWidget::getOpenSSHKey(OpenSSHKey& key, bool decrypt)
return false;
}
if (!settings.toOpenSSHKey(m_entry, key, decrypt)) {
if (!settings.toOpenSSHKey(m_mainUi->usernameComboBox->lineEdit()->text(),
m_mainUi->passwordEdit->text(),
m_advancedUi->attachmentsWidget->entryAttachments(),
key,
decrypt)) {
showMessage(settings.errorString(), MessageWidget::Error);
return false;
}

33
src/sshagent/KeeAgentSettings.cpp
View File

@ -364,13 +364,40 @@ bool KeeAgentSettings::keyConfigured() const
* @return true if key was properly opened
*/
bool KeeAgentSettings::toOpenSSHKey(const Entry* entry, OpenSSHKey& key, bool decrypt)
{
return toOpenSSHKey(entry->username(), entry->password(), entry->attachments(), key, decrypt);
}
/**
* Read a SSH key based on settings to key.
*
* Sets error string on error.
*
* @param username username to set on key if empty
* @param password password to decrypt key if needed
* @param attachments attachments to read an attachment key from
* @param key output key object
* @param decrypt avoid private key decryption if possible (old RSA keys are always decrypted)
* @return true if key was properly opened
*/
bool KeeAgentSettings::toOpenSSHKey(const QString& username,
const QString& password,
const EntryAttachments* attachments,
OpenSSHKey& key,
bool decrypt)
{
QString fileName;
QByteArray privateKeyData;
if (m_selectedType == "attachment") {
if (!attachments) {
m_error = QCoreApplication::translate("KeeAgentSettings",
"Private key is an attachment but no attachments provided.");
return false;
}
fileName = m_attachmentName;
privateKeyData = entry->attachments()->value(fileName);
privateKeyData = attachments->value(fileName);
} else {
QFile localFile(fileNameEnvSubst());
QFileInfo localFileInfo(localFile);
@ -405,14 +432,14 @@ bool KeeAgentSettings::toOpenSSHKey(const Entry* entry, OpenSSHKey& key, bool de
}
if (key.encrypted() && (decrypt || key.publicParts().isEmpty())) {
if (!key.openKey(entry->password())) {
if (!key.openKey(password)) {
m_error = key.errorString();
return false;
}
}
if (key.comment().isEmpty()) {
key.setComment(entry->username());
key.setComment(username);
}
if (key.comment().isEmpty()) {

6
src/sshagent/KeeAgentSettings.h
View File

@ -20,6 +20,7 @@
#define KEEAGENTSETTINGS_H
#include "core/Entry.h"
#include "core/EntryAttachments.h"
#include "crypto/ssh/OpenSSHKey.h"
#include <QXmlStreamReader>
#include <QtCore>
@ -39,6 +40,11 @@ public:
void toEntry(Entry* entry) const;
bool keyConfigured() const;
bool toOpenSSHKey(const Entry* entry, OpenSSHKey& key, bool decrypt);
bool toOpenSSHKey(const QString& username,
const QString& password,
const EntryAttachments* attachments,
OpenSSHKey& key,
bool decrypt);
const QString errorString() const;