From b1e451b38543049e5b46b20b96ad66a11caa115b Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 4 Jan 2016 15:07:53 -0500 Subject: [PATCH] Adjust the new sysadm/network function a bit - just add proper error code handling if nothing was performed. --- src/server/WebBackend.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp index 8dfd6cc..9aa55ae 100644 --- a/src/server/WebBackend.cpp +++ b/src/server/WebBackend.cpp @@ -95,9 +95,11 @@ RestOutputStruct::ExitCode WebSocket::EvaluateDispatcherRequest(const QJsonValue RestOutputStruct::ExitCode WebSocket::EvaluateSysadmNetworkRequest(const QJsonValue in_args, QJsonObject *out){ if(in_args.isObject()){ QStringList keys = in_args.toObject().keys(); + bool ok = false; if(keys.contains("action")){ QString act = JsonValueToString(in_args.toObject().value("action")); if(act=="list-devices"){ + ok = true; QStringList devs = sysadm::NetDevice::listNetDevices(); for(int i=0; iinsert(devs[i], obj); } - } - } + + } //end of "action" key usage - }else if(in_args.isArray()){ - + //If nothing done - return the proper code + if(!ok){ + return RestOutputStruct::BADREQUEST; + } + }else{ // if(in_args.isArray()){ + return RestOutputStruct::BADREQUEST; } return RestOutputStruct::OK; }