jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix json command infinite loop

Browse Source
This commit is contained in:
fvanroie 2023-01-13 21:26:43 +01:00
parent d4e8b7e6d0
commit b3230fcd4c
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/hasp/hasp_dispatch.cpp
View File

@ -348,9 +348,9 @@ static void dispatch_simple_text_command(const char* cmnd, uint8_t source)
dispatch_command("json", cmnd, false, source); dispatch_command("json", cmnd, false, source);
break; // comment break; // comment
// case ' ': // case ' ':
// dispatch_simple_text_command(cmnd, source); // dispatch_simple_text_command(cmnd, source);
// break; // break;
default: { default: {
size_t pos1 = std::string(cmnd).find("="); size_t pos1 = std::string(cmnd).find("=");
@ -395,7 +395,7 @@ static void dispatch_simple_text_command(const char* cmnd, uint8_t source)
// Strip command/config prefix from the topic and process the payload // Strip command/config prefix from the topic and process the payload
void dispatch_topic_payload(const char* topic, const char* payload, bool update, uint8_t source) void dispatch_topic_payload(const char* topic, const char* payload, bool update, uint8_t source)
{ {
if(!strcmp_P(topic, PSTR(MQTT_TOPIC_COMMAND))) { if(!strcmp_P(topic, PSTR(MQTT_TOPIC_COMMAND)) || topic[0] == '\0') {
dispatch_simple_text_command((char*)payload, source); dispatch_simple_text_command((char*)payload, source);
return; return;
} }
@ -596,9 +596,8 @@ void dispatch_screenshot(const char*, const char* filename, uint8_t source)
bool dispatch_json_variant(JsonVariant& json, uint8_t& savedPage, uint8_t source) bool dispatch_json_variant(JsonVariant& json, uint8_t& savedPage, uint8_t source)
{ {
if(json.is<JsonArray>()) { // handle json as an array of commands if(json.is<JsonArray>()) { // handle json as an array of commands
JsonArray arr = json.as<JsonArray>();
LOG_WARNING(TAG_MSGR, "TEXT = ARRAY"); LOG_WARNING(TAG_MSGR, "TEXT = ARRAY");
for(JsonVariant command : arr) { for(JsonVariant command : json.as<JsonArray>()) {
dispatch_json_variant(command, savedPage, source); dispatch_json_variant(command, savedPage, source);
} }
@ -635,7 +634,7 @@ void dispatch_text_line(const char* payload, uint8_t source)
// json.shrinkToFit(); // json.shrinkToFit();
if(jsonError) { if(jsonError) {
// dispatch_json_error(TAG_MSGR, jsonError); // dispatch_json_error(TAG_MSGR, jsonError);
} else { } else {
JsonVariant json = doc.as<JsonVariant>(); JsonVariant json = doc.as<JsonVariant>();
@ -655,7 +654,19 @@ void dispatch_text_line(const char* payload, uint8_t source)
void dispatch_parse_json(const char*, const char* payload, uint8_t source) void dispatch_parse_json(const char*, const char* payload, uint8_t source)
{ // Parse an incoming JSON array into individual commands { // Parse an incoming JSON array into individual commands
dispatch_simple_text_command(payload, source); StaticJsonDocument<2048> doc;
DeserializationError jsonError = deserializeJson(doc, payload);
if(jsonError) {
dispatch_json_error(TAG_MSGR, jsonError);
return;
}
JsonVariant json = doc.as<JsonVariant>();
uint8_t savedPage = haspPages.get();
if(!dispatch_json_variant(json, savedPage, TAG_EVENT)) {
LOG_WARNING(TAG_MSGR, F(D_DISPATCH_COMMAND_NOT_FOUND), "");
}
} }
#ifdef ARDUINO #ifdef ARDUINO