scottk/wlan-cloud-ucentralgw
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ucentralgw.git synced 2025-11-08 22:53:19 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fixing ConfigurationValidator

Browse Source
This commit is contained in:
stephb9959
2021-10-30 15:38:54 -07:00
parent 5f089105b7
commit 310cdd6245
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/RESTAPI/RESTAPI_device_handler.cpp
View File

@@ -62,8 +62,11 @@ namespace OpenWifi {
}
auto Config=Body->get("configuration").toString();
Poco::JSON::Object Answer;
auto Res = ValidateUCentralConfiguration(Config);
std::string Error;
auto Res = ValidateUCentralConfiguration(Config, Error);
Answer.set("valid",Res);
if(!Error.empty())
Answer.set("error",Error);
return ReturnObject(Answer);
}
@@ -82,7 +85,8 @@ namespace OpenWifi {
return BadRequest(RESTAPI::Errors::SerialNumberMismatch);
}
if(Device.Configuration.empty() || (!Device.Configuration.empty() && !ValidateUCentralConfiguration(Device.Configuration))) {
std::string Error;
if(Device.Configuration.empty() || (!Device.Configuration.empty() && !ValidateUCentralConfiguration(Device.Configuration,Error))) {
return BadRequest(RESTAPI::Errors::ConfigBlockInvalid);
}
@@ -124,7 +128,8 @@ namespace OpenWifi {
}
if(!NewDevice.Configuration.empty()) {
if (!ValidateUCentralConfiguration(NewDevice.Configuration)) {
std::string Error;
if (!ValidateUCentralConfiguration(NewDevice.Configuration, Error)) {
return BadRequest(RESTAPI::Errors::ConfigBlockInvalid);
}
Config::Config NewConfig(NewDevice.Configuration);