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

src: move og_repository to dbi.h 

Move struct og_repository to dbi.h and use field max length for name and
ip.

Use og_json_parse_string_copy instead of og_json_parse_string to check
maximum length against the request payload.

Fixes: 86ccc3c2e8 ("#915 Add POST /repository/add")
master
Jose M. Guisado 2023-10-10 16:47:18 +02:00
parent dc68d0f135
commit 6f6372d0e0
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dbi.h
View File

@ -27,6 +27,7 @@ void og_dbi_close(struct og_dbi *db);
#define OG_DB_ROOM_LOC_MAXLEN 255
#define OG_DB_SERIAL_NUMBER_MAXLEN 25
#define OG_DB_IMAGE_DESCRIPTION_MAXLEN 250
#define OG_DB_REPO_NAME_MAXLEN 250
#define OG_DB_PART_NAME_MAXLEN 250
#define OG_DB_IMAGE_NAME_MAXLEN 50
#define OG_DB_FILESYSTEM_MAXLEN 16
@ -104,6 +105,11 @@ struct og_room {
bool remote;
};
struct og_repository {
char name[OG_DB_REPO_NAME_MAXLEN];
char ip[OG_DB_IP_MAXLEN];
};
struct in_addr;
int og_dbi_get_computer_info(struct og_dbi *dbi, struct og_computer *computer,
struct in_addr addr);

5
src/json.h
View File

@ -132,9 +132,4 @@ struct og_procedure {
int og_json_parse_procedure(json_t *element, struct og_procedure *proc);
struct og_repository {
const char *name;
const char *ip;
};
#endif

8
src/rest.c
View File

@ -5210,10 +5210,14 @@ static int og_cmd_post_repository_add(json_t *element,
json_object_foreach(element, key, value) {
if (!strcmp(key, "name")) {
err = og_json_parse_string(value, &repo.name);
err = og_json_parse_string_copy(value,
repo.name,
sizeof(repo.name));
params->flags |= OG_REST_PARAM_NAME;
} else if (!strcmp(key, "ip")) {
err = og_json_parse_string(value, &repo.ip);
err = og_json_parse_string_copy(value,
repo.ip,
sizeof(repo.ip));
params->flags |= OG_REST_PARAM_ADDR;
}