Remove fromPunycode

Add ee, fi, lt, lv to allowed IDN parsing list

WE2-1173

Signed-off-by: Raul Metsma <raul@metsma.ee>

Author: metsma

src/controller/application.cpp

@@ -60,6 +60,15 @@ Application::Application(int& argc, char** argv, const QString& name) :
     installTranslator(translator);
     loadTranslations();
 
+    auto list = QUrl::idnWhitelist();
+    list.append({
+        QStringLiteral("fi"),
+        QStringLiteral("ee"),
+        QStringLiteral("lt"),
+        QStringLiteral("lv"),
+    });
+    QUrl::setIdnWhitelist(list);
+
     for (const QString& font : QDir(QStringLiteral(":/fonts")).entryList()) {
         QFontDatabase::addApplicationFont(QStringLiteral(":/fonts/%1").arg(font));
     }

src/ui/CMakeLists.txt

@@ -4,7 +4,6 @@ add_library(ui STATIC
     languageselect.cpp
     languageselect.hpp
     languageselect.ui
-    punycode.hpp
     ui.cpp
     webeiddialog.cpp
     webeiddialog.hpp

src/ui/dialog.ui

@@ -496,6 +496,9 @@ border-radius: 4px;</string>
            <property name="focusPolicy">
             <enum>Qt::TabFocus</enum>
            </property>
+           <property name="textFormat">
+            <enum>Qt::PlainText</enum>
+           </property>
           </widget>
          </item>
         </layout>
@@ -569,6 +572,9 @@ border-radius: 4px;</string>
            <property name="focusPolicy">
             <enum>Qt::TabFocus</enum>
            </property>
+           <property name="textFormat">
+            <enum>Qt::PlainText</enum>
+           </property>
           </widget>
          </item>
         </layout>

src/ui/punycode.hpp

@@ -23,7 +23,6 @@
 #include "webeiddialog.hpp"
 #include "application.hpp"
 #include "languageselect.hpp"
-#include "punycode.hpp"
 
 #include "ui_dialog.h"
 
@@ -280,7 +279,7 @@ void WebEidDialog::onSmartCardStatusUpdate(const RetriableError status)
 void WebEidDialog::onMultipleCertificatesReady(
     const QUrl& origin, const std::vector<EidCertificateAndPinInfo>& certAndPinInfos)
 {
-    ui->selectCertificateOriginLabel->setText(fromPunycode(origin));
+    setupOrigin(origin);
     setupCertificateAndPinInfo(certAndPinInfos);
 
     switch (currentCommand) {
@@ -334,7 +333,7 @@ void WebEidDialog::onMultipleCertificatesReady(
 void WebEidDialog::onSingleCertificateReady(const QUrl& origin,
                                             const EidCertificateAndPinInfo& certAndPinInfo)
 {
-    ui->selectCertificateOriginLabel->setText(fromPunycode(origin));
+    setupOrigin(origin);
     ui->pinInputOriginLabel->setText(ui->selectCertificateOriginLabel->text());
     const bool useExternalPinDialog = certAndPinInfo.eid->providesExternalPinDialog();
 
@@ -552,6 +551,13 @@ void WebEidDialog::setupCertificateAndPinInfo(
     }
 }
 
+void WebEidDialog::setupOrigin(const QUrl& origin)
+{
+    const auto host = origin.host(QUrl::PrettyDecoded);
+    ui->selectCertificateOriginLabel->setText(QStringLiteral("%2%3").arg(
+        host, origin.port() == -1 ? QString() : QStringLiteral(":%1").arg(origin.port())));
+}
+
 void WebEidDialog::setupPinPrompt(PinInfo pinInfo, bool cardActive)
 {
     ui->okButton->setHidden(pinInfo.readerHasPinPad || !cardActive);

src/ui/webeiddialog.cpp

@@ -101,6 +101,7 @@ class WebEidDialog final : public WebEidUI
     void setTrText(QWidget* label, Text text) const;
     void
     setupCertificateAndPinInfo(const std::vector<EidCertificateAndPinInfo>& cardCertAndPinInfos);
+    void setupOrigin(const QUrl& origin);
     void setupPinPrompt(PinInfo pinInfo, bool cardActive);
     void setupPinPadProgressBarAndEmitWait(const EidCertificateAndPinInfo& certAndPinInfo);
     void setupPinInput(const EidCertificateAndPinInfo& certAndPinInfo);

src/ui/webeiddialog.hpp

@@ -26,8 +26,6 @@
 #include "controller.hpp"
 #include "command-handlers/getcertificate.hpp"
 
-#include "../ui/punycode.hpp"
-
 #include "mock-ui.hpp"
 #include "getcommandhandler-mock.hpp"
 
@@ -72,8 +70,6 @@ private slots:
 
     void authenticate_validArgumentsResultInValidToken();
 
-    void fromPunycode_decodesEeDomain();
-
     void quit_exits();
 
 private:
@@ -201,12 +197,6 @@ void WebEidTests::authenticate_validArgumentsResultInValidToken()
              QStringLiteral("MIIEAzCCA2WgAwIBAgIQOWkBW"));
 }
 
-void WebEidTests::fromPunycode_decodesEeDomain()
-{
-    QCOMPARE(fromPunycode(QUrl(QStringLiteral("https://xn--igusnunik-p7af.ee"))),
-             QStringLiteral("\u00F5igusn\u00F5unik.ee"));
-}
-
 void WebEidTests::quit_exits()
 {
     try {