No OneTemporary
Actions

Size

22 KB

Subscribers

None

View Options

	diff --git a/src/view/pgpcardwidget.cpp b/src/view/pgpcardwidget.cpp
	index c687792be..e06c42e52 100644
	--- a/src/view/pgpcardwidget.cpp
	+++ b/src/view/pgpcardwidget.cpp
	@@ -1,438 +1,505 @@
	/* view/pgpcardwiget.cpp

	This file is part of Kleopatra, the KDE keymanager
	Copyright (c) 2017 by Bundesamt für Sicherheit in der Informationstechnik
	Software engineering by Intevation GmbH

	Kleopatra is free software; you can redistribute it and/or modify
	it under the terms of the GNU General Public License as published by
	the Free Software Foundation; either version 2 of the License, or
	(at your option) any later version.

	Kleopatra is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	General Public License for more details.

	You should have received a copy of the GNU General Public License
	along with this program; if not, write to the Free Software
	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

	In addition, as a special exception, the copyright holders give
	permission to link the code of this program with any edition of
	the Qt library by Trolltech AS, Norway (or with modified versions
	of Qt that use the same license as Qt), and distribute linked
	combinations including the two. You must obey the GNU General
	Public License in all respects for all of the code used other than
	Qt. If you modify this file, you may extend this exception to
	your version of the file, but you are not obligated to do so. If
	you do not wish to do so, delete this exception statement from
	your version.
	*/

	#include "pgpcardwidget.h"

	#include "kleopatra_debug.h"

	#include "smartcard/openpgpcard.h"
	#include "smartcard/readerstatus.h"

	#include "dialogs/gencardkeydialog.h"

	#include <QProgressDialog>
	#include <QThread>
	#include <QScrollArea>
	#include <QInputDialog>
	#include <QFileDialog>
	#include <QFileInfo>
	#include <QGridLayout>
	#include <QPushButton>
	#include <QLabel>
	#include <QHBoxLayout>
	#include <QVBoxLayout>

	#include <KLocalizedString>
	#include <KMessageBox>

	#include <Libkleo/KeyCache>
	#include <Libkleo/Formatting>

	#include <gpgme++/gpgmepp_version.h>
	#include <gpgme++/data.h>
	#include <gpgme++/context.h>

	#include <QGpgME/DataProvider>

	#if GPGMEPP_VERSION > 0x10801 // 1.8.1
	// TODO remove ifdef once > 1.8.1 is required
	#include <gpgme++/gpggencardkeyinteractor.h>
	# define GPGME_CAN_GENCARDKEY
	#endif

	using namespace Kleo;
	using namespace Kleo::SmartCard;

	namespace {
	#ifdef GPGME_CAN_GENCARDKEY
	class GenKeyThread: public QThread
	{
	Q_OBJECT

	public:
	explicit GenKeyThread(const GenCardKeyDialog::KeyParams &params, const std::string &serial):
	mSerial(serial),
	mParams(params)
	{
	}

	GpgME::Error error()
	{
	return mErr;
	}

	std::string bkpFile()
	{
	return mBkpFile;
	}
	protected:
	void run() override {
	GpgME::GpgGenCardKeyInteractor *ei = new GpgME::GpgGenCardKeyInteractor(mSerial);
	ei->setKeySize(mParams.keysize);
	ei->setNameUtf8(mParams.name.toStdString());
	ei->setEmailUtf8(mParams.email.toStdString());
	ei->setDoBackup(mParams.backup);

	const auto ctx = std::shared_ptr<GpgME::Context> (GpgME::Context::createForProtocol(GpgME::OpenPGP));
	QGpgME::QByteArrayDataProvider dp;
	GpgME::Data data(&dp);

	mErr = ctx->cardEdit(GpgME::Key(), std::unique_ptr<GpgME::EditInteractor> (ei), data);
	mBkpFile = ei->backupFileName();
	}

	private:
	GpgME::Error mErr;
	std::string mSerial;
	GenCardKeyDialog::KeyParams mParams;

	std::string mBkpFile;
	};
	#endif
	} // Namespace

	PGPCardWidget::PGPCardWidget():
	mSerialNumber(new QLabel),
	mCardHolderLabel(new QLabel),
	mVersionLabel(new QLabel),
	mSigningKey(new QLabel),
	mEncryptionKey(new QLabel),
	mAuthKey(new QLabel),
	+ mUrlLabel(new QLabel),
	mCardIsEmpty(false)
	{
	auto grid = new QGridLayout;
	int row = 0;

	// Set up the scroll are
	auto area = new QScrollArea;
	area->setFrameShape(QFrame::NoFrame);
	area->setWidgetResizable(true);
	auto areaWidget = new QWidget;
	areaWidget->setLayout(grid);
	area->setWidget(areaWidget);
	auto myLayout = new QVBoxLayout;
	myLayout->addWidget(area);
	setLayout(myLayout);

	+ // Version and Serialnumber
	grid->addWidget(mVersionLabel, row++, 0, 1, 2);
	mVersionLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
	grid->addWidget(new QLabel(i18n("Serial number:")), row, 0);

	grid->addWidget(mSerialNumber, row++, 1);
	mSerialNumber->setTextInteractionFlags(Qt::TextBrowserInteraction);
	+
	+ // Cardholder Row
	grid->addWidget(new QLabel(i18nc("The owner of a smartcard. GnuPG refers to this as cardholder.",
	"Cardholder:")), row, 0);

	grid->addWidget(mCardHolderLabel, row, 1);
	mCardHolderLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
	auto nameButtton = new QPushButton;
	nameButtton->setIcon(QIcon::fromTheme("cell_edit"));
	nameButtton->setToolTip(i18n("Change"));
	grid->addWidget(nameButtton, row++, 2);
	connect(nameButtton, &QPushButton::clicked, this, &PGPCardWidget::changeNameRequested);

	+ // URL Row
	+ grid->addWidget(new QLabel(i18nc("The URL under which a public key that "
	+ "corresponds to a smartcard can be downloaded",
	+ "Pubkey URL:")), row, 0);
	+ grid->addWidget(mUrlLabel, row, 1);
	+
	+ mUrlLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
	+ auto urlButtton = new QPushButton;
	+ urlButtton->setIcon(QIcon::fromTheme("cell_edit"));
	+ urlButtton->setToolTip(i18n("Change"));
	+ grid->addWidget(urlButtton, row++, 2);
	+ connect(urlButtton, &QPushButton::clicked, this, &PGPCardWidget::changeUrlRequested);
	+
	+ // The keys
	auto line1 = new QFrame();
	line1->setFrameShape(QFrame::HLine);
	grid->addWidget(line1, row++, 0, 1, 4);
	grid->addWidget(new QLabel(QStringLiteral("<b>%1</b>").arg(i18n("Keys:"))), row++, 0);

	grid->addWidget(new QLabel(i18n("Signature:")), row, 0);
	grid->addWidget(mSigningKey, row++, 1);
	mSigningKey->setTextInteractionFlags(Qt::TextBrowserInteraction);

	grid->addWidget(new QLabel(i18n("Encryption:")), row, 0);
	grid->addWidget(mEncryptionKey, row++, 1);
	mEncryptionKey->setTextInteractionFlags(Qt::TextBrowserInteraction);

	grid->addWidget(new QLabel(i18n("Authentication:")), row, 0);
	grid->addWidget(mAuthKey, row++, 1);
	mAuthKey->setTextInteractionFlags(Qt::TextBrowserInteraction);

	auto line2 = new QFrame();
	line2->setFrameShape(QFrame::HLine);
	grid->addWidget(line2, row++, 0, 1, 4);
	grid->addWidget(new QLabel(QStringLiteral("<b>%1</b>").arg(i18n("Actions:"))), row++, 0);

	auto actionLayout = new QHBoxLayout;

	#ifdef GPGME_CAN_GENCARDKEY
	auto generateButton = new QPushButton(i18n("Generate new Keys"));
	generateButton->setToolTip(i18n("Create a new primary key and generate subkeys on the card."));
	actionLayout->addWidget(generateButton);
	connect(generateButton, &QPushButton::clicked, this, &PGPCardWidget::genkeyRequested);
	#endif

	auto pinButtton = new QPushButton(i18n("Change PIN"));
	pinButtton->setToolTip(i18n("Change the PIN required to unblock the smartcard."));
	actionLayout->addWidget(pinButtton);
	connect(pinButtton, &QPushButton::clicked, this, [this] () {doChangePin(1);});

	auto pukButton = new QPushButton(i18n("Change Admin PIN"));
	pukButton->setToolTip(i18n("Change the PIN required to unlock the smartcard."));
	actionLayout->addWidget(pukButton);
	connect(pukButton, &QPushButton::clicked, this, [this] () {doChangePin(3);});

	auto resetCodeButton = new QPushButton(i18n("Change Reset Code"));
	pukButton->setToolTip(i18n("Change the PIN required to reset the smartcard to an empty state."));
	actionLayout->addWidget(resetCodeButton);
	connect(resetCodeButton, &QPushButton::clicked, this, [this] () {doChangePin(2);});

	actionLayout->addStretch(-1);
	grid->addLayout(actionLayout, row++, 0, 1, 4);

	grid->setColumnStretch(4, -1);
	}

	void PGPCardWidget::setCard(const OpenPGPCard *card)
	{
	const QString version = QString::fromStdString(card->cardVersion());
	mIs21 = version == "2.1";
	mVersionLabel->setText(i18nc("First placeholder is manufacturer, second placeholder is a version number",
	"%1 OpenPGP v%2 card", QString::fromStdString(card->manufacturer()),
	version));
	const QString sn = QString::fromStdString(card->serialNumber()).mid(16, 12);
	mSerialNumber->setText(sn);
	mRealSerial = card->serialNumber();
	- mCardHolderLabel->setText(QString::fromStdString(card->cardHolder()));
	+
	+ const auto holder = QString::fromStdString(card->cardHolder());
	+ const auto url = QString::fromStdString(card->pubkeyUrl());
	+ mCardHolderLabel->setText(holder.isEmpty() ? i18n("not set") : holder);
	+ mUrl = url;
	+ mUrlLabel->setText(url.isEmpty() ? i18n("not set") :
	+ QStringLiteral("<a href=\"%1\">%1</a>").arg(url.toHtmlEscaped()));
	+ mUrlLabel->setOpenExternalLinks(true);

	updateKey(mSigningKey, card->sigFpr());
	updateKey(mEncryptionKey, card->encFpr());
	updateKey(mAuthKey, card->authFpr());
	mCardIsEmpty = card->authFpr().empty() && card->sigFpr().empty() && card->encFpr().empty();
	}

	void PGPCardWidget::doChangePin(int slot)
	{
	ReaderStatus::mutableInstance()
	->startSimpleTransaction(QStringLiteral("SCD PASSWD %1").arg(slot).toUtf8().constData(),
	this, "changePinResult");
	}

	#ifdef GPGME_CAN_GENCARDKEY
	void PGPCardWidget::doGenKey(GenCardKeyDialog *dlg)
	{
	const auto params = dlg->getKeyParams();
	delete dlg;

	auto progress = new QProgressDialog(this, Qt::CustomizeWindowHint \| Qt::WindowTitleHint \| Qt::Dialog);
	progress->setAutoClose(true);
	progress->setMinimumDuration(0);
	progress->setMaximum(0);
	progress->setMinimum(0);
	progress->setModal(true);
	progress->setCancelButton(nullptr);
	progress->setWindowTitle(i18n("Generating keys"));
	progress->setLabel(new QLabel(i18n("This may take several minutes...")));
	GenKeyThread *workerThread = new GenKeyThread(params, mRealSerial);
	connect(workerThread, &QThread::finished, this, [this, workerThread, progress] {
	progress->accept();
	delete progress;
	genKeyDone(workerThread->error(), workerThread->bkpFile());
	delete workerThread;
	});
	workerThread->start();
	progress->exec();
	}

	void PGPCardWidget::genKeyDone(const GpgME::Error &err, const std::string &backup)
	{
	if (err) {
	KMessageBox::error(this, i18nc("@info",
	"Failed to generate new key: %1", err.asString()),
	i18nc("@title", "Error"));
	return;
	}
	if (err.isCanceled()) {
	return;
	}
	if (!backup.empty()) {
	const auto bkpFile = QString::fromStdString(backup);
	QFileInfo fi(bkpFile);
	const auto target = QFileDialog::getSaveFileName(this, i18n("Save backup of encryption key"),
	fi.fileName(),
	QStringLiteral("%1 (*.gpg)").arg(i18n("Backup Key")));
	if (!target.isEmpty() && !QFile::copy(bkpFile, target)) {
	KMessageBox::error(this, i18nc("@info",
	"Failed to move backup. The backup key is still stored under: %1", bkpFile),
	i18nc("@title", "Error"));
	} else if (!target.isEmpty()) {
	QFile::remove(bkpFile);
	}
	}

	KMessageBox::information(this, i18nc("@info",
	"Successfully generated a new key for this card."),
	i18nc("@title", "Success"));
	}
	#else
	void PGPCardWidget::doGenKey(GenCardKeyDialog *) {}
	void PGPCardWidget::genKeyDone(const GpgME::Error &, const std::string &) {}
	#endif

	void PGPCardWidget::genkeyRequested()
	{
	if (!mCardIsEmpty) {
	auto ret = KMessageBox::warningContinueCancel(this,
	i18n("The existing keys on this card will be <b>deleted</b> "
	"and replaced by new keys.") + QStringLiteral("<br/><br/>") +
	i18n("It will no longer be possible to decrypt past communication "
	"encrypted for the existing key."),
	i18n("Secret Key Deletion"),
	KStandardGuiItem::guiItem(KStandardGuiItem::Delete),
	KStandardGuiItem::cancel(), QString(), KMessageBox::Notify \| KMessageBox::Dangerous);

	if (ret != KMessageBox::Continue) {
	return;
	}
	}

	GenCardKeyDialog *dlg = new GenCardKeyDialog(this);
	std::vector <int> sizes;
	sizes.push_back(1024);
	sizes.push_back(2048);
	sizes.push_back(3072);
	// There is probably a better way to check for capabilities
	if (mIs21) {
	sizes.push_back(4096);
	}
	dlg->setSupportedSizes(sizes);
	connect(dlg, &QDialog::accepted, this, [this, dlg] () {doGenKey(dlg);});
	connect(dlg, &QDialog::rejected, dlg, &QObject::deleteLater);
	dlg->setModal(true);
	dlg->show();
	}

	void PGPCardWidget::changePinResult(const GpgME::Error &err)
	{
	if (err) {
	KMessageBox::error(this, i18nc("@info",
	"PIN change failed: %1", err.asString()),
	i18nc("@title", "Error"));
	return;
	}
	if (!err.isCanceled()) {
	KMessageBox::information(this, i18nc("@info",
	"Code successfully changed."),
	i18nc("@title", "Success"));
	}
	}

	void PGPCardWidget::changeNameRequested()
	{
	QString text = mCardHolderLabel->text();
	while (true) {
	bool ok = false;
	text = QInputDialog::getText(this, i18n("Change cardholder"),
	i18n("New name:"), QLineEdit::Normal,
	text, &ok, Qt::WindowFlags(),
	Qt::ImhLatinOnly);
	if (!ok) {
	return;
	}
	// Some additional restrictions imposed by gnupg
	if (text.contains("<")) {
	KMessageBox::error(this, i18nc("@info",
	"The \"<\" character may not be used."),
	i18nc("@title", "Error"));
	continue;
	}
	if (text.contains(" ")) {
	KMessageBox::error(this, i18nc("@info",
	"Double spaces are not allowed"),
	i18nc("@title", "Error"));
	continue;
	}
	if (text.size() > 38) {
	KMessageBox::error(this, i18nc("@info",
	"The size of the name may not exceed 38 characters."),
	i18nc("@title", "Error"));
	}
	break;
	}
	auto parts = text.split(' ');
	const auto lastName = parts.takeLast();
	const auto formatted = lastName + QStringLiteral("<<") + parts.join('<');

	ReaderStatus::mutableInstance()
	->startSimpleTransaction(QStringLiteral("SCD SETATTR DISP-NAME %1").arg(formatted).toUtf8().constData(),
	this, "changeNameResult");
	}

	void PGPCardWidget::changeNameResult(const GpgME::Error &err)
	{
	if (err) {
	KMessageBox::error(this, i18nc("@info",
	"Name change failed: %1", err.asString()),
	i18nc("@title", "Error"));
	return;
	}
	if (!err.isCanceled()) {
	KMessageBox::information(this, i18nc("@info",
	"Name successfully changed."),
	i18nc("@title", "Success"));
	ReaderStatus::mutableInstance()->updateStatus();
	}
	}

	+void PGPCardWidget::changeUrlRequested()
	+{
	+ QString text = mUrl;
	+ while (true) {
	+ bool ok = false;
	+ text = QInputDialog::getText(this, i18n("Change the URL where the pubkey can be found"),
	+ i18n("New pubkey URL:"), QLineEdit::Normal,
	+ text, &ok, Qt::WindowFlags(),
	+ Qt::ImhLatinOnly);
	+ if (!ok) {
	+ return;
	+ }
	+ // Some additional restrictions imposed by gnupg
	+ if (text.size() > 254) {
	+ KMessageBox::error(this, i18nc("@info",
	+ "The size of the URL may not exceed 254 characters."),
	+ i18nc("@title", "Error"));
	+ }
	+ break;
	+ }
	+
	+ ReaderStatus::mutableInstance()
	+ ->startSimpleTransaction(QStringLiteral("SCD SETATTR PUBKEY-URL %1").arg(text).toUtf8().constData(),
	+ this, "changeUrlResult");
	+}
	+
	+void PGPCardWidget::changeUrlResult(const GpgME::Error &err)
	+{
	+ if (err) {
	+ KMessageBox::error(this, i18nc("@info",
	+ "URL change failed: %1", err.asString()),
	+ i18nc("@title", "Error"));
	+ return;
	+ }
	+ if (!err.isCanceled()) {
	+ KMessageBox::information(this, i18nc("@info",
	+ "URL successfully changed."),
	+ i18nc("@title", "Success"));
	+ ReaderStatus::mutableInstance()->updateStatus();
	+ }
	+}
	+
	void PGPCardWidget::updateKey(QLabel *label, const std::string &fpr)
	{
	label->setText(fpr.c_str());

	if (fpr.empty()) {
	label->setText(i18n("Slot empty"));
	return;
	}

	std::vector<std::string> vec;
	std::string keyid = fpr;
	keyid.erase(0, keyid.size() - 16);
	vec.push_back(keyid);
	const auto subkeys = KeyCache::instance()->findSubkeysByKeyID(vec);
	if (subkeys.empty() \|\| subkeys[0].isNull()) {
	label->setToolTip(i18n("Public key not found."));
	return;
	}
	QStringList toolTips;
	for (const auto &sub: subkeys) {
	// Yep you can have one subkey associated with mutliple
	// primary keys.
	toolTips << Formatting::toolTip(sub.parent(), Formatting::Validity \|
	Formatting::StorageLocation \|
	Formatting::ExpiryDates \|
	Formatting::UserIDs \|
	Formatting::Fingerprint);
	}
	label->setToolTip(toolTips.join("<br/>"));
	return;
	}

	#include "pgpcardwidget.moc"
	diff --git a/src/view/pgpcardwidget.h b/src/view/pgpcardwidget.h
	index ec72118fe..1e4e33ba2 100644
	--- a/src/view/pgpcardwidget.h
	+++ b/src/view/pgpcardwidget.h
	@@ -1,82 +1,86 @@
	/* view/pgpcardwiget.h

	This file is part of Kleopatra, the KDE keymanager
	Copyright (c) 2017 by Bundesamt für Sicherheit in der Informationstechnik
	Software engineering by Intevation GmbH

	Kleopatra is free software; you can redistribute it and/or modify
	it under the terms of the GNU General Public License as published by
	the Free Software Foundation; either version 2 of the License, or
	(at your option) any later version.

	Kleopatra is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	General Public License for more details.

	You should have received a copy of the GNU General Public License
	along with this program; if not, write to the Free Software
	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

	In addition, as a special exception, the copyright holders give
	permission to link the code of this program with any edition of
	the Qt library by Trolltech AS, Norway (or with modified versions
	of Qt that use the same license as Qt), and distribute linked
	combinations including the two. You must obey the GNU General
	Public License in all respects for all of the code used other than
	Qt. If you modify this file, you may extend this exception to
	your version of the file, but you are not obligated to do so. If
	you do not wish to do so, delete this exception statement from
	your version.
	*/
	#ifndef VIEW_PGPCARDWIDGET_H
	#define VIEW_PGPCARDWIDGET_H

	#include <QWidget>
	#include <gpgme++/error.h>

	#include <string>

	class QLabel;

	namespace Kleo
	{
	class GenCardKeyDialog;

	namespace SmartCard
	{
	class OpenPGPCard;
	} // namespace SmartCard

	class PGPCardWidget: public QWidget
	{
	Q_OBJECT
	public:
	PGPCardWidget();

	void setCard(const SmartCard::OpenPGPCard* card);
	void doChangePin(int slot);
	void doGenKey(GenCardKeyDialog *dlg);
	void genKeyDone(const GpgME::Error &err, const std::string &backup);

	public Q_SLOTS:
	void genkeyRequested();
	void changePinResult(const GpgME::Error &err);
	void changeNameRequested();
	void changeNameResult(const GpgME::Error &err);
	+ void changeUrlRequested();
	+ void changeUrlResult(const GpgME::Error &err);

	private:
	void updateKey(QLabel *label, const std::string &fpr);
	- QLabel *mSerialNumber = nullptr;
	- QLabel *mCardHolderLabel = nullptr;
	- QLabel *mVersionLabel = nullptr;
	- QLabel *mSigningKey = nullptr;
	- QLabel *mEncryptionKey = nullptr;
	- QLabel *mAuthKey = nullptr;
	+ QLabel *mSerialNumber = nullptr,
	+ *mCardHolderLabel = nullptr,
	+ *mVersionLabel = nullptr,
	+ *mSigningKey = nullptr,
	+ *mEncryptionKey = nullptr,
	+ *mAuthKey = nullptr,
	+ *mUrlLabel = nullptr;
	+ QString mUrl;
	bool mCardIsEmpty = false;
	bool mIs21 = false;
	std::string mRealSerial;
	};
	} // namespace Kleo

	#endif // VIEW_PGPCARDWIDGET_H

File Metadata

Mime Type: text/x-diff
Expires: Mon, Dec 1, 10:20 PM (1 d, 22 h)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: 2a/27/6b8ac4def7c13dd78363b7bdf9f1

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions