PIN activation (#1357)

IB-8609, IB-8639

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

Author: metsma

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
       LIBS_PATH: ${{ github.workspace }}/cache
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         submodules: recursive
     - name: Download artifact
@@ -69,7 +69,7 @@ jobs:
     container: ubuntu:${{ matrix.container }}
     strategy:
       matrix:
-        container: ['22.04', '24.04', '25.04']
+        container: ['22.04', '24.04', '25.04', '25.10']
         arch: ['amd64', 'arm64']
     env:
       DEBIAN_FRONTEND: noninteractive
@@ -87,7 +87,7 @@ jobs:
     - name: Install dependencies
       run: apt update -qq && apt install --no-install-recommends -y git lsb-release build-essential devscripts debhelper pkg-config lintian ${UBUNTU_DEPS}
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         submodules: recursive
     - name: Setup changelog
@@ -112,7 +112,7 @@ jobs:
     container: fedora:${{ matrix.container }}
     strategy:
       matrix:
-        container: [41, 42]
+        container: [41, 42, 43]
     steps:
     - name: Download artifact
       uses: dawidd6/action-download-artifact@v11
@@ -125,7 +125,7 @@ jobs:
     - name: Install Deps
       run: dnf install -y ./libdigidocpp-pkg/*.rpm git gcc-c++ cmake rpm-build gettext openssl-devel openldap-devel pcsc-lite-devel qt6-qtsvg-devel qt6-qttools-devel flatbuffers-devel flatbuffers-compiler zlib-devel
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         submodules: recursive
     - name: Build
@@ -147,7 +147,7 @@ jobs:
       VER_SUFFIX: .VS${{ matrix.vcver }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         submodules: recursive
     - name: Download artifact
@@ -211,7 +211,7 @@ jobs:
       PROJECTNAME: open-eid/DigiDoc4-Client
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         submodules: recursive
     - name: Download artifact
@@ -253,7 +253,7 @@ jobs:
       security-events: write
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         submodules: recursive
     - name: Download artifact

client/MainWindow.cpp

@@ -66,8 +66,6 @@ MainWindow::MainWindow( QWidget *parent )
 	ui->signIntroButton->setFocus();
 	ui->noReaderInfoText->setProperty("currenttext", ui->noReaderInfoText->text());
 
-	connect(ui->warnings, &WarningList::warningClicked, this, &MainWindow::warningClicked);
-
 	ui->version->setText(QStringLiteral("%1%2").arg(tr("Ver. "), Application::applicationVersion()));
 	connect(ui->version, &QPushButton::clicked, this, [this] {showSettings(SettingsDialog::DiagnosticsSettings);});
 
@@ -97,12 +95,12 @@ MainWindow::MainWindow( QWidget *parent )
 	connect(qApp->signer(), &QSigner::signDataChanged, this, [this](const TokenData &token) {
 		updateSelectorData(token);
 		updateMyEID(token);
-		ui->signContainerPage->cardChanged(token.cert());
+		ui->signContainerPage->cardChanged(token.cert(), token.data(QStringLiteral("blocked")).toBool());
 	});
 	connect(qApp->signer(), &QSigner::authDataChanged, this, [this](const TokenData &token) {
 		updateSelectorData(token);
 		updateMyEID(token);
-		ui->cryptoContainerPage->cardChanged(token.cert());
+		ui->cryptoContainerPage->cardChanged(token.cert(), token.data(QStringLiteral("blocked")).toBool());
 	});
 	QPCSC::instance().start();
 
@@ -116,28 +114,26 @@ MainWindow::MainWindow( QWidget *parent )
 	connect(ui->signContainerPage, &ContainerPage::fileRemoved, this, &MainWindow::removeSignatureFile);
 	connect(ui->signContainerPage, &ContainerPage::removed, this, &MainWindow::removeSignature);
 	connect(ui->signContainerPage, &ContainerPage::warning, this, [this](WarningText warningText) {
-		ui->warnings->showWarning(warningText);
+		ui->warnings->showWarning(std::move(warningText));
 		ui->signature->warningIcon(true);
 	});
 
 	connect(ui->cryptoContainerPage, &ContainerPage::action, this, &MainWindow::onCryptoAction);
 	connect(ui->cryptoContainerPage, &ContainerPage::addFiles, this, [this](const QStringList &files) { openFiles(files, true); } );
 	connect(ui->cryptoContainerPage, &ContainerPage::fileRemoved, this, &MainWindow::removeCryptoFile);
 	connect(ui->cryptoContainerPage, &ContainerPage::warning, this, [this](WarningText warningText) {
-		ui->warnings->showWarning(warningText);
+		ui->warnings->showWarning(std::move(warningText));
 		ui->crypto->warningIcon(true);
 	});
 
-	connect(ui->accordion, &Accordion::changePin1Clicked, this, &MainWindow::changePin1Clicked);
-	connect(ui->accordion, &Accordion::changePin2Clicked, this, &MainWindow::changePin2Clicked);
-	connect(ui->accordion, &Accordion::changePukClicked, this, &MainWindow::changePukClicked);
+	connect(ui->accordion, &Accordion::changePinClicked, this, &MainWindow::changePinClicked);
 	connect(ui->cardInfo, &CardWidget::selected, ui->selector, &QToolButton::toggle);
 
 	updateSelectorData(qApp->signer()->tokensign());
 	updateMyEID(qApp->signer()->tokensign());
-	updateMyEid(qApp->signer()->smartcard()->data());
 	ui->signContainerPage->cardChanged(qApp->signer()->tokensign().cert());
 	ui->cryptoContainerPage->cardChanged(qApp->signer()->tokenauth().cert());
+	updateMyEid(qApp->signer()->smartcard()->data());
 }
 
 MainWindow::~MainWindow()
@@ -904,14 +900,6 @@ bool MainWindow::validateFiles(const QString &container, const QStringList &file
 	return false;
 }
 
-void MainWindow::warningClicked(const QString &link)
-{
-	if(link == QLatin1String("#unblock-PIN1"))
-		changePin1Clicked(false, true);
-	else if(link == QLatin1String("#unblock-PIN2"))
-		changePin2Clicked(false, true);
-}
-
 bool MainWindow::wrap(const QString& wrappedFile, bool enclose)
 {
 	QString filename = FileDialog::createNewFileName(wrappedFile, true, this);

client/MainWindow.h

@@ -59,9 +59,7 @@ class MainWindow final : public QWidget
 
 private:
 	void adjustDrops();
-	void changePin1Clicked( bool isForgotPin, bool isBlockedPin );
-	void changePin2Clicked( bool isForgotPin, bool isBlockedPin );
-	void changePukClicked();
+	void changePinClicked(QSmartCardData::PinType type, QSmartCard::PinAction action);
 	void convertToBDoc();
 	void convertToCDoc();
 	ria::qdigidoc4::ContainerState currentState();
@@ -75,8 +73,6 @@ class MainWindow final : public QWidget
 	void onSignAction(int action, const QString &info1, const QString &info2);
 	void openContainer(bool signature);
 	void pageSelected(int page, bool checked = true);
-	void pinUnblock(QSmartCardData::PinType type, bool isForgotPin);
-	void pinPukChange( QSmartCardData::PinType type );
 	void resetCryptoDoc(std::unique_ptr<CryptoDoc> &&doc = {});
 	void resetDigiDoc(DigiDoc *doc = nullptr, bool warnOnChange = true);
 	void removeCryptoFile(int index);
@@ -87,15 +83,12 @@ class MainWindow final : public QWidget
 	QString selectFile( const QString &title, const QString &filename, bool fixedExt );
 	template <typename F>
 	void sign(F &&sign);
-	void updateCardWarnings(const QSmartCardData &data);
-	bool validateCardError(QSmartCardData::PinType type, QSmartCardData::PinType src, QSmartCard::ErrorType err);
 	bool validateFiles(const QString &container, const QStringList &files);
-	void showPinBlockedWarning(const QSmartCardData& t);
+	void showPinBlockedWarning(const QSmartCardData &data);
 	void updateSelector();
 	void updateSelectorData(TokenData data);
 	void updateMyEID(const TokenData &t);
 	void updateMyEid(const QSmartCardData &data);
-	void warningClicked(const QString &link);
 	bool wrap(const QString& wrappedFile, bool enclose);
 	bool wrapContainer(bool signing);
 	void containerSummary();