Update decryption flow UI

client/Application.cpp

@@ -574,8 +574,9 @@ Application::~Application()
 	connect(this, &Application::TSLLoadingFinished, &e, &QEventLoop::quit);
 	if( !d->ready )
 		e.exec();
-	digidoc::terminate();
 	delete d;
+	d = nullptr;
+	digidoc::terminate();
 
 	QDesktopServices::unsetUrlHandler(QStringLiteral("browse"));
 	QDesktopServices::unsetUrlHandler(QStringLiteral("mailto"));

client/CDocSupport.cpp

@@ -127,12 +127,8 @@ getDecryptResultStatus(const std::vector<uint8_t> &result, std::unique_ptr<QCryp
 libcdoc::result_t
 DDCryptoBackend::decryptRSA(std::vector<uint8_t>& dst, const std::vector<uint8_t> &data, bool oaep, unsigned int idx)
 {
-	if (!backend) {
-		auto val = QCryptoBackend::getBackend(qApp->cryptoManager()->tokenauth());
-		if (!val)
-			return getDecryptStatus(val.error());
-		backend.reset(val.value());
-	}
+	if (!backend)
+		return BACKEND_ERROR;
 	QByteArray decryptedKey = backend->decrypt(toByteArray(data), oaep);
 	dst.assign(decryptedKey.cbegin(), decryptedKey.cend());
 	return getDecryptResultStatus(dst, std::move(backend));
@@ -147,12 +143,8 @@ DDCryptoBackend::deriveConcatKDF(std::vector<uint8_t>& dst, const std::vector<ui
 		{"http://www.w3.org/2001/04/xmlenc#sha384", QCryptographicHash::Sha384},
 		{"http://www.w3.org/2001/04/xmlenc#sha512", QCryptographicHash::Sha512}
 	};
-	if (!backend) {
-		auto val = QCryptoBackend::getBackend(qApp->cryptoManager()->tokenauth());
-		if (!val)
-			return getDecryptStatus(val.error());
-		backend.reset(val.value());
-	}
+	if (!backend)
+		return BACKEND_ERROR;
 	QByteArray decryptedKey = backend->deriveConcatKDF(toByteArray(publicKey), SHA_MTH.value(digest),
 		toByteArray(algorithmID), toByteArray(partyUInfo), toByteArray(partyVInfo));
 	dst.assign(decryptedKey.cbegin(), decryptedKey.cend());
@@ -162,12 +154,8 @@ DDCryptoBackend::deriveConcatKDF(std::vector<uint8_t>& dst, const std::vector<ui
 libcdoc::result_t
 DDCryptoBackend::deriveHMACExtract(std::vector<uint8_t>& dst, const std::vector<uint8_t> &key_material, const std::vector<uint8_t> &salt, unsigned int idx)
 {
-	if (!backend) {
-		auto val = QCryptoBackend::getBackend(qApp->cryptoManager()->tokenauth());
-		if (!val)
-			return getDecryptStatus(val.error());
-		backend.reset(val.value());
-	}
+	if (!backend)
+		return BACKEND_ERROR;
 	QByteArray decryptedKey = backend->deriveHMACExtract(toByteArray(key_material), toByteArray(salt), ECC_KEY_LEN);
 	dst.assign(decryptedKey.cbegin(), decryptedKey.cend());
 	return getDecryptResultStatus(dst, std::move(backend));
@@ -279,7 +267,7 @@ libcdoc::result_t DDNetworkBackend::sendKey(
 	if (expiry_ts) {
 		uint64_t expiry = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now() + std::chrono::months(6));
 		expiry_ts = std::min(expiry_ts, expiry);
-		req.setRawHeader("x-expiry-time", QDateTime::fromSecsSinceEpoch(expiry_ts).toString(Qt::ISODate).toLatin1());
+		req.setRawHeader("x-expiry-time", QDateTime::fromSecsSinceEpoch(expiry_ts, Qt::UTC).toString(Qt::ISODate).toLatin1());
 	}
 	if (!checkConnection()) {
 		last_error = "No connection";
@@ -330,19 +318,17 @@ DDNetworkBackend::fetchKey(std::vector<uint8_t> &result, const std::string &url,
 		return BACKEND_ERROR;
 	}
 
-	TokenData auth = qApp->cryptoManager()->tokenauth();
-	auto val = QCryptoBackend::getBackend(auth);
-	if (!val)
-		return getDecryptStatus(val.error());
-	std::unique_ptr<QCryptoBackend> backend(val.value());
-
-	auto authKey = backend->getKey();
+	if (!crypto.backend) {
+		last_error = "No authentication backend";
+		return BACKEND_ERROR;
+	}
+	auto authKey = crypto.backend->getKey();
 	if (!authKey.handle()) {
 		last_error = "Cannot create authentication key";
 		return BACKEND_ERROR;
 	}
 	QScopedPointer<QNetworkAccessManager,QScopedPointerDeleteLater> nam(
-				CheckConnection::setupNAM(req, auth.cert(), authKey, Settings::CDOC2_GET_CERT));
+				CheckConnection::setupNAM(req, crypto.backend->cert(), authKey, Settings::CDOC2_GET_CERT));
 	QEventLoop e;
 	QNetworkReply *reply = nam->get(req);
 	connect(reply, &QNetworkReply::finished, &e, &QEventLoop::quit);
@@ -356,8 +342,6 @@ DDNetworkBackend::fetchKey(std::vector<uint8_t> &result, const std::string &url,
 	QByteArray key_material = QByteArray::fromBase64(json.value(QLatin1String("ephemeral_key_material")).toString().toLatin1());
 	result.assign(key_material.cbegin(), key_material.cend());
 
-	crypto.setBackend(std::move(backend));
-
 	return libcdoc::OK;
 }
 

client/CryptoDoc.cpp

@@ -253,16 +253,6 @@ bool CryptoDoc::addEncryptionKey(const CKey& key) {
 	return true;
 }
 
-bool CryptoDoc::canDecrypt(const QSslCertificate &cert) {
-	if (!d->reader)
-		return false;
-	if (cert.isNull())
-		return false;
-	QByteArray der = cert.toDer();
-	return d->reader->getLockForCert(
-		std::vector<uint8_t>(der.cbegin(), der.cend())) >= 0;
-}
-
 void CryptoDoc::clear(const QString &file, int version)
 {
 	d->documents->clearTempFolder();
@@ -277,7 +267,7 @@ ContainerState CryptoDoc::state() const
 	return d->isEncrypted() ? EncryptedContainer : UnencryptedContainer;
 }
 
-bool CryptoDoc::decrypt(const libcdoc::Lock *lock, const QByteArray& secret)
+bool CryptoDoc::decrypt(unsigned int lock_idx, const QByteArray& secret, std::unique_ptr<QCryptoBackend> &&backend)
 {
 	if(!d->reader)
 	{
@@ -288,38 +278,19 @@ bool CryptoDoc::decrypt(const libcdoc::Lock *lock, const QByteArray& secret)
 		return false;
 	}
 
-	int lock_idx = -1;
 	const std::vector<libcdoc::Lock> &locks = d->reader->getLocks();
-	if (lock == nullptr) {
-		QByteArray der = qApp->cryptoManager()->tokenauth().cert().toDer();
-		lock_idx = d->reader->getLockForCert(
-			std::vector<uint8_t>(der.cbegin(), der.cend()));
-		if (lock_idx < 0) {
-			WarningDialog::create()
-				->withTitle(tr("Failed to decrypt document"))
-				->withText(tr("You do not have the key to decrypt this document"))
-				->open();
-			return false;
-		}
-		lock = &locks.at(lock_idx);
-	} else {
-		for (lock_idx = 0; lock_idx < locks.size(); lock_idx++) {
-			if (lock->label == locks[lock_idx].label) {
-				lock = &locks.at(lock_idx);
-				break;
-			}
-		}
-		if (lock_idx >= locks.size())
-			lock_idx = -1;
-	}
-	if (!lock || (lock->isSymmetric() && secret.isEmpty())) {
+	if (lock_idx >= locks.size() || (locks[lock_idx].isSymmetric() && secret.isEmpty())) {
 		WarningDialog::create()
 			->withTitle(tr("Failed to decrypt document"))
 			->withText(tr("You do not have the key to decrypt this document"))
 			->open();
 		return false;
 	}
 
+	d->crypto.setBackend(std::move(backend));
+	auto resetBackend = qScopeGuard([this] {
+		d->crypto.setBackend({});
+	});
 	d->crypto.secret.assign(secret.cbegin(), secret.cend());
 
 	TempListConsumer cons;
@@ -341,7 +312,7 @@ bool CryptoDoc::decrypt(const libcdoc::Lock *lock, const QByteArray& secret)
 		const std::string &msg = d->reader->getLastErrorStr();
 		switch (result) {
 		case libcdoc::WRONG_KEY:
-			str = (lock->type == libcdoc::Lock::PASSWORD) ? tr("Wrong password.") : tr("Wrong key.");
+			str = (locks[lock_idx].type == libcdoc::Lock::PASSWORD) ? tr("Wrong password.") : tr("Wrong key.");
 			break;
 		case libcdoc::HASH_MISMATCH:
 		case libcdoc::DATA_FORMAT_ERROR:

client/CryptoDoc.h

@@ -22,16 +22,14 @@
 #include "common_enums.h"
 #include "DocumentModel.h"
 
-#include <QtCore/QIODevice>
 #include <QtCore/QLoggingCategory>
 #include <QtNetwork/QSslCertificate>
 
-#include <cdoc/CDoc.h>
-#include <cdoc/Certificate.h>
+#include <memory>
+
 #include <cdoc/Lock.h>
-#include <cdoc/Recipient.h>
 
-class QSslKey;
+class QCryptoBackend;
 
 Q_DECLARE_LOGGING_CATEGORY(CRYPTO)
 
@@ -61,9 +59,8 @@ class CryptoDoc final: public QObject
 
 	bool supportsSymmetricKeys() const;
 	bool addEncryptionKey(const CKey& key);
-	bool canDecrypt(const QSslCertificate &cert);
 	void clear(const QString &file = {}, int version = -1);
-	bool decrypt(const libcdoc::Lock *lock, const QByteArray& secret);
+	bool decrypt(unsigned int lock_idx, const QByteArray& secret, std::unique_ptr<QCryptoBackend> &&backend);
 	bool encrypt(const QString &filename = {}, const QString& label = {}, const QByteArray& secret = {});
 	DocumentModel* documentModel() const;
 	QString fileName() const;

client/MainWindow.cpp

@@ -92,7 +92,6 @@ MainWindow::MainWindow( QWidget *parent )
 
 	// Refresh ID card info in card widget
 	connect(qApp->cryptoManager(), &QCryptoManager::cacheChanged, this, &MainWindow::updateSelector);
-	connect(qApp->cryptoManager(), &QCryptoManager::authDataChanged, ui->cryptoContainerPage, &ContainerPage::tokenChanged);
 
 	// Refresh card info on "My EID" page
 	connect(qApp->cryptoManager()->smartcard(), &QSmartCard::tokenChanged, this, &MainWindow::updateMyEID);
@@ -120,7 +119,6 @@ MainWindow::MainWindow( QWidget *parent )
 	connect(ui->infoStack, &MyEidInfo::changePinClicked, this, &MainWindow::changePinClicked);
 	connect(ui->cardInfo, &CardWidget::selected, ui->selector, &QToolButton::toggle);
 
-	ui->cryptoContainerPage->tokenChanged(qApp->cryptoManager()->tokenauth());
 	updateMyEID(qApp->cryptoManager()->smartcard()->tokenData());
 	updateMyEid(qApp->cryptoManager()->smartcard()->data());
 }
@@ -273,7 +271,7 @@ void MainWindow::navigateToPage( Pages page, const QStringList &files, bool crea
 		if(navigate)
 		{
 			cryptoDoc = std::move(cryptoContainer);
-			ui->cryptoContainerPage->transition(cryptoDoc.get(), qApp->cryptoManager()->tokenauth().cert());
+			ui->cryptoContainerPage->transition(cryptoDoc.get());
 		}
 	}
 
@@ -334,7 +332,7 @@ void MainWindow::convertToCDoc()
 
 	cryptoDoc = std::move(cryptoContainer);
 	digiDoc.reset();
-	ui->cryptoContainerPage->transition(cryptoDoc.get(), qApp->cryptoManager()->tokenauth().cert());
+	ui->cryptoContainerPage->transition(cryptoDoc.get());
 	selectPage(CryptoDetails);
 
 	FadeInNotification::success(ui->topBar, tr("Converted to crypto container!"));
@@ -645,7 +643,6 @@ void MainWindow::updateMyEid(const QSmartCardData &data)
 		pin1Blocked || pin1Locked ||
 		pin2Blocked || pin2Locked ||
 		pukBlocked);
-	ui->cryptoContainerPage->cardChanged(data.authCert(), pin1Blocked || pin1Locked);
 
 	using enum WarningText::WarningType;
 	if(pin1Locked)

client/QCryptoBackend.cpp

@@ -217,9 +217,8 @@ TokenData QCryptoManager::tokensign() const { QReadLocker locker(&d->lock); retu
 
 void QCryptoManager::selectCard(const TokenData &token)
 {
-	bool isSign = SslCertificate(token.cert()).keyUsage().contains(SslCertificate::NonRepudiation);
-	TokenData other;
 	{
+		bool isSign = SslCertificate(token.cert()).keyUsage().contains(SslCertificate::NonRepudiation);
 		QWriteLocker locker(&d->lock);
 		if(isSign)
 			d->sign = token;
@@ -235,14 +234,9 @@ void QCryptoManager::selectCard(const TokenData &token)
 				d->auth = t;
 			else
 				d->sign = t;
-			other = t;
 			break;
 		}
 	}
-	if(!isSign)
-		Q_EMIT authDataChanged(token);
-	else if(!other.isNull())
-		Q_EMIT authDataChanged(other);
 	d->smartcard.reloadCard(token, false);
 }
 
@@ -303,8 +297,6 @@ void QCryptoManager::refresh()
 
 	if(cacheChangedFlag)
 		Q_EMIT cacheChanged();
-	if(aold != anew)
-		Q_EMIT authDataChanged(anew);
 	if(sold != snew)
 		d->smartcard.reloadCard(snew, false);
 	else if(aold != anew)

client/QCryptoBackend.h

@@ -98,7 +98,6 @@ class QCryptoManager final : public QThread
 
 Q_SIGNALS:
 	void cacheChanged();
-	void authDataChanged(const TokenData &token);
 
 private:
 	friend class QCryptoBackend;

client/common_enums.h

@@ -40,11 +40,8 @@ enum Actions : unsigned char {
     ContainerCancel,
     ContainerClearWarning,
     ContainerConvert,
-    ContainerEncrypt,
 
-    EncryptContainer,
     EncryptContainerSuccess,
-    DecryptContainer,
     DecryptContainerSuccess,
 
     SignatureAdd,

client/translations/en.ts

@@ -78,10 +78,6 @@
 </context>
 <context>
     <name>AddressItem</name>
-    <message>
-        <source> (Yourself)</source>
-        <translation> (Yourself)</translation>
-    </message>
     <message>
         <source>digi-ID</source>
         <translation>digi-ID</translation>
@@ -1320,10 +1316,6 @@ LDAP server is unavailable.</translation>
         <source>Encrypt</source>
         <translation>Encrypt</translation>
     </message>
-    <message>
-        <source>Decrypt</source>
-        <translation>Decrypt</translation>
-    </message>
     <message>
         <source>Sign</source>
         <translation>Sign</translation>

client/translations/et.ts

@@ -78,10 +78,6 @@
 </context>
 <context>
     <name>AddressItem</name>
-    <message>
-        <source> (Yourself)</source>
-        <translation> (Sina ise)</translation>
-    </message>
     <message>
         <source>digi-ID</source>
         <translation>digi-ID</translation>
@@ -1320,10 +1316,6 @@ LDAP serveriga ei saa ühendust.</translation>
         <source>Encrypt</source>
         <translation>Krüpteeri</translation>
     </message>
-    <message>
-        <source>Decrypt</source>
-        <translation>Dekrüpteeri</translation>
-    </message>
     <message>
         <source>Sign</source>
         <translation>Allkirjasta</translation>