Fix CDoc2 custom server selection (#1358)

IB-8563, IB-8662, IB-8406, IB-8554

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

Author: metsma

client/Diagnostics.cpp

@@ -28,6 +28,15 @@
 #include <QtCore/QTextStream>
 #include <QtNetwork/QSslCertificate>
 
+#include <digidocpp/Conf.h>
+
+using namespace digidoc;
+
+static QTextStream &operator<<(QTextStream &s, bool result)
+{
+	return s << (result ? "true" : "false");
+}
+
 void Diagnostics::generalInfo(QTextStream &s)
 {
 	s << "<b>" << tr("Arguments:") << "</b> " << Application::arguments().join(' ') << "<br />"
@@ -45,18 +54,21 @@ void Diagnostics::generalInfo(QTextStream &s)
 		<< "<br />TSA_URL: " << Application::confValue(Application::TSAUrl).toString()
 		<< "<br />SIVA_URL: " << Application::confValue(Application::SiVaUrl).toString()
 		<< "<br /><b>CDOC2:</b>"
-		<< "<br />" << Settings::CDOC2_DEFAULT.KEY << ": " << (Settings::CDOC2_DEFAULT ? tr("true") : tr("false"))
-		<< "<br />" << Settings::CDOC2_USE_KEYSERVER.KEY << ": " << (Settings::CDOC2_USE_KEYSERVER ? tr("true") : tr("false"))
+		<< "<br />" << Settings::CDOC2_DEFAULT.KEY << ": " << Settings::CDOC2_DEFAULT
+		<< "<br />" << Settings::CDOC2_USE_KEYSERVER.KEY << ": " << Settings::CDOC2_USE_KEYSERVER
 		<< "<br />" << Settings::CDOC2_DEFAULT_KEYSERVER.KEY << ": " << Settings::CDOC2_DEFAULT_KEYSERVER
+		<< "<br /><b>Settings:</b>"
+		<< "<br />Proxy config: " << Settings::PROXY_CONFIG
+		<< "<br />Proxy auth: " << !CONF(proxyUser).empty()
 		<< "<br /><br /><b>" << tr("TSL signing certs") << ":</b>";
 	for(const QSslCertificate &cert: Application::confValue(Application::TSLCerts).value<QList<QSslCertificate>>())
-		s << "<br />" << cert.subjectInfo("CN").value(0);
-	s << "<br /><br /><b>" << tr("TSL cache") << ":</b>";
+		s << "<br />" << cert.subjectInfo("CN").value(0) << " (Exp: " << cert.expiryDate().toString(QStringLiteral("dd.MM.yyyy hh:mm:ss)"));
 	QString cache = Application::confValue(Application::TSLCache).toString();
+	s << "<br /><br /><b>" << tr("TSL cache") << "</b> (" << cache << "):";
 	const QStringList tsllist = QDir(cache).entryList({QStringLiteral("*.xml")});
 	for(const QString &file: tsllist)
 	{
-		if(uint ver = Application::readTSLVersion(cache + "/" + file); ver > 0)
+		if(uint ver = Application::readTSLVersion(cache + '/' + file); ver > 0)
 			s << "<br />" << file << " (" << ver << ")";
 	}
 	s << "<br /><br />";
@@ -77,10 +89,10 @@ void Diagnostics::generalInfo(QTextStream &s)
 	s << "<b>" << tr("Smart Card service status: ") << "</b>" << " "
 		<< (QPCSC::instance().serviceRunning() ? tr("Running") : tr("Not running"));
 
-	s << "<br /><b>" << tr("Smart Card readers") << ":</b><br />";
+	s << "<br /><b>" << tr("Smart Card readers") << ":</b>";
 	for( const QString &readername: QPCSC::instance().readers() )
 	{
-		s << readername;
+		s << "<br />" << readername;
 		QPCSCReader reader( readername, &QPCSC::instance() );
 		if( !reader.isPresent() )
 		{
@@ -109,17 +121,10 @@ void Diagnostics::generalInfo(QTextStream &s)
 		if( !reader.isPresent() )
 			continue;
 
-		reader.reconnect( QPCSCReader::UnpowerCard );
-		QString cold = reader.atr();
-		reader.reconnect( QPCSCReader::ResetCard );
-		QString warm = reader.atr();
-
-		s << "ATR cold - " << cold << "<br />"
-		  << "ATR warm - " << warm << "<br />";
-
+		s << "ATR - " << reader.atr() << "<br />";
 		reader.beginTransaction();
 		constexpr auto APDU = &QByteArray::fromHex;
-		auto printAID = [&](const QLatin1String &label, const QByteArray &apdu)
+		auto printAID = [&](QLatin1String label, const QByteArray &apdu)
 		{
 			QPCSCReader::Result r = reader.transfer(apdu);
 			s << label << ": " << Qt::hex << r.SW;
@@ -135,7 +140,6 @@ void Diagnostics::generalInfo(QTextStream &s)
 		if(printAID(QLatin1String("AID_THALES"), APDU("00A4040C 0C A000000063504B43532D3135")) &&
 			reader.transfer(APDU("00A4080C 04 DFDD 5006")))
 			s << "ID - " << reader.transfer(APDU("00B00000 00")).data << "<br />";
-		reader.endTransaction();
 	}
 
 #ifdef Q_OS_WIN

client/MainWindow.cpp

@@ -681,11 +681,6 @@ void MainWindow::showSettings(int page)
 		return;
 	}
 	SettingsDialog dlg(page, this);
-
-	connect(&dlg, &SettingsDialog::langChanged, this, [this](const QString& lang ) {
-		qApp->loadTranslation( lang );
-		ui->retranslateUi(this);
-	});
 	connect(&dlg, &SettingsDialog::togglePrinting, ui->signContainerPage, &ContainerPage::togglePrinting);
 	dlg.exec();
 }

client/QPCSC.cpp

@@ -27,8 +27,8 @@
 #include <array>
 #include <cstring>
 
-Q_LOGGING_CATEGORY(APDU,"QPCSC.APDU")
-Q_LOGGING_CATEGORY(SCard,"QPCSC.SCard")
+static Q_LOGGING_CATEGORY(APDU,"QPCSC.APDU")
+static Q_LOGGING_CATEGORY(SCard,"QPCSC.SCard")
 
 static quint16 toUInt16(const QByteArray &data, int size)
 {
@@ -218,21 +218,17 @@ bool QPCSCReader::beginTransaction()
 }
 
 bool QPCSCReader::connect(Connect connect, Mode mode)
-{
-	return connectEx(connect, mode) == SCARD_S_SUCCESS;
-}
-
-quint32 QPCSCReader::connectEx(Connect connect, Mode mode)
 {
 	LONG err = SC(Connect, d->d->context, d->state.szReader, connect, mode, &d->card, &d->io.dwProtocol);
 	updateState();
-	return quint32(err);
+	return err == SCARD_S_SUCCESS;
 }
 
 void QPCSCReader::disconnect( Reset reset )
 {
 	if(d->isTransacted)
-		endTransaction();
+		SC(EndTransaction, d->card, reset);
+	d->isTransacted = false;
 	if( d->card )
 		SC(Disconnect, d->card, reset);
 	d->io.dwProtocol = SCARD_PROTOCOL_UNDEFINED;
@@ -241,14 +237,6 @@ void QPCSCReader::disconnect( Reset reset )
 	updateState();
 }
 
-bool QPCSCReader::endTransaction( Reset reset )
-{
-	bool result = SC(EndTransaction, d->card, reset) == SCARD_S_SUCCESS;
-	if(result)
-		d->isTransacted = false;
-	return result;
-}
-
 bool QPCSCReader::isPinPad() const
 {
 	if(d->reader.contains("HID Global OMNIKEY 3x21 Smart Card Reader") ||
@@ -290,15 +278,6 @@ QHash<QPCSCReader::Properties, int> QPCSCReader::properties() const
 	return properties;
 }
 
-bool QPCSCReader::reconnect( Reset reset, Mode mode )
-{
-	if( !d->card )
-		return false;
-	LONG err = SC(Reconnect, d->card, DWORD(SCARD_SHARE_SHARED), mode, reset, &d->io.dwProtocol);
-	updateState();
-	return err == SCARD_S_SUCCESS;
-}
-
 QStringList QPCSCReader::state() const
 {
 	return stateToString(d->state.dwEventState);

client/QPCSC.h

@@ -108,11 +108,8 @@ class QPCSCReader final: public QObject
 	bool updateState( quint32 msec = 0 );
 
 	bool connect( Connect connect = Shared, Mode mode = Mode(T0|T1) );
-	quint32 connectEx( Connect connect = Shared, Mode mode = Mode(T0|T1) );
 	void disconnect( Reset reset = LeaveCard );
-	bool reconnect( Reset reset = LeaveCard, Mode mode = Mode(T0|T1) );
 	bool beginTransaction();
-	bool endTransaction( Reset reset = LeaveCard );
 	Result transfer( const QByteArray &apdu ) const;
 	Result transferCTL(const QByteArray &apdu, bool verify, quint16 lang = 0,
 		quint8 minlen = 4, quint8 newPINOffset = 0, bool requestCurrentPIN = true) const;

client/Settings.cpp

@@ -26,14 +26,18 @@
 template<class T, class D = T>
 using Option = Settings::Option<T, D>;
 
-const Option<bool> Settings::CDOC2_DEFAULT { QStringLiteral("CDOC2-DEFAULT"), false };
+const Option<bool, bool (*)()> Settings::CDOC2_DEFAULT { QStringLiteral("CDOC2-DEFAULT"), [] {
+	return Application::confValue(QLatin1String("CDOC2-DEFAULT")).toBool(false);
+}};
 const Option<bool> Settings::CDOC2_NOTIFICATION { QStringLiteral("CDOC2-NOTIFICATION"), false };
-const Option<bool> Settings::CDOC2_USE_KEYSERVER { QStringLiteral("CDOC2-USE-KEYSERVER"), true };
+const Option<bool, bool (*)()> Settings::CDOC2_USE_KEYSERVER { QStringLiteral("CDOC2-USE-KEYSERVER"), [] {
+	return Application::confValue(QLatin1String("CDOC2-USE-KEYSERVER")).toBool(true);
+}};
 const Option<QString, QString (*)()> Settings::CDOC2_DEFAULT_KEYSERVER { QStringLiteral("CDOC2-DEFAULT-KEYSERVER"), [] {
 	return Application::confValue(QLatin1String("CDOC2-DEFAULT-KEYSERVER"))
 		.toString(QStringLiteral("00000000-0000-0000-0000-000000000000"));
 }};
-const Option<QString> Settings::CDOC2_UUID { QStringLiteral("CDOC2-UUID"), QStringLiteral("00000000-0000-0000-0000-000000000002") };
+const Option<QString> Settings::CDOC2_UUID { QStringLiteral("CDOC2-UUID") };
 const Option<QString> Settings::CDOC2_GET { QStringLiteral("CDOC2-GET"), QStringLiteral(CDOC2_GET_URL) };
 const Option<QByteArray> Settings::CDOC2_GET_CERT { QStringLiteral("CDOC2-GET-CERT") };
 const Option<QString> Settings::CDOC2_POST { QStringLiteral("CDOC2-POST"), QStringLiteral(CDOC2_POST_URL) };

client/Settings.h

@@ -93,9 +93,9 @@ struct Settings
 		std::function<void (const T &value)> f {};
 	};
 
-	static const Option<bool> CDOC2_DEFAULT;
+	static const Option<bool, bool (*)()> CDOC2_DEFAULT;
 	static const Option<bool> CDOC2_NOTIFICATION;
-	static const Option<bool> CDOC2_USE_KEYSERVER;
+	static const Option<bool, bool (*)()> CDOC2_USE_KEYSERVER;
 	static const Option<QString, QString (*)()> CDOC2_DEFAULT_KEYSERVER;
 	static const Option<QString> CDOC2_UUID;
 	static const Option<QString> CDOC2_GET;

client/dialogs/SettingsDialog.cpp

@@ -240,6 +240,8 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 	};
 	for(QJsonObject::const_iterator i = list.constBegin(); i != list.constEnd(); ++i)
 		ui->cmbCdoc2Name->addItem(i.value().toObject().value(QLatin1String("NAME")).toString(), i.key());
+	if(QUuid(QString(Settings::CDOC2_UUID)).isNull())
+		Settings::CDOC2_UUID = QUuid::createUuid().toString(QUuid::WithoutBraces);
 	ui->cmbCdoc2Name->addItem(tr("Use a manually specified key transfer server for encryption"), Settings::CDOC2_UUID);
 	QString cdoc2Service = Settings::CDOC2_DEFAULT_KEYSERVER;
 	ui->cmbCdoc2Name->setCurrentIndex(ui->cmbCdoc2Name->findData(cdoc2Service));
@@ -249,7 +251,10 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 		setCDoc2Values(key);
 	});
 	setCDoc2Values(cdoc2Service);
-	connect(ui->txtCdoc2UUID, &QLineEdit::textEdited, this, Settings::CDOC2_UUID);
+	connect(ui->txtCdoc2UUID, &QLineEdit::textEdited, this, [](const QString &uuid) {
+		Settings::CDOC2_UUID = uuid;
+		Settings::CDOC2_DEFAULT_KEYSERVER = uuid;
+	});
 	connect(ui->txtCdoc2Fetch, &QLineEdit::textEdited, this, [this](const QString &url) {
 		Settings::CDOC2_GET = url;
 		if(url.isEmpty())
@@ -424,7 +429,6 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 	ui->pageGroup->setId(ui->btnMenuInfo, LicenseSettings);
 	connect(ui->pageGroup, &QButtonGroup::idClicked, this, &SettingsDialog::showPage);
 
-	updateVersion();
 	updateDiagnostics();
 	showPage(page);
 }
@@ -467,11 +471,8 @@ void SettingsDialog::checkConnection()
 
 void SettingsDialog::retranslate(const QString& lang)
 {
-	emit langChanged(lang);
-
 	qApp->loadTranslation( lang );
 	ui->retranslateUi(this);
-	updateVersion();
 	updateDiagnostics();
 	ui->cmbCdoc2Name->setItemText(ui->cmbCdoc2Name->count() - 1,
 		tr("Use a manually specified key transfer server for encryption"));
@@ -523,12 +524,6 @@ void SettingsDialog::selectLanguage()
 		button->setChecked(button->property("lang").toString() == Settings::LANGUAGE);
 }
 
-void SettingsDialog::updateVersion()
-{
-	ui->txtNavVersion->setText(tr("DigiDoc4 version %1, released %2")
-		.arg(QApplication::applicationVersion(), QStringLiteral(BUILD_DATE)));
-}
-
 void SettingsDialog::saveProxy()
 {
 	Settings::PROXY_CONFIG = ui->proxyGroup->checkedId();
@@ -568,6 +563,8 @@ void SettingsDialog::loadProxy( const digidoc::Conf *conf )
 
 void SettingsDialog::updateDiagnostics()
 {
+	ui->txtNavVersion->setText(tr("DigiDoc4 version %1, released %2")
+		.arg(QApplication::applicationVersion(), QStringLiteral(BUILD_DATE)));
 	ui->txtDiagnostics->setEnabled(false);
 	ui->txtDiagnostics->clear();
 	ui->btnNavSaveReport->setDisabled(true);

client/dialogs/SettingsDialog.h

@@ -59,7 +59,6 @@ class SettingsDialog final: public QDialog
 	static void loadProxy( const digidoc::Conf *conf );
 
 signals:
-	void langChanged(const QString& lang);
 	void togglePrinting(bool enable);
 
 private:
@@ -74,7 +73,6 @@ class SettingsDialog final: public QDialog
 	void updateCDoc2Cert(const QSslCertificate &c);
 	void updateSiVaCert(const QSslCertificate &c);
 	void updateTSACert(const QSslCertificate &c);
-	void updateVersion();
 	void updateDiagnostics();
 	void useDefaultSettings();
 

client/translations/en.ts

@@ -683,14 +683,6 @@
         <source>TSL cache</source>
         <translation>TSL cache</translation>
     </message>
-    <message>
-        <source>true</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DigiDoc</name>

client/translations/et.ts

@@ -683,14 +683,6 @@
         <source>TSL cache</source>
         <translation>TSL puhver</translation>
     </message>
-    <message>
-        <source>true</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DigiDoc</name>