Skip to content

Return configuration error if keyserver is not known #1411

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
lauris71 wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −7
Open

Return configuration error if keyserver is not known #1411

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
21 changes: 14 additions & 7 deletions client/CDocSupport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,26 +188,33 @@ checkConnection()
std::string
DDConfiguration::getValue(std::string_view domain, std::string_view param) const
{
std::string def = Settings::CDOC2_DEFAULT_KEYSERVER;
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();
QString url = data.value(QLatin1String("POST")).toString(Settings::CDOC2_POST);
if (data.isEmpty()) return {};
QString url = data.value(QLatin1String("POST")).toString();
return url.toStdString();
#else
QString url = Settings::CDOC2_POST;
return url.toStdString();
if (domain == Settings::CDOC2_DEFAULT_KEYSERVER) {
QString url = Settings::CDOC2_POST;
return url.toStdString();
}
#endif
} 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();
QString url = data.value(QLatin1String("FETCH")).toString(Settings::CDOC2_GET);
if (data.isEmpty()) return {};
QString url = data.value(QLatin1String("FETCH")).toString();
return url.toStdString();
#else
QString url = Settings::CDOC2_GET;
return url.toStdString();
if (domain == Settings::CDOC2_DEFAULT_KEYSERVER) {
QString url = Settings::CDOC2_GET;
return url.toStdString();
}
#endif
}
return {};
Expand Down
Loading