stephb9959
2023-03-06 21:10:49 -08:00
parent d00a94e673
commit 0138a37f3a
3 changed files with 14 additions and 10 deletions

View File

@@ -517,6 +517,7 @@ namespace OpenWifi {
return NotFound();
}
std::string EncodedScript;
if (!SCR.scriptId.empty()) {
GWObjects::ScriptEntry Existing;
if (!StorageService()->ScriptDB().GetRecord("id", SCR.scriptId, Existing)) {
@@ -548,12 +549,17 @@ namespace OpenWifi {
SCR.deferred = Existing.deferred;
if (!ParsedBody_->has("timeout"))
SCR.timeout = Existing.timeout;
EncodedScript =
Utils::base64encode((const unsigned char *)SCR.script.c_str(), SCR.script.size());
} else {
if (!DiagnosticScript && !ValidateScriptType(SCR.type)) {
CallCanceled("SCRIPT", CMD_UUID, CMD_RPC,
RESTAPI::Errors::MissingOrInvalidParameters);
return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
}
if(!DiagnosticScript) {
EncodedScript = SCR.script;
}
}
uint64_t ap_timeout = SCR.timeout == 0 ? 30 : SCR.timeout;
@@ -593,8 +599,6 @@ namespace OpenWifi {
}
// convert script to base64 ...
auto EncodedScript =
Utils::base64encode((const unsigned char *)SCR.script.c_str(), SCR.script.size());
Params.set(uCentralProtocol::TYPE, SCR.type);
if (!DiagnosticScript) {
Params.set(uCentralProtocol::SCRIPT, EncodedScript);