Skip to content

Remove fromPunycode #380

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
metsma wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove fromPunycode #380

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
9 changes: 9 additions & 0 deletions src/controller/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
1 change: 0 additions & 1 deletion src/ui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
add_library(ui STATIC
certificatewidget.cpp
certificatewidget.hpp
punycode.hpp
ui.cpp
webeiddialog.cpp
webeiddialog.hpp
Expand Down
6 changes: 6 additions & 0 deletions src/ui/dialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,9 @@ border-radius: 4px;</string>
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
</widget>
</item>
</layout>
Expand Down Expand Up @@ -586,6 +589,9 @@ border-radius: 4px;</string>
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
</widget>
</item>
</layout>
Expand Down
39 changes: 0 additions & 39 deletions src/ui/punycode.hpp
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions src/ui/webeiddialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

#include "webeiddialog.hpp"
#include "application.hpp"
#include "punycode.hpp"

#include "ui_dialog.h"

Expand All @@ -43,8 +42,6 @@
#include <unistd.h>
#endif

#include <unordered_map>

#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
constexpr inline QLatin1String operator"" _L1(const char* str, size_t size) noexcept
{
Expand Down Expand Up @@ -336,7 +333,7 @@ void WebEidDialog::onSmartCardStatusUpdate(const RetriableError status)
void WebEidDialog::onMultipleCertificatesReady(
const QUrl& origin, const std::vector<EidCertificateAndPinInfo>& certAndPinInfos)
{
ui->selectCertificateOriginLabel->setText(fromPunycode(origin));
ui->selectCertificateOriginLabel->setText(origin.host(QUrl::PrettyDecoded));
setupCertificateAndPinInfo(certAndPinInfos);

switch (currentCommand) {
Expand Down Expand Up @@ -390,7 +387,7 @@ void WebEidDialog::onMultipleCertificatesReady(
void WebEidDialog::onSingleCertificateReady(const QUrl& origin,
const EidCertificateAndPinInfo& certAndPinInfo)
{
ui->selectCertificateOriginLabel->setText(fromPunycode(origin));
ui->selectCertificateOriginLabel->setText(origin.host(QUrl::PrettyDecoded));
ui->pinInputOriginLabel->setText(ui->selectCertificateOriginLabel->text());
const bool useExternalPinDialog = certAndPinInfo.eid->providesExternalPinDialog();

Expand Down
10 changes: 0 additions & 10 deletions tests/tests/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
#include "controller.hpp"
#include "command-handlers/getcertificate.hpp"

#include "../ui/punycode.hpp"

#include "mock-ui.hpp"
#include "getcommandhandler-mock.hpp"

Expand Down Expand Up @@ -72,8 +70,6 @@ private slots:

void authenticate_validArgumentsResultInValidToken();

void fromPunycode_decodesEeDomain();

void quit_exits();

private:
Expand Down Expand Up @@ -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 {
Expand Down
Loading