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

SSH Agent: Add support for generating SSH keys

Browse source 
Supported key types are RSA, ECDSA and Ed25519.

Includes tests to compare writing out keys produce the exact same private key if read from OpenSSH format and tests against ssh-agent to ensure all no generated key is rejected.
This commit is contained in:
Toni Spets 2021-12-10 20:57:22 +02:00 • committed by Jonathan White
parent 714c0a5be2
commit 3243243be8
15 changed files with 1048 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@
#include "core/TimeDelta.h"
#ifdef WITH_XC_SSHAGENT
#include "sshagent/OpenSSHKey.h"
#include "sshagent/OpenSSHKeyGenDialog.h"
#include "sshagent/SSHAgent.h"
#endif
#ifdef WITH_XC_BROWSER
@ -535,6 +536,7 @@ void EditEntryWidget::updateHistoryButtons(const QModelIndex& current, const QMo
#ifdef WITH_XC_SSHAGENT
void EditEntryWidget::setupSSHAgent()
{
m_pendingPrivateKey = "";
m_sshAgentUi->setupUi(m_sshAgentWidget);
QFont fixedFont = Font::fixedFont();
@ -555,6 +557,7 @@ void EditEntryWidget::setupSSHAgent()
connect(m_sshAgentUi->removeFromAgentButton, &QPushButton::clicked, this, &EditEntryWidget::removeKeyFromAgent);
connect(m_sshAgentUi->decryptButton, &QPushButton::clicked, this, &EditEntryWidget::decryptPrivateKey);
connect(m_sshAgentUi->copyToClipboardButton, &QPushButton::clicked, this, &EditEntryWidget::copyPublicKey);
connect(m_sshAgentUi->generateButton, &QPushButton::clicked, this, &EditEntryWidget::generatePrivateKey);
connect(m_attachments.data(), &EntryAttachments::modified,
this, &EditEntryWidget::updateSSHAgentAttachments);
@ -582,6 +585,12 @@ void EditEntryWidget::updateSSHAgent()
m_sshAgentSettings.fromEntry(m_entry);
setSSHAgentSettings();
if (!m_pendingPrivateKey.isEmpty()) {
m_sshAgentSettings.setAttachmentName(m_pendingPrivateKey);
m_sshAgentSettings.setSelectedType("attachment");
m_pendingPrivateKey = "";
}
updateSSHAgentAttachments();
}
@ -784,6 +793,38 @@ void EditEntryWidget::copyPublicKey()
{
clipboard()->setText(m_sshAgentUi->publicKeyEdit->document()->toPlainText());
}
void EditEntryWidget::generatePrivateKey()
{
auto dialog = new OpenSSHKeyGenDialog(this);
OpenSSHKey key;
dialog->setKey(&key);
if (dialog->exec()) {
// derive openssh naming from type
QString keyPrefix = key.type();
if (keyPrefix.startsWith("ecdsa")) {
keyPrefix = "id_ecdsa";
} else {
keyPrefix.replace("ssh-", "id_");
}
for (int i = 0; i < 10; i++) {
QString keyName = keyPrefix;
if (i > 0) {
keyName += "." + QString::number(i);
}
if (!m_entry->attachments()->hasKey(keyName)) {
m_pendingPrivateKey = keyName;
m_entry->attachments()->set(m_pendingPrivateKey, key.privateKey().toUtf8());
break;
}
}
}
}
#endif
void EditEntryWidget::useExpiryPreset(QAction* action)