Skip to content

Add separate LTA TSA URL #1461

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: master
Choose a base branch
from
Open

Add separate LTA TSA URL #1461

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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
include(CPack)
include(GNUInstallDirs)

find_package(libdigidocpp 4.5.0 REQUIRED HINTS /Library)
find_package(libdigidocpp 4.6.0 REQUIRED HINTS /Library)
message("-- Found libdigidocpp: ${libdigidocpp_DIR} (found version \"${libdigidocpp_VERSION}\")")
find_package(LDAP REQUIRED)
find_package(Qt6 6.2.0 REQUIRED COMPONENTS Core Widgets Network PrintSupport SvgWidgets LinguistTools)
Expand Down
30 changes: 30 additions & 0 deletions client/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,33 @@ class DigidocConf final: public digidoc::XmlConfCurrent
return valueUserScope(Settings::TSA_URL_CUSTOM, Settings::TSA_URL, digidoc::XmlConfCurrent::TSUrl());
}

std::vector<digidoc::X509Cert> TSCertsArchive() const final
{
if(digidoc::X509Cert cert = toCert(fromBase64(Settings::TSA_CERT_ARCHIVE)))
{
std::vector<digidoc::X509Cert> list = toCerts(QLatin1String("CERT-BUNDLE"));
list.push_back(std::move(cert));
list.emplace_back(); // Make sure that TSA cert pinning is enabled
return list;
}
return TSCerts();
}

std::string TSUrlArchive() const final
{
if(std::string url = Settings::TSA_URL_ARCHIVE; Settings::TSA_URL_CUSTOM && !url.empty())
return url;
if(auto value = Application::confValue(Settings::TSA_URL_ARCHIVE.KEY); value.isString())
{
if(std::string url = value.toString().toStdString(); !url.empty())
return url;
}
if(std::string url = digidoc::XmlConfCurrent::TSUrlArchive();
!url.empty() && url != digidoc::XmlConfCurrent::TSUrl())
return url;
return TSUrl();
}

std::string TSLUrl() const final
{ return valueSystemScope(QLatin1String("TSL-URL"), digidoc::XmlConfCurrent::TSLUrl()); }
std::vector<digidoc::X509Cert> TSLCerts() const final
Expand Down Expand Up @@ -216,6 +243,8 @@ class DigidocConf final: public digidoc::XmlConfCurrent
{
if(Settings::TSA_URL == Application::confValue(Settings::TSA_URL.KEY).toString())
Settings::TSA_URL.clear(); // Cleanup user conf if it is default url
if(Settings::TSA_URL_ARCHIVE == Application::confValue(Settings::TSA_URL_ARCHIVE.KEY).toString())
Settings::TSA_URL_ARCHIVE.clear(); // Cleanup user conf if it is default url
}
#endif

Expand Down Expand Up @@ -621,6 +650,7 @@ QVariant Application::confValue( ConfParameter parameter, const QVariant &value
{
case SiVaUrl: r = i->verifyServiceUri().c_str(); break;
case TSAUrl: r = i->TSUrl().c_str(); break;
case TSAUrlArchive: r = i->TSUrlArchive().c_str(); break;
case TSLUrl: r = i->TSLUrl().c_str(); break;
case TSLCache: r = i->TSLCache().c_str(); break;
case TSLCerts:
Expand Down
1 change: 1 addition & 0 deletions client/Application.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class Application final: public BaseApplication
{
SiVaUrl,
TSAUrl,
TSAUrlArchive,
TSLUrl,
TSLCerts,
TSLCache,
Expand Down
1 change: 1 addition & 0 deletions client/Diagnostics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ void Diagnostics::generalInfo(QTextStream &s)
<< "<br />RPUUID: " << (Settings::MID_UUID_CUSTOM ? tr("is set manually") : tr("is set by default"))
<< "<br />TSL_URL: " << Application::confValue(Application::TSLUrl).toString()
<< "<br />TSA_URL: " << Application::confValue(Application::TSAUrl).toString()
<< "<br />TSA_URL_ARCHIVE: " << Application::confValue(Application::TSAUrlArchive).toString()
<< "<br />SIVA_URL: " << Application::confValue(Application::SiVaUrl).toString()
<< "<br /><b>CDOC2:</b>"
<< "<br />" << Settings::CDOC2_DEFAULT.KEY << ": " << Settings::CDOC2_DEFAULT
Expand Down
4 changes: 3 additions & 1 deletion client/Settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,11 @@ const Option<QString> Settings::SIVA_URL { QStringLiteral("SIVA-URL") };
const Option<bool, bool (*)()> Settings::SIVA_URL_CUSTOM
{ QStringLiteral("SIVA-URL-CUSTOM"), [] { return Settings::SIVA_URL.isSet(); } };
const Option<QByteArray> Settings::TSA_CERT { QStringLiteral("TSA-CERT") };
const Option<QByteArray> Settings::TSA_CERT_ARCHIVE { QStringLiteral("TSA-CERT-ARCHIVE") };
const Option<QString> Settings::TSA_URL { QStringLiteral("TSA-URL") };
const Option<QString> Settings::TSA_URL_ARCHIVE { QStringLiteral("TSA-URL-ARCHIVE") };
const Option<bool, bool (*)()> Settings::TSA_URL_CUSTOM
{ QStringLiteral("TSA-URL-CUSTOM"), [] { return Settings::TSA_URL.isSet(); } };
{ QStringLiteral("TSA-URL-CUSTOM"), [] { return Settings::TSA_URL.isSet() || Settings::TSA_URL_ARCHIVE.isSet(); } };
const Option<bool> Settings::DEFAULT_LTA { QStringLiteral("DefaultLTA"), false };

const Option<QString> Settings::DEFAULT_DIR { QStringLiteral("DefaultDir") };
Expand Down
2 changes: 2 additions & 0 deletions client/Settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ struct Settings
static const Option<QString> SIVA_URL;
static const Option<bool, bool (*)()> SIVA_URL_CUSTOM;
static const Option<QByteArray> TSA_CERT;
static const Option<QByteArray> TSA_CERT_ARCHIVE;
static const Option<QString> TSA_URL;
static const Option<QString> TSA_URL_ARCHIVE;
static const Option<bool, bool (*)()> TSA_URL_CUSTOM;
static const Option<bool> DEFAULT_LTA;

Expand Down
32 changes: 32 additions & 0 deletions client/dialogs/SettingsDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,21 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
ui->txtTimeStamp->setVisible(ui->rdTimeStampCustom->isChecked());
ui->txtTimeStamp->setPlaceholderText(Application::confValue(Settings::TSA_URL.KEY).toString());
ui->txtTimeStamp->setText(Settings::TSA_URL);
ui->txtTimeStampArchive->setReadOnly(Settings::TSA_URL_ARCHIVE.isLocked());
ui->lblTimeStampArchive->setVisible(ui->rdTimeStampCustom->isChecked());
ui->txtTimeStampArchive->setVisible(ui->rdTimeStampCustom->isChecked());
ui->txtTimeStampArchive->setPlaceholderText(Application::confValue(Application::TSAUrlArchive).toString());
ui->txtTimeStampArchive->setText(Settings::TSA_URL_ARCHIVE);
ui->wgtTSACert->setDisabled(Settings::TSA_CERT.isLocked());
ui->wgtTSACert->setVisible(ui->rdTimeStampCustom->isChecked());
ui->wgtTSACertArchive->setDisabled(Settings::TSA_CERT_ARCHIVE.isLocked());
ui->wgtTSACertArchive->setVisible(ui->rdTimeStampCustom->isChecked());
connect(ui->rdTimeStampCustom, &QRadioButton::toggled, ui->txtTimeStamp, [this](bool checked) {
ui->txtTimeStamp->setVisible(checked);
ui->lblTimeStampArchive->setVisible(checked);
ui->txtTimeStampArchive->setVisible(checked);
ui->wgtTSACert->setVisible(checked);
ui->wgtTSACertArchive->setVisible(checked);
Settings::TSA_URL_CUSTOM = checked;
});
connect(ui->txtTimeStamp, &QLineEdit::textChanged, this, [this](const QString &url) {
Expand All @@ -116,6 +126,14 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
updateTSACert(QSslCertificate());
}
});
connect(ui->txtTimeStampArchive, &QLineEdit::textChanged, this, [this](const QString &url) {
Settings::TSA_URL_ARCHIVE = url;
if(url.isEmpty())
{
Settings::TSA_CERT_ARCHIVE.clear();
updateTSACertArchive(QSslCertificate());
}
});
connect(ui->helpTimeStamp, &QToolButton::clicked, this, []{
QDesktopServices::openUrl(tr("https://www.id.ee/en/article/for-organisations-that-sign-large-quantities-of-documents-using-digidoc4-client/"));
});
Expand All @@ -128,6 +146,15 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
updateTSACert(cert);
});
updateTSACert(QSslCertificate(QByteArray::fromBase64(Settings::TSA_CERT), QSsl::Der));
connect(ui->btInstallTSACertArchive, &QPushButton::clicked, this, [this] {
QSslCertificate cert = selectCert(tr("Select archive Time-Stamping server certificate"),
tr("Archive Time-Stamping service SSL certificate"));
if(cert.isNull())
return;
Settings::TSA_CERT_ARCHIVE = cert.toDer().toBase64();
updateTSACertArchive(cert);
});
updateTSACertArchive(QSslCertificate(QByteArray::fromBase64(Settings::TSA_CERT_ARCHIVE), QSsl::Der));

// pageServices - MID
ui->rdMIDUUIDDefault->setDisabled(Settings::MID_UUID_CUSTOM.isLocked());
Expand Down Expand Up @@ -482,6 +509,11 @@ void SettingsDialog::updateSiVaCert(const QSslCertificate &c)
updateCert(c, ui->btShowSiVaCert, ui->txtSiVaCert);
}

void SettingsDialog::updateTSACertArchive(const QSslCertificate &c)
{
updateCert(c, ui->btShowTSACertArchive, ui->txtTSACertArchive);
}

void SettingsDialog::updateTSACert(const QSslCertificate &c)
{
updateCert(c, ui->btShowTSACert, ui->txtTSACert);
Expand Down
1 change: 1 addition & 0 deletions client/dialogs/SettingsDialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class SettingsDialog final: public QDialog
void updateCDoc2Cert(const QSslCertificate &c);
void updateSiVaCert(const QSslCertificate &c);
void updateTSACert(const QSslCertificate &c);
void updateTSACertArchive(const QSslCertificate &c);
void updateDiagnostics();
void useDefaultSettings();

Expand Down
92 changes: 92 additions & 0 deletions client/dialogs/SettingsDialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,26 @@ max-height: 22px;
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lblTimeStampArchive">
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="text">
<string>Access to archive Time-Stamping service</string>
</property>
<property name="buddy">
<cstring>txtTimeStampArchive</cstring>
</property>
</widget>
</item>
<item>
<widget class="LineEdit" name="txtTimeStampArchive">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="wgtTSACert" native="true">
<layout class="QVBoxLayout" name="wgtTSACertLayout">
Expand Down Expand Up @@ -765,6 +785,78 @@ max-height: 22px;
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="wgtTSACertArchive" native="true">
<layout class="QVBoxLayout" name="wgtTSACertArchiveLayout">
<property name="spacing">
<number>24</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="lblTSACertArchive">
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="text">
<string>Archive Time-Stamping service SSL certificate</string>
</property>
</widget>
</item>
<item>
<widget class="CertLabel" name="txtTSACertArchive">
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="installTSACertArchiveLayout">
<property name="spacing">
<number>16</number>
</property>
<item>
<widget class="QPushButton" name="btInstallTSACertArchive">
<property name="text">
<string>Add certificate</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btShowTSACertArchive">
<property name="text">
<string>Show certificate</string>
</property>
</widget>
</item>
<item>
<spacer name="installTSACertArchiveSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="midLayout">
<item>
Expand Down
12 changes: 12 additions & 0 deletions client/translations/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2362,6 +2362,10 @@ ID-Card</translation>
<source>Checking updates has failed.</source>
<translation>Checking updates has failed.</translation>
</message>
<message>
<source>Select archive Time-Stamping server certificate</source>
<translation>Select archive Time-Stamping server certificate</translation>
</message>
<message>
<source>Restart DigiDoc4 Client to activate logging</source>
<translation>Restart DigiDoc4 Client to activate logging</translation>
Expand Down Expand Up @@ -2531,6 +2535,10 @@ Additional licenses and components</translation>
<source>Use Long Term Archival (LTA) format when signing</source>
<translation>Use Long Term Archival (LTA) format when signing</translation>
</message>
<message>
<source>Access to archive Time-Stamping service</source>
<translation>Access to archive Time-Stamping service</translation>
</message>
<message>
<source>Add certificate</source>
<translation>Add certificate</translation>
Expand All @@ -2539,6 +2547,10 @@ Additional licenses and components</translation>
<source>Show certificate</source>
<translation>Show certificate</translation>
</message>
<message>
<source>Archive Time-Stamping service SSL certificate</source>
<translation>Archive Time-Stamping service SSL certificate</translation>
</message>
<message>
<source>Use CDOC1 file format for encryption</source>
<translation>Use CDOC1 file format for encryption</translation>
Expand Down
12 changes: 12 additions & 0 deletions client/translations/et.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2362,6 +2362,10 @@ ID-kaardiga</translation>
<source>Checking updates has failed.</source>
<translation>Värskenduste kontrollimine on ebaõnnestunud.</translation>
</message>
<message>
<source>Select archive Time-Stamping server certificate</source>
<translation>Vali arhiveerimise ajatempliteenuse serveri sertifikaat</translation>
</message>
<message>
<source>Restart DigiDoc4 Client to activate logging</source>
<translation>Logimise aktiveerimiseks taaskäivita DigiDoc4 klient</translation>
Expand Down Expand Up @@ -2531,6 +2535,10 @@ Täiendavad litsentsid ja komponendid</translation>
<source>Use Long Term Archival (LTA) format when signing</source>
<translation>Kasutan allkirjastamisel arhiveerimise ajatempli (LTA) vormingut</translation>
</message>
<message>
<source>Access to archive Time-Stamping service</source>
<translation>Ligipääs arhiveerimise ajatempliteenusele</translation>
</message>
<message>
<source>Add certificate</source>
<translation>Lisa sertifikaat</translation>
Expand All @@ -2539,6 +2547,10 @@ Täiendavad litsentsid ja komponendid</translation>
<source>Show certificate</source>
<translation>Näita sertifikaati</translation>
</message>
<message>
<source>Archive Time-Stamping service SSL certificate</source>
<translation>Arhiveerimise ajatempliteenuse SSL sertifikaat</translation>
</message>
<message>
<source>Use CDOC1 file format for encryption</source>
<translation>Kasuta krüpteerimiseks CDOC1 failivormingut</translation>
Expand Down
2 changes: 1 addition & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Build-Depends:
pkg-config,
debhelper-compat (= 13),
cmake,
libdigidocpp-dev (>=3.0),
libdigidocpp-dev (>=4.6.0),
libldap2-dev,
libpcsclite-dev,
libssl-dev,
Expand Down
Loading