Fix PUK message with Omnikey PinPad (#1378)

IB-8774

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

client/MainWindow.h

@@ -82,7 +82,6 @@ class MainWindow final : public QWidget
 	template <typename F>
 	void sign(F &&sign);
 	bool validateFiles(const QString &container, const QStringList &files);
-	void showPinBlockedWarning(const QSmartCardData &data);
 	void updateSelector();
 	void updateSelectorData(TokenData data);
 	void updateMyEID(const TokenData &t);

client/MainWindow_MyEID.cpp

@@ -23,7 +23,6 @@
 #include "Application.h"
 #include "QSigner.h"
 #include "SslCertificate.h"
-#include "effects/FadeInNotification.h"
 #include "widgets/WarningItem.h"
 #include "widgets/WarningList.h"
 
@@ -34,89 +33,8 @@ using namespace ria::qdigidoc4;
 
 void MainWindow::changePinClicked(QSmartCardData::PinType type, QSmartCard::PinAction action)
 {
-	QSmartCardData::PinType src = type;
-	QSmartCard::ErrorType err;
-	if(action == QSmartCard::ChangeWithPin || action == QSmartCard::ActivateWithPin)
-		err = qApp->signer()->smartcard()->pinChange(type, action, this);
-	else
-	{
-		src = QSmartCardData::PukType;
-		err = qApp->signer()->smartcard()->pinUnblock(type, action, this);
-	}
-	QSmartCardData data = qApp->signer()->smartcard()->data();
-	ui->accordion->updateInfo(data);
-	switch(err)
-	{
-		using enum QSmartCard::ErrorType;
-	case NoError:
-		switch(action)
-		{
-			using enum QSmartCard::PinAction;
-		case ActivateWithPin:
-		case ActivateWithPuk:
-			showPinBlockedWarning(data);
-			Q_FALLTHROUGH();
-		case ChangeWithPin:
-		case ChangeWithPuk:
-			return FadeInNotification::success(ui->topBar, tr("%1 changed!").arg(QSmartCardData::typeString(type)));
-		case UnblockWithPuk:
-			showPinBlockedWarning(data);
-			return FadeInNotification::success(ui->topBar, tr("%1 has been changed and the certificate has been unblocked!")
-				.arg(QSmartCardData::typeString(type)));
-		}
-	case BlockedError:
-		showPinBlockedWarning(data);
-		return FadeInNotification::warning(ui->topBar, tr("%1 blocked").arg(QSmartCardData::typeString(src)));
-	case ValidateError:
-		return FadeInNotification::warning(ui->topBar, tr("Wrong %1 code. You can try %n more time(s).", nullptr,
-			data.retryCount(src)).arg(QSmartCardData::typeString(src)));
-	case CancelError: break;
-	case TimeoutError:
-		return FadeInNotification::warning(ui->topBar, tr("%1 timeout").arg(QSmartCardData::typeString(type)));
-	case DifferentError:
-		return FadeInNotification::warning(ui->topBar, tr("New %1 codes doesn't match").arg(QSmartCardData::typeString(type)));
-	case LenghtError:
-		return FadeInNotification::warning(ui->topBar, tr("%1 length has to be between %2 and 12")
-			.arg(QSmartCardData::typeString(type)).arg(QSmartCardData::minPinLen(type)));
-	case OldNewPinSameError:
-		return FadeInNotification::warning(ui->topBar, tr("Old and new %1 has to be different!").arg(QSmartCardData::typeString(type)));
-	default:
-		return FadeInNotification::warning(ui->topBar, tr("Changing %1 failed").arg(QSmartCardData::typeString(type)));
-	}
-}
-
-void MainWindow::showPinBlockedWarning(const QSmartCardData &data)
-{
-	if(data.isNull())
-		return;
-	bool pin1Blocked = data.retryCount(QSmartCardData::Pin1Type) == 0;
-	bool pin2Blocked = data.retryCount(QSmartCardData::Pin2Type) == 0;
-	bool pin2Locked = data.pinLocked(QSmartCardData::Pin2Type);
-	ui->myEid->warningIcon(
-		pin1Blocked ||
-		pin2Blocked || pin2Locked ||
-		data.retryCount(QSmartCardData::PukType) == 0);
-	ui->signContainerPage->cardChanged(data.signCert(), pin2Blocked || pin2Locked);
-	ui->cryptoContainerPage->cardChanged(data.authCert(), pin1Blocked);
-
-	ui->warnings->closeWarning(WarningType::UnblockPin1Warning);
-	ui->warnings->closeWarning(WarningType::ActivatePin1WithPUKWarning);
-	if(pin1Blocked)
-		ui->warnings->showWarning({WarningType::UnblockPin1Warning, 0,
-			[this]{ changePinClicked(QSmartCardData::Pin1Type, QSmartCard::UnblockWithPuk); }});
-
-	ui->warnings->closeWarning(WarningType::UnblockPin2Warning);
-	ui->warnings->closeWarning(WarningType::ActivatePin2WithPUKWarning);
-	ui->warnings->closeWarning(WarningType::ActivatePin2Warning);
-	if(pin2Locked && pin2Blocked)
-		ui->warnings->showWarning({WarningType::ActivatePin2WithPUKWarning, 0,
-			[this]{ changePinClicked(QSmartCardData::Pin2Type, QSmartCard::ActivateWithPuk); }});
-	else if(pin2Blocked)
-		ui->warnings->showWarning({WarningType::UnblockPin2Warning, 0,
-			[this]{ changePinClicked(QSmartCardData::Pin2Type, QSmartCard::UnblockWithPuk); }});
-	else if(pin2Locked)
-		ui->warnings->showWarning({WarningType::ActivatePin2Warning, 0,
-			[this]{ changePinClicked(QSmartCardData::Pin2Type, QSmartCard::ActivateWithPin); }});
+	if(qApp->signer()->smartcard()->pinChange(type, action, ui->topBar))
+		updateMyEid(qApp->signer()->smartcard()->data());
 }
 
 void MainWindow::updateMyEID(const TokenData &t)
@@ -153,18 +71,42 @@ void MainWindow::updateMyEID(const TokenData &t)
 	}
 }
 
-void MainWindow::updateMyEid(const QSmartCardData &t)
+void MainWindow::updateMyEid(const QSmartCardData &data)
 {
-	ui->warnings->clearMyEIDWarnings();
-	ui->infoStack->update(t);
-	ui->accordion->updateInfo(t);
+	ui->infoStack->update(data);
+	ui->accordion->updateInfo(data);
 	ui->myEid->warningIcon(false);
 	ui->myEid->invalidIcon(false);
-	if(t.isNull())
+	ui->warnings->clearMyEIDWarnings();
+	if(data.isNull())
 		return;
+	bool pin1Blocked = data.retryCount(QSmartCardData::Pin1Type) == 0;
+	bool pin2Blocked = data.retryCount(QSmartCardData::Pin2Type) == 0;
+	bool pin2Locked = data.pinLocked(QSmartCardData::Pin2Type);
+	ui->myEid->warningIcon(
+		pin1Blocked ||
+		pin2Blocked || pin2Locked ||
+		data.retryCount(QSmartCardData::PukType) == 0);
+	ui->signContainerPage->cardChanged(data.signCert(), pin2Blocked || pin2Locked);
+	ui->cryptoContainerPage->cardChanged(data.authCert(), pin1Blocked);
+
+	if(pin1Blocked)
+		ui->warnings->showWarning({WarningType::UnblockPin1Warning, 0,
+			[this]{ changePinClicked(QSmartCardData::Pin1Type, QSmartCard::UnblockWithPuk); }});
+
+	if(pin2Locked && pin2Blocked)
+		ui->warnings->showWarning({WarningType::ActivatePin2WithPUKWarning, 0,
+			[this]{ changePinClicked(QSmartCardData::Pin2Type, QSmartCard::ActivateWithPuk); }});
+	else if(pin2Blocked)
+		ui->warnings->showWarning({WarningType::UnblockPin2Warning, 0,
+			[this]{ changePinClicked(QSmartCardData::Pin2Type, QSmartCard::UnblockWithPuk); }});
+	else if(pin2Locked)
+		ui->warnings->showWarning({WarningType::ActivatePin2Warning, 0,
+			[this]{ changePinClicked(QSmartCardData::Pin2Type, QSmartCard::ActivateWithPin); }});
+
 	const qint64 DAY = 24 * 60 * 60;
 	qint64 expiresIn = 106 * DAY;
-	for(const QSslCertificate &cert: {t.authCert(), t.signCert()})
+	for(const QSslCertificate &cert: {data.authCert(), data.signCert()})
 	{
 		if(!cert.isNull())
 			expiresIn = std::min<qint64>(expiresIn, QDateTime::currentDateTime().secsTo(cert.expiryDate().toLocalTime()));
@@ -179,5 +121,4 @@ void MainWindow::updateMyEid(const QSmartCardData &t)
 		ui->myEid->warningIcon(true);
 		ui->warnings->showWarning({WarningType::CertExpiryWarning});
 	}
-	showPinBlockedWarning(t);
 }

client/QPCSC.h

@@ -56,7 +56,7 @@ class QPCSCReader final: public QObject
 public:
 	struct Result {
 		QByteArray data;
-		quint16 SW;
+		quint16 SW = 0;
 		quint32 err = 0;
 		constexpr operator bool() const { return SW == 0x9000; }
 	};