Format subject info

WE2-738

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

Author: metsma

src/controller/command-handlers/certificatereader.cpp

@@ -45,10 +45,23 @@ CardCertificateAndPinInfo getCertificateWithStatusAndInfo(const CardInfo::ptr& c
               "Invalid certificate returned by electronic ID " + card->eid().name());
     }
 
+    auto subject = certificate.subjectInfo(QSslCertificate::CommonName).join(' ');
+    auto givenName = certificate.subjectInfo("GN").join(' ');
+    auto surName = certificate.subjectInfo("SN").join(' ');
+    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")) && serialNumber[5] == '-')
+        serialNumber.remove(0, 6);
+
+    if (!givenName.isEmpty() || !surName.isEmpty() || !serialNumber.isEmpty()) {
+        subject = QStringLiteral("%1, %2, %3").arg(surName, givenName, serialNumber);
+    }
+
     auto certInfo = CertificateInfo {certificateType,
                                      certificate.expiryDate() < QDateTime::currentDateTimeUtc(),
                                      certificate.effectiveDate() > QDateTime::currentDateTimeUtc(),
-                                     certificate.subjectInfo(QSslCertificate::CommonName).join(' '),
+                                     subject,
                                      certificate.issuerInfo(QSslCertificate::CommonName).join(' '),
                                      certificate.effectiveDate().date().toString(Qt::ISODate),
                                      certificate.expiryDate().date().toString(Qt::ISODate)};

tests/tests/main.cpp

@@ -122,7 +122,7 @@ void WebEidTests::getCertificate_validCertificateHasExpectedCertificateSubject()
 
     // assert
     const auto certInfo = getCertAndPinInfoFromSignalSpy(certificateReadySpy);
-    QCOMPARE(certInfo.subject, QStringLiteral("M\u00C4NNIK,MARI-LIIS,61709210125"));
+    QCOMPARE(certInfo.subject, QStringLiteral("M\u00C4NNIK, MARI-LIIS, 61709210125"));
 
     const auto certBytes =
         QByteArray::fromBase64(controller->result()["certificate"].toString().toUtf8());
@@ -149,7 +149,7 @@ void WebEidTests::getCertificate_expiredCertificateHasExpectedCertificateSubject
 
     // assert
     const auto certInfo = getCertAndPinInfoFromSignalSpy(certificateReadySpy);
-    QCOMPARE(certInfo.subject, QStringLiteral("M\u00C4NNIK,MARI-LIIS,61709210125"));
+    QCOMPARE(certInfo.subject, QStringLiteral("M\u00C4NNIK, MARI-LIIS, 61709210125"));
 
     const auto certBytes =
         QByteArray::fromBase64(controller->result()["certificate"].toString().toUtf8());
@@ -191,7 +191,7 @@ void WebEidTests::authenticate_validArgumentsResultInValidToken()
 
     // assert
     const auto certInfo = getCertAndPinInfoFromSignalSpy(authenticateSpy);
-    QCOMPARE(certInfo.subject, QStringLiteral("M\u00C4NNIK,MARI-LIIS,61709210125"));
+    QCOMPARE(certInfo.subject, QStringLiteral("M\u00C4NNIK, MARI-LIIS, 61709210125"));
 
     QCOMPARE(controller->result()["unverifiedCertificate"].toString().left(25),
              QStringLiteral("MIIGRzCCBC+gAwIBAgIQRA7X0"));