Skip to content

Show warning when card requires activation #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Show warning when card requires activation #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cmake-linux-fedora.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
container: fedora:${{ matrix.container }}
strategy:
matrix:
container: [41, 42]
container: [41, 42, 43]

steps:
- name: Install Deps
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cmake-linux-ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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']

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cmake-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
submodules: recursive

Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: 6.9.1
version: 6.9.3
arch: clang_64

- name: Configure
Expand Down
36 changes: 24 additions & 12 deletions .github/workflows/cmake-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,42 @@ env:
BUILD_TYPE: RelWithDebInfo
BUILD_NUMBER: ${{github.run_number}}
CMAKE_BUILD_PARALLEL_LEVEL: 4
VCPKG_INSTALLED_DIR: ${{ github.workspace }}/build/vcpkg_installed
# Use libelectronic-id vcpkg manifest for dependencies
VCPKG_MANIFEST_DIR: ./lib/libelectronic-id/.github

jobs:
build:
runs-on: windows-2022
runs-on: windows-2025
strategy:
matrix:
arch: [x64, arm64]

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
submodules: recursive

- name: Cache vcpkg
uses: actions/cache@v4
with:
path: ${{ github.workspace }}/vcpkg_cache
key: vcpkg-${{ matrix.arch }}-${{ hashFiles(format('{0}/vcpkg.json', env.VCPKG_MANIFEST_DIR)) }}

- name: Prepare vcpkg and libraries
uses: lukka/run-vcpkg@v7
uses: lukka/run-vcpkg@v11
with:
vcpkgArguments: gtest openssl
vcpkgTriplet: ${{matrix.arch}}-windows
vcpkgGitCommitId: 031ad89ce6c575df35a8e58707ad2c898446c63e
vcpkgJsonGlob: ${{ env.VCPKG_MANIFEST_DIR }}/vcpkg.json
runVcpkgInstall: true
env:
VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
VCPKG_DEFAULT_TRIPLET: ${{ matrix.arch }}-windows

- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: 6.9.1
version: 6.9.3
arch: ${{ matrix.arch == 'arm64' && 'win64_msvc2022_arm64_cross_compiled' || 'win64_msvc2022_64' }}

- name: Setup MS Visual C++ dev env
Expand All @@ -40,16 +51,17 @@ jobs:

- name: Install WiX
run: |
dotnet tool install --global wix --version 6.0.1
wix extension -g add WixToolset.UI.wixext/6.0.1
wix extension -g add WixToolset.Util.wixext/6.0.1
wix extension -g add WixToolset.BootstrapperApplications.wixext/6.0.1
dotnet tool install --global wix --version 6.0.2
wix extension -g add WixToolset.UI.wixext/6.0.2
wix extension -g add WixToolset.Util.wixext/6.0.2
wix extension -g add WixToolset.BootstrapperApplications.wixext/6.0.2

- name: Configure
run: |
cmake "-GNinja" -S . -B build `
"-DCMAKE_TOOLCHAIN_FILE=${env:RUNVCPKG_VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" `
"-DCMAKE_BUILD_TYPE=${env:BUILD_TYPE}"
"-DCMAKE_BUILD_TYPE=${env:BUILD_TYPE}" `
"-DVCPKG_MANIFEST_DIR=${{ env.VCPKG_MANIFEST_DIR }}"

- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion lib/libelectronic-id
Open in desktop
Submodule libelectronic-id updated 16 files
+5 −0 .github/vcpkg.json
+17 −5 .github/workflows/cmake-windows.yml
+10 −4 include/electronic-id/electronic-id.hpp
+4 −4 src/electronic-ids/ms-cryptoapi/MsCryptoApiElectronicID.hpp
+5 −7 src/electronic-ids/pcsc/EIDIDEMIA.cpp
+3 −6 src/electronic-ids/pcsc/EIDIDEMIA.hpp
+9 −11 src/electronic-ids/pcsc/EIDThales.cpp
+9 −10 src/electronic-ids/pcsc/EIDThales.hpp
+6 −1 src/electronic-ids/pcsc/EstEIDThales.hpp
+4 −12 src/electronic-ids/pcsc/PcscElectronicID.hpp
+2 −2 src/electronic-ids/pkcs11/PKCS11CardManager.hpp
+4 −4 src/electronic-ids/pkcs11/Pkcs11ElectronicID.cpp
+2 −2 src/electronic-ids/pkcs11/Pkcs11ElectronicID.hpp
+1 −1 tests/integration/test-authenticate.cpp
+1 −1 tests/integration/test-signing.cpp
+24 −24 tests/mock/test-get-certificate.cpp
7 changes: 4 additions & 3 deletions src/controller/certandpininfo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ struct PinInfo
using PinMinMaxLength = std::pair<uint8_t, uint8_t>;
using PinRetriesCount = std::pair<int8_t, int8_t>;

PinMinMaxLength pinMinMaxLength = {0, 0};
PinRetriesCount pinRetriesCount = {0, -1};
PinMinMaxLength pinMinMaxLength {0, 0};
PinRetriesCount pinRetriesCount {0, -1};
bool readerHasPinPad = false;
bool pinIsBlocked = false;
constexpr bool pinIsBlocked() const { return pinRetriesCount.first == 0; }

static constexpr int PIN_PAD_PIN_ENTRY_TIMEOUT = pcsc_cpp::PIN_PAD_PIN_ENTRY_TIMEOUT;
};
Expand All @@ -55,6 +55,7 @@ struct EidCertificateAndPinInfo
QSslCertificate certificate {};
CertificateInfo certInfo;
PinInfo pinInfo;
bool cardActive = true;
};

Q_DECLARE_METATYPE(EidCertificateAndPinInfo)
31 changes: 22 additions & 9 deletions src/controller/command-handlers/certificatereader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ EidCertificateAndPinInfo getCertificateWithStatusAndInfo(const ElectronicID::ptr
auto serialNumber = certificate.subjectInfo(QSslCertificate::SerialNumber).join(' ');

// http://www.etsi.org/deliver/etsi_en/319400_319499/31941201/01.01.01_60/en_31941201v010101p.pdf
if (serialNumber.size() > 6 && serialNumber.startsWith(QStringLiteral("PNO"))
if (serialNumber.size() > 6 && serialNumber.startsWith(QLatin1String("PNO"))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any reason not to use the QString operator:

Suggested change
if (serialNumber.size() > 6 && serialNumber.startsWith(QLatin1String("PNO"))
if (serialNumber.size() > 6 && serialNumber.startsWith(u"PNO"_s))

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need still support Qt 6.2

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need still support Qt 6.2.
https://doc.qt.io/qt-6/qt-literals-stringliterals.html Since 6.4

&& serialNumber[5] == '-')
serialNumber.remove(0, 6);

Expand All @@ -61,16 +61,29 @@ EidCertificateAndPinInfo getCertificateWithStatusAndInfo(const ElectronicID::ptr
CertificateInfo certInfo {
certificateType, certificate.expiryDate() < QDateTime::currentDateTimeUtc(),
certificate.effectiveDate() > QDateTime::currentDateTimeUtc(), std::move(subject)};
PinInfo pinInfo {certificateType.isAuthentication() ? eid->authPinMinMaxLength()
: eid->signingPinMinMaxLength(),
certificateType.isAuthentication() ? eid->authPinRetriesLeft()
: eid->signingPinRetriesLeft(),
eid->smartcard().readerHasPinPad()};
if (pinInfo.pinRetriesCount.first == 0) {
pinInfo.pinIsBlocked = true;
auto info = certificateType.isAuthentication() ? eid->authPinInfo() : eid->signingPinInfo();
PinInfo pinInfo {.pinMinMaxLength = certificateType.isAuthentication()
? eid->authPinMinMaxLength()
: eid->signingPinMinMaxLength(),
.pinRetriesCount {
info.retryCount,
info.maxRetry,
},
.readerHasPinPad = eid->smartcard().readerHasPinPad()};
bool cardActivated = info.pinActive;
if (certificateType == CertificateType::AUTHENTICATION && eid->type() == ElectronicID::EstEID
&& eid->name() == "EstEIDThales") {
cardActivated = eid->signingPinInfo().pinActive;
}

return {eid, std::move(certificateDer), certificate, std::move(certInfo), std::move(pinInfo)};
return {
.eid = eid,
.certificateBytesInDer = std::move(certificateDer),
.certificate = certificate,
.certInfo = std::move(certInfo),
.pinInfo = std::move(pinInfo),
.cardActive = cardActivated,
};
}

} // namespace
Expand Down
8 changes: 3 additions & 5 deletions src/ui/certificatewidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,9 @@ void CertificateWidgetInfo::setCertificateInfo(const EidCertificateAndPinInfo& c
info->setText(CertificateWidget::tr("<b>%1</b><br />Issuer: %2<br />Valid: %3 to %4%5")
.arg(subject, issuer, effectiveDate, expiryDate, warning));
info->parentWidget()->setDisabled(certInfo.notEffective || certInfo.isExpired
|| cardCertPinInfo.pinInfo.pinIsBlocked);
if (warning.isEmpty() && cardCertPinInfo.pinInfo.pinIsBlocked) {
warnIcon->show();
warn->show();
}
|| cardCertPinInfo.pinInfo.pinIsBlocked());
warnIcon->setVisible(warning.isEmpty() && cardCertPinInfo.pinInfo.pinIsBlocked());
warn->setVisible(warning.isEmpty() && cardCertPinInfo.pinInfo.pinIsBlocked());
}

void CertificateWidgetInfo::languageChange()
Expand Down
22 changes: 22 additions & 0 deletions src/ui/dialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,28 @@ height: 24px;
<property name="bottomMargin">
<number>20</number>
</property>
<item>
<widget class="QLabel" name="lockedWarning">
<property name="styleSheet">
<string notr="true">background-color: #FAE7C9;
color: #003168;
font-family: Roboto, Helvetica;
font-size: 14px;
padding: 10px;
border: none;
border-radius: 4px;</string>
</property>
<property name="text">
<string>Signing with an ID-card isn't possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. &lt;a href=&quot;https://www.id.ee/en/article/changing-id-card-pin-codes-and-puk-code/&quot;&gt;Additional information&lt;/a&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QStackedWidget" name="pageStack">
<property name="currentIndex">
Expand Down
8 changes: 8 additions & 0 deletions src/ui/translations/cs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@
<source>Operation failed</source>
<translation>Operace se nezdařila</translation>
</message>
<message>
<source>PIN entry disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Card driver error. Please try again.</source>
<translation>Chyba ovladače karty. Zkuste to prosím znovu.</translation>
Expand Down Expand Up @@ -193,6 +197,10 @@
<source>Try again</source>
<translation>Zkuste to znovu</translation>
</message>
<message>
<source>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. &lt;a href=&quot;https://www.id.ee/en/article/changing-id-card-pin-codes-and-puk-code/&quot;&gt;Additional information&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation>Zrušit</translation>
Expand Down
10 changes: 9 additions & 1 deletion src/ui/translations/de.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,17 @@
<source>Operation failed</source>
<translation>Der Vorgang ist fehlgeschlagen</translation>
</message>
<message>
<source>PIN entry disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Card driver error. Please try again.</source>
<translation>Kartentreiberfehler. Bitte versuche es erneut.</translation>
</message>
<message>
<source>Card driver error</source>
<translation>Kartentreiberfehler.</translation>
<translation>Kartentreiberfehler</translation>
</message>
<message>
<source>An error occurred in the Smart Card service required to use the ID-card. Make sure that the ID-card and the card reader are connected correctly or relaunch the Smart Card service.</source>
Expand Down Expand Up @@ -191,6 +195,10 @@
<source>Try again</source>
<translation>Versuch es noch einmal</translation>
</message>
<message>
<source>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. &lt;a href=&quot;https://www.id.ee/en/article/changing-id-card-pin-codes-and-puk-code/&quot;&gt;Additional information&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation>Abbrechen</translation>
Expand Down
8 changes: 8 additions & 0 deletions src/ui/translations/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,10 @@
<source>Operation failed</source>
<translation>Operation failed</translation>
</message>
<message>
<source>PIN entry disabled</source>
<translation>PIN entry disabled</translation>
</message>
<message>
<source>Card driver error. Please try again.</source>
<translation>Card driver error. Please try again.</translation>
Expand Down Expand Up @@ -191,6 +195,10 @@
<source>Try again</source>
<translation>Try again</translation>
</message>
<message>
<source>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. &lt;a href=&quot;https://www.id.ee/en/article/changing-id-card-pin-codes-and-puk-code/&quot;&gt;Additional information&lt;/a&gt;</source>
<translation>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. &lt;a href=&quot;https://www.id.ee/en/article/changing-id-card-pin-codes-and-puk-code/&quot;&gt;Additional information&lt;/a&gt;</translation>
</message>
<message>
<source>Cancel</source>
<translation>Cancel</translation>
Expand Down
8 changes: 8 additions & 0 deletions src/ui/translations/et.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@
<source>PIN entry cancelled.</source>
<translation>PIN-koodi sisestamine katkestati.</translation>
</message>
<message>
<source>PIN entry disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Launch the Smart Card service</source>
<translation>Käivita Kiipkaardi teenus</translation>
Expand Down Expand Up @@ -191,6 +195,10 @@
<source>Try again</source>
<translation>Proovi uuesti</translation>
</message>
<message>
<source>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. &lt;a href=&quot;https://www.id.ee/en/article/changing-id-card-pin-codes-and-puk-code/&quot;&gt;Additional information&lt;/a&gt;</source>
<translation>ID-kaardiga allkirjastamine ei ole veel võimalik. Allkirjastamiseks tuleb DigiDoc4 rakenduses PIN2-koodi muuta. &lt;a href=&quot;https://www.id.ee/artikkel/id-kaardi-pin-ja-puk-koodide-muutmine/&quot;&gt;Lisainfo&lt;/a&gt;</translation>
</message>
<message>
<source>Cancel</source>
<translation>Katkesta</translation>
Expand Down
16 changes: 12 additions & 4 deletions src/ui/translations/fi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@
<source>Operation failed</source>
<translation>Toiminto epäonnistui</translation>
</message>
<message>
<source>PIN entry disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Card driver error. Please try again.</source>
<translation>Kortinlukijan virhe. Yritä uudelleen.</translation>
Expand Down Expand Up @@ -163,6 +167,10 @@
<source>Try again</source>
<translation>Yritä uudelleen</translation>
</message>
<message>
<source>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. &lt;a href=&quot;https://www.id.ee/en/article/changing-id-card-pin-codes-and-puk-code/&quot;&gt;Additional information&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation>Peruuta</translation>
Expand All @@ -177,7 +185,7 @@
</message>
<message>
<source>https://www.id.ee/en/article/how-to-check-that-your-id-card-reader-is-working/</source>
<translation type="unfinished">https://www.id.ee/en/article/how-to-check-that-your-id-card-reader-is-working/</translation>
<translation>https://www.id.ee/en/article/how-to-check-that-your-id-card-reader-is-working/</translation>
</message>
<message>
<source>By signing, I agree to the transfer of my name and personal identification code to the service provider.</source>
Expand Down Expand Up @@ -257,15 +265,15 @@
</message>
<message>
<source>The inserted ID-card does not contain a certificate for the requested operation. Please insert an ID-card that supports the requested operation.</source>
<translation type="unfinished">Asennettu henkilökortti ei sisällä varmennetta pyydettyä toimintoa varten. Aseta sisään henkilökortti, joka tukee pyydettyä toimintoa.</translation>
<translation>Asennettu henkilökortti ei sisällä varmennetta pyydettyä toimintoa varten. Aseta sisään henkilökortti, joka tukee pyydettyä toimintoa.</translation>
</message>
<message>
<source>Please enter PIN for authentication in the PIN dialog window that opens.</source>
<translation type="unfinished">Syötä PIN todennusta varten avautuvaan PIN-valintaikkunaan.</translation>
<translation>Syötä PIN todennusta varten avautuvaan PIN-valintaikkunaan.</translation>
</message>
<message>
<source>Please enter PIN for signing in the PIN dialog window that opens.</source>
<translation type="unfinished">Syötä PIN kirjautumista varten avautuvaan PIN-valintaikkunaan.</translation>
<translation>Syötä PIN kirjautumista varten avautuvaan PIN-valintaikkunaan.</translation>
</message>
<message>
<source>EN</source>
Expand Down
Loading