diff options
| -rw-r--r-- | sources/ogAdmServer.cpp | 31 | ||||
| -rw-r--r-- | tests/units/test_0001_get_clients.py | 2 |
2 files changed, 21 insertions, 12 deletions
diff --git a/sources/ogAdmServer.cpp b/sources/ogAdmServer.cpp index 357bf01..6401fe1 100644 --- a/sources/ogAdmServer.cpp +++ b/sources/ogAdmServer.cpp @@ -3933,6 +3933,15 @@ static int og_client_method_not_found(struct og_client *cli) return -1; } +static int og_client_bad_request(struct og_client *cli) +{ + char buf[] = "HTTP/1.1 400 Bad Request\r\nContent-Length: 0\r\n\r\n"; + + send(og_client_socket(cli), buf, strlen(buf), 0); + + return -1; +} + static int og_client_not_found(struct og_client *cli) { char buf[] = "HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\n\r\n"; @@ -4032,7 +4041,7 @@ static int og_client_state_process_payload_rest(struct og_client *cli) if (method == OG_METHOD_POST && !root) { syslog(LOG_ERR, "command clients with no payload\n"); - return og_client_not_found(cli); + return og_client_bad_request(cli); } switch (method) { case OG_METHOD_POST: @@ -4048,7 +4057,7 @@ static int og_client_state_process_payload_rest(struct og_client *cli) if (!root) { syslog(LOG_ERR, "command wol with no payload\n"); - return og_client_not_found(cli); + return og_client_bad_request(cli); } err = og_cmd_wol(root, ¶ms); } else if (!strncmp(cmd, "shell/run", strlen("shell/run"))) { @@ -4057,7 +4066,7 @@ static int og_client_state_process_payload_rest(struct og_client *cli) if (!root) { syslog(LOG_ERR, "command run with no payload\n"); - return og_client_not_found(cli); + return og_client_bad_request(cli); } err = og_cmd_run_post(root, ¶ms); } else if (!strncmp(cmd, "shell/output", strlen("shell/output"))) { @@ -4066,7 +4075,7 @@ static int og_client_state_process_payload_rest(struct og_client *cli) if (!root) { syslog(LOG_ERR, "command output with no payload\n"); - return og_client_not_found(cli); + return og_client_bad_request(cli); } err = og_cmd_run_get(root, ¶ms, buf_reply); @@ -4076,7 +4085,7 @@ static int og_client_state_process_payload_rest(struct og_client *cli) if (!root) { syslog(LOG_ERR, "command session with no payload\n"); - return og_client_not_found(cli); + return og_client_bad_request(cli); } err = og_cmd_session(root, ¶ms); } else if (!strncmp(cmd, "poweroff", strlen("poweroff"))) { @@ -4085,7 +4094,7 @@ static int og_client_state_process_payload_rest(struct og_client *cli) if (!root) { syslog(LOG_ERR, "command poweroff with no payload\n"); - return og_client_not_found(cli); + return og_client_bad_request(cli); } err = og_cmd_poweroff(root, ¶ms); } else if (!strncmp(cmd, "reboot", strlen("reboot"))) { @@ -4094,7 +4103,7 @@ static int og_client_state_process_payload_rest(struct og_client *cli) if (!root) { syslog(LOG_ERR, "command reboot with no payload\n"); - return og_client_not_found(cli); + return og_client_bad_request(cli); } err = og_cmd_reboot(root, ¶ms); } else if (!strncmp(cmd, "stop", strlen("stop"))) { @@ -4103,7 +4112,7 @@ static int og_client_state_process_payload_rest(struct og_client *cli) if (!root) { syslog(LOG_ERR, "command stop with no payload\n"); - return og_client_not_found(cli); + return og_client_bad_request(cli); } err = og_cmd_stop(root, ¶ms); } else if (!strncmp(cmd, "refresh", strlen("refresh"))) { @@ -4112,7 +4121,7 @@ static int og_client_state_process_payload_rest(struct og_client *cli) if (!root) { syslog(LOG_ERR, "command refresh with no payload\n"); - return og_client_not_found(cli); + return og_client_bad_request(cli); } err = og_cmd_refresh(root, ¶ms); } else if (!strncmp(cmd, "hardware", strlen("hardware"))) { @@ -4121,7 +4130,7 @@ static int og_client_state_process_payload_rest(struct og_client *cli) if (!root) { syslog(LOG_ERR, "command hardware with no payload\n"); - return og_client_not_found(cli); + return og_client_bad_request(cli); } err = og_cmd_hardware(root, ¶ms); } else if (!strncmp(cmd, "software", strlen("software"))) { @@ -4130,7 +4139,7 @@ static int og_client_state_process_payload_rest(struct og_client *cli) if (!root) { syslog(LOG_ERR, "command software with no payload\n"); - return og_client_not_found(cli); + return og_client_bad_request(cli); } err = og_cmd_software(root, ¶ms); } else { diff --git a/tests/units/test_0001_get_clients.py b/tests/units/test_0001_get_clients.py index 8d52bb8..218b41a 100644 --- a/tests/units/test_0001_get_clients.py +++ b/tests/units/test_0001_get_clients.py @@ -13,7 +13,7 @@ class TestGetClientsMethods(unittest.TestCase): def test_post_without_data(self): returned = requests.post(self.url, headers=self.headers) - self.assertEqual(returned.status_code, 404) + self.assertEqual(returned.status_code, 400) if __name__ == '__main__': unittest.main() |