Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Perform at least some checks before sending config

This commit is contained in:
Martchus 2018-04-07 18:30:35 +02:00
parent b92bf4f27a
commit bf4b26c6f8
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cli/application.cpp
View File

@ -673,11 +673,26 @@ void Application::editConfig(const ArgumentOccurrence &)
<< " at character " << error.offset << endl;
return;
}
// perform at least some checks before sending the configuration
const auto configObj(configDoc.object());
if (configObj.isEmpty()) {
cerr << Phrases::Error << "New config object seems empty." << Phrases::EndFlush;
return;
}
for (const auto &arrayName : {QStringLiteral("devices"), QStringLiteral("folders")}) {
if (!configObj.value(arrayName).isArray()) {
cerr << Phrases::Error << "Array \"" << arrayName.toLocal8Bit().data() << "\" is not present." << Phrases::EndFlush;
return;
}
}
for (const auto &objectName : {QStringLiteral("options"), QStringLiteral("gui")}) {
if (!configObj.value(objectName).isObject()) {
cerr << Phrases::Error << "Object \"" << objectName.toLocal8Bit().data() << "\" is not present." << Phrases::EndFlush;
return;
}
}
// handle "dry-run" case
if (m_args.dryRun.isPresent()) {
cout << newConfig.data() << flush;