Skip to content

Fix custom CDoc2 service configuration #1431

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
+37 −9
Open

Fix custom CDoc2 service configuration #1431

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
20 changes: 12 additions & 8 deletions client/CDocSupport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,13 @@ DDConfiguration::getValue(std::string_view domain, std::string_view param) const
if (param == libcdoc::Configuration::KEYSERVER_SEND_URL) {
#ifdef CONFIG_URL
QJsonObject list = Application::confValue(QLatin1String("CDOC2-CONF")).toObject();
if (list.isEmpty()) return {};
QJsonObject data = list.value(QLatin1String(domain.data(), domain.size())).toObject();
if (data.isEmpty()) return {};
QString url = data.value(QLatin1String("POST")).toString();
return url.toStdString();
if (QString url = data.value(QLatin1String("POST")).toString(); !url.isEmpty())
return url.toStdString();
if (!domain.empty() && domain == Settings::CDOC2_UUID) {
QString url = Settings::CDOC2_POST;
return url.toStdString();
}
#else
if (domain == Settings::CDOC2_DEFAULT_KEYSERVER) {
QString url = Settings::CDOC2_POST;
Expand All @@ -227,11 +229,13 @@ DDConfiguration::getValue(std::string_view domain, std::string_view param) const
} else if (param == libcdoc::Configuration::KEYSERVER_FETCH_URL) {
#ifdef CONFIG_URL
QJsonObject list = Application::confValue(QLatin1String("CDOC2-CONF")).toObject();
if (list.isEmpty()) return {};
QJsonObject data = list.value(QLatin1String(domain.data(), domain.size())).toObject();
if (data.isEmpty()) return {};
QString url = data.value(QLatin1String("FETCH")).toString();
return url.toStdString();
if (QString url = data.value(QLatin1String("FETCH")).toString(); !url.isEmpty())
return url.toStdString();
if (!domain.empty() && domain == Settings::CDOC2_UUID) {
QString url = Settings::CDOC2_GET;
return url.toStdString();
}
#else
if (domain == Settings::CDOC2_DEFAULT_KEYSERVER) {
QString url = Settings::CDOC2_GET;
Expand Down
8 changes: 8 additions & 0 deletions client/CryptoDoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,14 @@ bool CryptoDoc::encrypt(const QString &filename, const QString& label, const QBy
->open();
return false;
}
if(d->version == 2 && Settings::CDOC2_USE_KEYSERVER && QString(Settings::CDOC2_DEFAULT_KEYSERVER).isEmpty())
{
WarningDialog::create()
->withTitle(tr("Failed to encrypt document"))
->withText(tr("Key transfer server is not configured"))
->open();
return false;
}
QString writer_last_error;
libcdoc::result_t result = waitFor([&] -> libcdoc::result_t {
qCDebug(CRYPTO) << "Encrypt" << d->fileName;
Expand Down
2 changes: 1 addition & 1 deletion client/dialogs/SettingsDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
ui->txtCdoc2UUID->setDisabled(disabled);
ui->txtCdoc2Fetch->setDisabled(disabled);
ui->txtCdoc2Post->setDisabled(disabled);
ui->txtCdoc2UUID->setClearButtonEnabled(!disabled);
ui->txtCdoc2UUID->setClearButtonEnabled(false);
ui->txtCdoc2Fetch->setClearButtonEnabled(!disabled);
ui->txtCdoc2Post->setClearButtonEnabled(!disabled);
ui->wgtCDoc2Cert->setHidden(disabled);
Expand Down
8 changes: 8 additions & 0 deletions client/translations/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,10 @@
<source>Failed to encrypt document</source>
<translation>Failed to encrypt document</translation>
</message>
<message>
<source>Key transfer server is not configured</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Failed to remove key</source>
<translation>Failed to remove key</translation>
Expand Down Expand Up @@ -1303,6 +1307,10 @@
<source>Failed to init ldap</source>
<translation>Failed to init ldap</translation>
</message>
<message>
<source>Failed to set ldap CA cert</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Failed to init ldap search</source>
<translation>Failed to init ldap search</translation>
Expand Down
8 changes: 8 additions & 0 deletions client/translations/et.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,10 @@
<source>Failed to encrypt document</source>
<translation>Dokumendi krüpteerimine ebaõnnestus</translation>
</message>
<message>
<source>Key transfer server is not configured</source>
<translation>Võtmeedastusserver ei ole seadistatud</translation>
</message>
<message>
<source>Failed to remove key</source>
<translation>Võtme eemaldamine ebaõnnestus</translation>
Expand Down Expand Up @@ -1303,6 +1307,10 @@
<source>Failed to init ldap</source>
<translation>LDAP initsialiseerimine ebaõnnestus</translation>
</message>
<message>
<source>Failed to set ldap CA cert</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Failed to init ldap search</source>
<translation>LDAP otsingu initsialiseerimine ebaõnnestus</translation>
Expand Down
Loading