nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix /decode handling

Browse Source
This commit is contained in:
John
2022-04-10 09:07:01 +02:00
parent 7abcfadb1c
commit 67b8ceb5e9
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mainloop.cpp
+14 -4
View File
@@ -2301,13 +2301,17 @@ result_t MainLoop::executeGet(const vector<string>& args, bool* connected, ostri
def = value; def = value;
} else if (qname == "raw") { } else if (qname == "raw") {
raw = value; raw = value;
} else {
ret = RESULT_ERR_INVALID_ARG;
} }
if (ret != RESULT_OK) { if (ret != RESULT_OK) {
break; break;
} }
} }
} }
if (ret == RESULT_OK) { if (def.empty() || raw.empty()) {
ret = RESULT_ERR_INVALID_ARG;
} else if (ret == RESULT_OK) {
time_t now; time_t now;
time(&now); time(&now);
istringstream defstr("#\n" + def); // ensure first line is not used for determining col names istringstream defstr("#\n" + def); // ensure first line is not used for determining col names
@@ -2315,15 +2319,17 @@ result_t MainLoop::executeGet(const vector<string>& args, bool* connected, ostri
DataFieldTemplates* templates = getTemplates("*"); DataFieldTemplates* templates = getTemplates("*");
LoadableDataFieldSet fields("", templates); LoadableDataFieldSet fields("", templates);
ret = fields.readFromStream(&defstr, "temporary", now, true, nullptr, &errorDescription); ret = fields.readFromStream(&defstr, "temporary", now, true, nullptr, &errorDescription);
if (ret == RESULT_OK) { if (ret == RESULT_OK && fields.size()) {
const SingleDataField* field = fields[0];
SlaveSymbolString slave; SlaveSymbolString slave;
slave.push_back(0); // dummy length slave.push_back(0); // dummy length
ret = slave.parseHex(raw); ret = slave.parseHex(raw);
if (ret == RESULT_OK) { const SingleDataField* field = fields[0];
if (ret == RESULT_OK && field) {
slave.adjustHeader(); slave.adjustHeader();
ret = field->read(slave, 0, false, nullptr, 0, OF_JSON|OF_SHORT, 0, ostream); ret = field->read(slave, 0, false, nullptr, 0, OF_JSON|OF_SHORT, 0, ostream);
} }
} else {
ret = RESULT_ERR_INVALID_ARG;
} }
type = 6; type = 6;
} }
@@ -2422,7 +2428,11 @@ result_t MainLoop::formatHttpResult(result_t ret, int type, ostringstream* ostre
break; break;
case RESULT_ERR_INVALID_ARG: case RESULT_ERR_INVALID_ARG:
case RESULT_ERR_INVALID_NUM: case RESULT_ERR_INVALID_NUM:
case RESULT_ERR_INVALID_POS:
case RESULT_ERR_OUT_OF_RANGE: case RESULT_ERR_OUT_OF_RANGE:
case RESULT_ERR_INVALID_PART:
case RESULT_ERR_MISSING_ARG:
case RESULT_ERR_INVALID_LIST:
*ostream << "400 Bad Request"; *ostream << "400 Bad Request";
break; break;
case RESULT_ERR_NOTAUTHORIZED: case RESULT_ERR_NOTAUTHORIZED: