Skip to content

Commit

Permalink
OpenSSHKey: when writing to agent, ensure comment string is at least …
Browse files Browse the repository at this point in the history
…one byte

This unbreaks adding keys to gpg-agent.

Signed-off-by: Steven Noonan <[email protected]>
  • Loading branch information
tycho committed Mar 9, 2018
1 parent f164847 commit 6a2f7bf
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
10 changes: 9 additions & 1 deletion src/gui/entry/EditEntryWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -420,12 +420,16 @@ void EditEntryWidget::browsePrivateKey()

bool EditEntryWidget::getOpenSSHKey(OpenSSHKey& key, bool decrypt)
{
QString fileName;
QByteArray privateKeyData;

if (m_sshAgentUi->attachmentRadioButton->isChecked()) {
privateKeyData = m_advancedUi->attachmentsWidget->getAttachment(m_sshAgentUi->attachmentComboBox->currentText());
fileName = m_sshAgentUi->attachmentComboBox->currentText();
privateKeyData = m_advancedUi->attachmentsWidget->getAttachment(fileName);
} else {
QFile localFile(m_sshAgentUi->externalFileEdit->text());
QFileInfo localFileInfo(localFile);
fileName = localFileInfo.fileName();

if (localFile.fileName().isEmpty()) {
return false;
Expand Down Expand Up @@ -464,6 +468,10 @@ bool EditEntryWidget::getOpenSSHKey(OpenSSHKey& key, bool decrypt)
key.setComment(m_entry->username());
}

if (key.comment().isEmpty()) {
key.setComment(fileName);
}

return true;
}

Expand Down
11 changes: 10 additions & 1 deletion src/sshagent/SSHAgent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,15 @@ void SSHAgent::databaseModeChanged(DatabaseWidget::Mode mode)
}

QByteArray keyData;
QString fileName;
if (settings.selectedType() == "attachment") {
keyData = e->attachments()->value(settings.attachmentName());
fileName = settings.attachmentName();
keyData = e->attachments()->value(fileName);
} else if (!settings.fileName().isEmpty()) {
QFile file(settings.fileName());
QFileInfo fileInfo(file);

fileName = fileInfo.fileName();

if (file.size() > 1024 * 1024) {
continue;
Expand Down Expand Up @@ -302,6 +307,10 @@ void SSHAgent::databaseModeChanged(DatabaseWidget::Mode mode)
key.setComment(e->username());
}

if (key.comment().isEmpty()) {
key.setComment(fileName);
}

if (settings.removeAtDatabaseClose()) {
removeIdentityAtLock(key, uuid);
}
Expand Down

0 comments on commit 6a2f7bf

Please sign in to comment.