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

#915 add support for HTTP Authorization 

Add APITOKEN= field to ogAdmServer.cfg to specify the REST API key.
master
OpenGnSys Support Team 2019-06-21 13:03:04 +02:00
parent e45455ec82
commit fd305405b7
3 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sources/ogAdmServer.cpp
View File

@ -22,6 +22,7 @@ static char pasguor[LONPRM]; // Password del usuario
static char datasource[LONPRM]; // Dirección IP del gestor de base de datos static char datasource[LONPRM]; // Dirección IP del gestor de base de datos
static char catalog[LONPRM]; // Nombre de la base de datos static char catalog[LONPRM]; // Nombre de la base de datos
static char interface[LONPRM]; // Interface name static char interface[LONPRM]; // Interface name
static char auth_token[LONPRM]; // API token
//________________________________________________________________________________________________________ //________________________________________________________________________________________________________
// Función: tomaConfiguracion // Función: tomaConfiguracion
@ -77,7 +78,8 @@ static bool tomaConfiguracion(const char *filecfg)
snprintf(catalog, sizeof(catalog), "%s", value); snprintf(catalog, sizeof(catalog), "%s", value);
else if (!strcmp(StrToUpper(key), "INTERFACE")) else if (!strcmp(StrToUpper(key), "INTERFACE"))
snprintf(interface, sizeof(interface), "%s", value); snprintf(interface, sizeof(interface), "%s", value);
else if (!strcmp(StrToUpper(key), "APITOKEN"))
snprintf(auth_token, sizeof(auth_token), "%s", value);
line = fgets(buf, sizeof(buf), fcfg); line = fgets(buf, sizeof(buf), fcfg);
} }
@ -132,6 +134,7 @@ struct og_client {
int keepalive_idx; int keepalive_idx;
bool rest; bool rest;
unsigned int content_length; unsigned int content_length;
char auth_token[64];
}; };
static inline int og_client_socket(const struct og_client *cli) static inline int og_client_socket(const struct og_client *cli)
@ -3880,6 +3883,15 @@ static int og_client_not_found(struct og_client *cli)
return -1; return -1;
} }
static int og_client_not_authorized(struct og_client *cli)
{
char buf[] = "HTTP/1.1 404 Unauthorized\r\nContent-Length: 0\r\n\r\n";
send(og_client_socket(cli), buf, strlen(buf), 0);
return -1;
}
static int og_client_ok(struct og_client *cli, char *buf_reply) static int og_client_ok(struct og_client *cli, char *buf_reply)
{ {
char buf[4096] = {}; char buf[4096] = {};
@ -3918,6 +3930,11 @@ static int og_client_state_process_payload_rest(struct og_client *cli)
body = strstr(cli->buf, "\r\n\r\n") + 4; body = strstr(cli->buf, "\r\n\r\n") + 4;
if (strcmp(cli->auth_token, auth_token)) {
syslog(LOG_ERR, "wrong Authentication key\n");
return og_client_not_authorized(cli);
}
if (cli->content_length) { if (cli->content_length) {
root = json_loads(body, 0, &json_err); root = json_loads(body, 0, &json_err);
if (!root) { if (!root) {
@ -4047,6 +4064,10 @@ static int og_client_state_recv_hdr_rest(struct og_client *cli)
cli->msg_len += cli->content_length; cli->msg_len += cli->content_length;
} }
ptr = strstr(cli->buf, "Authorization: ");
if (ptr)
sscanf(ptr, "Authorization: %64[^\r\n]", cli->auth_token);
return 1; return 1;
} }

1
tests/config/ogAdmServer.cfg
View File

@ -5,3 +5,4 @@ PASSWORD=test-db
datasource=localhost datasource=localhost
CATALOG=test-db CATALOG=test-db
INTERFACE=eth1 INTERFACE=eth1
APITOKEN=07b3bfe728954619b58f0107ad73acc1

22
tests/run-tests.sh
View File

@ -1,10 +1,12 @@
curl -X POST http://127.0.0.1:8888/clients -d @post_clients.json API_KEY="07b3bfe728954619b58f0107ad73acc1"
curl -X GET http://127.0.0.1:8888/clients
curl -X POST http://127.0.0.1:8888/wol -d @wol.json curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/clients -d @post_clients.json
curl -X POST http://127.0.0.1:8888/shell/run -d @post_shell_run.json curl -X GET -H "Authorization: $API_KEY" http://127.0.0.1:8888/clients
curl -X POST http://127.0.0.1:8888/shell/output -d @post_shell_output.json curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/wol -d @wol.json
curl -X POST http://127.0.0.1:8888/session -d @session.json curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/shell/run -d @post_shell_run.json
curl -X POST http://127.0.0.1:8888/poweroff -d @poweroff.json curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/shell/output -d @post_shell_output.json
curl -X POST http://127.0.0.1:8888/reboot -d @reboot.json curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/session -d @session.json
curl -X POST http://127.0.0.1:8888/stop -d @stop.json curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/poweroff -d @poweroff.json
curl -X POST http://127.0.0.1:8888/refresh -d @refresh.json curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/reboot -d @reboot.json
curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/stop -d @stop.json
curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/refresh -d @refresh.json