Enc SSL cert

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

Author: metsma

client/dialogs/SettingsDialog.cpp

@@ -67,6 +67,10 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 		w->setAttribute(Qt::WA_MacShowFocusRect, false);
 	for(QCheckBox *w: findChildren<QCheckBox*>())
 		w->setAttribute(Qt::WA_MacShowFocusRect, false);
+	for(QToolButton *b: findChildren<QToolButton*>())
+		b->setCursor(Qt::PointingHandCursor);
+	for(QPushButton *b: findChildren<QPushButton*>())
+		b->setCursor(Qt::PointingHandCursor);
 
 	// pageGeneral
 	selectLanguage();
@@ -151,7 +155,7 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 	ui->txtMIDUUID->setReadOnly(Settings::MID_UUID.isLocked());
 	ui->txtMIDUUID->setVisible(ui->rdMIDUUIDCustom->isChecked());
 	ui->txtMIDUUID->setText(Settings::MID_UUID);
-	connect(ui->rdMIDUUIDCustom, &QRadioButton::toggled, ui->txtMIDUUID, [=](bool checked) {
+	connect(ui->rdMIDUUIDCustom, &QRadioButton::toggled, ui->txtMIDUUID, [this](bool checked) {
 		ui->txtMIDUUID->setVisible(checked);
 		Settings::MID_UUID_CUSTOM = checked;
 		Settings::SID_UUID_CUSTOM = checked;
@@ -221,10 +225,11 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 		ui->txtCdoc2UUID->setReadOnly(disabled);
 		ui->txtCdoc2Fetch->setReadOnly(disabled);
 		ui->txtCdoc2Post->setReadOnly(disabled);
+		ui->wgtCDoc2Cert->setHidden(disabled);
 	};
 	for(QJsonObject::const_iterator i = list.constBegin(); i != list.constEnd(); ++i)
 		ui->cmbCdoc2Name->addItem(i.value().toObject().value(QLatin1String("NAME")).toString(), i.key());
-	ui->cmbCdoc2Name->addItem(tr("Custom"), Settings::CDOC2_UUID);
+	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));
 	connect(ui->cmbCdoc2Name, qOverload<int>(&QComboBox::currentIndexChanged), this, [this, setCDoc2Values] (int index) {
@@ -234,14 +239,40 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 	});
 	setCDoc2Values(cdoc2Service);
 	connect(ui->txtCdoc2UUID, &QLineEdit::textEdited, this, Settings::CDOC2_UUID);
-	connect(ui->txtCdoc2Fetch, &QLineEdit::textEdited, this, Settings::CDOC2_GET);
-	connect(ui->txtCdoc2Post, &QLineEdit::textEdited, this, Settings::CDOC2_POST);
+	connect(ui->txtCdoc2Fetch, &QLineEdit::textEdited, this, [this](const QString &url) {
+		Settings::CDOC2_GET = url;
+		if(url.isEmpty())
+		{
+			Settings::CDOC2_GET_CERT.clear();
+			Settings::CDOC2_POST_CERT.clear();
+			updateCDoc2Cert(QSslCertificate());
+		}
+	});
+	connect(ui->txtCdoc2Post, &QLineEdit::textEdited, this, [this](const QString &url) {
+		Settings::CDOC2_POST = url;
+		if(url.isEmpty())
+		{
+			Settings::CDOC2_GET_CERT.clear();
+			Settings::CDOC2_POST_CERT.clear();
+			updateCDoc2Cert(QSslCertificate());
+		}
+	});
 #else
 	ui->cmbCdoc2Name->addItem(QStringLiteral("Default"));
 	ui->txtCdoc2UUID->setText(QStringLiteral("00000000-0000-0000-0000-000000000000"));
 	ui->txtCdoc2Fetch->setText(QStringLiteral(CDOC2_GET_URL));
 	ui->txtCdoc2Post->setText(QStringLiteral(CDOC2_POST_URL));
 #endif
+	connect(ui->btInstallCDoc2Cert, &QPushButton::clicked, this, [this] {
+		QSslCertificate cert = selectCert(tr("Select a key transfer server certificate"),
+			tr("Key transfer server SSL certificate"));
+		if(cert.isNull())
+			return;
+		Settings::CDOC2_GET_CERT = cert.toDer().toBase64();
+		Settings::CDOC2_POST_CERT = cert.toDer().toBase64();
+		updateCDoc2Cert(cert);
+	});
+	updateCDoc2Cert(QSslCertificate(QByteArray::fromBase64(Settings::CDOC2_GET_CERT), QSsl::Der));
 
 	// pageProxy
 	connect(this, &SettingsDialog::finished, this, &SettingsDialog::saveProxy);
@@ -313,7 +344,7 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 		dlg->open();
 	});
 #ifdef CONFIG_URL
-	connect(qApp->conf(), &Configuration::finished, this, [=](bool /*update*/, const QString &error){
+	connect(qApp->conf(), &Configuration::finished, this, [this](bool /*update*/, const QString &error){
 		if(!error.isEmpty()) {
 			WarningDialog::show(this, tr("Checking updates has failed.") + "<br />" + tr("Please try again."), error);
 			return;
@@ -334,10 +365,10 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 		Application::updateTSLCache({});
 	});
 	connect(ui->btnNavUseByDefault, &QPushButton::clicked, this, &SettingsDialog::useDefaultSettings);
-	connect(ui->btnNavSaveReport, &QPushButton::clicked, this, [=]{
+	connect(ui->btnNavSaveReport, &QPushButton::clicked, this, [this]{
 		saveFile(QStringLiteral("diagnostics.txt"), ui->txtDiagnostics->toPlainText().toUtf8());
 	});
-	connect(ui->btnNavSaveLibdigidocpp, &QPushButton::clicked, this, [=]{
+	connect(ui->btnNavSaveLibdigidocpp, &QPushButton::clicked, this, [this]{
 		Settings::LIBDIGIDOCPP_DEBUG = false;
 		QString log = QStringLiteral("%1/libdigidocpp.log").arg(QDir::tempPath());
 		saveFile(QStringLiteral("libdigidocpp.txt"), log);
@@ -439,6 +470,11 @@ void SettingsDialog::updateCert(const QSslCertificate &c, QPushButton *btn, Cert
 	});
 }
 
+void SettingsDialog::updateCDoc2Cert(const QSslCertificate &c)
+{
+	updateCert(c, ui->btShowCDoc2Cert, ui->txtCDoc2Cert);
+}
+
 void SettingsDialog::updateSiVaCert(const QSslCertificate &c)
 {
 	updateCert(c, ui->btShowSiVaCert, ui->txtSiVaCert);
@@ -469,8 +505,8 @@ void SettingsDialog::selectLanguage()
 
 void SettingsDialog::updateVersion()
 {
-	ui->txtNavVersion->setText(tr("%1 version %2, released %3")
-		.arg(tr("DigiDoc4 Client"), QApplication::applicationVersion(), QStringLiteral(BUILD_DATE)));
+	ui->txtNavVersion->setText(tr("DigiDoc4 version %1, released %2")
+		.arg(QApplication::applicationVersion(), QStringLiteral(BUILD_DATE)));
 }
 
 void SettingsDialog::saveProxy()
@@ -519,7 +555,7 @@ void SettingsDialog::updateDiagnostics()
 	QApplication::setOverrideCursor( Qt::WaitCursor );
 	auto *worker = new Diagnostics();
 	connect(worker, &Diagnostics::update, ui->txtDiagnostics, &QTextBrowser::insertHtml, Qt::QueuedConnection);
-	connect(worker, &Diagnostics::destroyed, this, [=]{
+	connect(worker, &Diagnostics::destroyed, this, [this]{
 		ui->txtDiagnostics->setEnabled(true);
 		ui->txtDiagnostics->moveCursor(QTextCursor::Start);
 		ui->txtDiagnostics->ensureCursorVisible();

client/dialogs/SettingsDialog.h

@@ -71,6 +71,7 @@ class SettingsDialog final: public QDialog
 	QSslCertificate selectCert(const QString &label, const QString &format);
 	void selectLanguage();
 	void updateCert(const QSslCertificate &c, QPushButton *btn, CertLabel *lbl);
+	void updateCDoc2Cert(const QSslCertificate &c);
 	void updateSiVaCert(const QSslCertificate &c);
 	void updateTSACert(const QSslCertificate &c);
 	void updateVersion();