48k.eu-mirror
/
ogserver
mirror of https://git.48k.eu/ogserver
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#915 add POST stop command to REST API in ogAdmServer 

Stop the menu selection on client (through POST method):

curl -X POST http://127.0.0.1:8888/stop -d @stop.json

Request
	POST /stop
	{"clients": [ "192.168.2.1" ] }
Reply:
	200 OK
master
OpenGnSys Support Team 2019-05-29 12:30:36 +02:00
parent 5f0191d73f
commit 1e6c889256
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sources/ogAdmServer.cpp
View File

@ -3916,6 +3916,26 @@ static int og_cmd_reboot(json_t *element, struct og_msg_params *params)
return og_cmd_legacy_send(params, "Reiniciar", CLIENTE_OCUPADO);
}
static int og_cmd_stop(json_t *element, struct og_msg_params *params)
{
const char *key;
json_t *value;
int err = 0;
if (json_typeof(element) != JSON_OBJECT)
return -1;
json_object_foreach(element, key, value) {
if (!strcmp(key, "clients"))
err = og_json_parse_clients(value, params);
if (err < 0)
break;
}
return og_cmd_legacy_send(params, "Purgar", CLIENTE_APAGADO);
}
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";
@ -4049,6 +4069,15 @@ static int og_client_state_process_payload_rest(struct og_client *cli)
return og_client_not_found(cli);
}
err = og_cmd_reboot(root, &params);
} else if (!strncmp(cmd, "stop", strlen("stop"))) {
if (method != OG_METHOD_POST)
return -1;
if (!root) {
syslog(LOG_ERR, "command stop with no payload\n");
return og_client_not_found(cli);
}
err = og_cmd_stop(root, &params);
} else {
syslog(LOG_ERR, "unknown command %s\n", cmd);
err = og_client_not_found(cli);

1
tests/run-tests.sh
View File

@ -6,3 +6,4 @@ curl -X POST http://127.0.0.1:8888/shell/output -d @post_shell_output.json
curl -X POST http://127.0.0.1:8888/session -d @session.json
curl -X POST http://127.0.0.1:8888/poweroff -d @poweroff.json
curl -X POST http://127.0.0.1:8888/reboot -d @reboot.json
curl -X POST http://127.0.0.1:8888/stop -d @stop.json

1
tests/stop.json 100644
View File

@ -0,0 +1 @@
{ "clients" : [ "192.168.2.1", "192.168.2.2" ] }