blackbeard420/kore
1
0
Fork 0
mirror of https://github.com/jorisvink/kore synced 2025-03-09 12:39:01 -04:00
Code Issues Projects Releases Wiki Activity

Required params to be structured as per spec

Browse Source
This commit is contained in:
Raphaël Monrouzeau 2016-07-07 14:41:10 +02:00
parent 4ffe43cf87
commit 3366ec6573
4 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
examples/jsonrpc/src/v1.c
View File

@ -9,11 +9,32 @@
int v1(struct http_request *);
static int
write_json_string(struct jsonrpc_request *req, void *ctx)
write_string(struct jsonrpc_request *req, void *ctx)
{
char *str = (char *)ctx;
return yajl_gen_string(req->gen, (unsigned char *)str, strlen(str));
const unsigned char *str = (unsigned char *)ctx;
return yajl_gen_string(req->gen, str, strlen((const char *)str));
}
static int
write_string_array_params(struct jsonrpc_request *req, void *ctx)
{
int status = 0;
if (!YAJL_GEN_KO(status = yajl_gen_array_open(req->gen))) {
for (size_t i = 0; i < req->params->u.array.len; i++) {
yajl_val yajl_str = req->params->u.array.values[i];
char *str = YAJL_GET_STRING(yajl_str);
if (YAJL_GEN_KO(status = yajl_gen_string(req->gen,
(unsigned char *)str, strlen(str))))
break;
}
if (status == 0)
status = yajl_gen_array_close(req->gen);
}
return status;
}
int
@ -34,14 +55,23 @@ v1(struct http_request *http_req)
if ((ret = jsonrpc_request_read(http_req, 1000 * 64, &req)) != 0)
return jsonrpc_error(&req, ret, NULL);
/* Echo command takes and gives back a single string. */
/* Echo command takes and gives back params. */
if (strcmp(req.method, "echo") == 0) {
char *msg = YAJL_GET_STRING(req.params);
if (msg == NULL) {
if (!YAJL_IS_ARRAY(req.params)) {
jsonrpc_log(&req, -2, "Echo only accepts array params");
return jsonrpc_error(&req,
JSONRPC_INVALID_PARAMS, NULL);
}
return jsonrpc_result(&req, write_json_string, msg);
for (size_t i = 0; i < req.params->u.array.len; i++) {
yajl_val v = req.params->u.array.values[i];
if (!YAJL_IS_STRING(v)) {
jsonrpc_log(&req, -3,
"Echo only accepts strings");
return jsonrpc_error(&req,
JSONRPC_INVALID_PARAMS, NULL);
}
}
return jsonrpc_result(&req, write_string_array_params, NULL);
}
/* Date command displays date and time according to parameters. */
@ -66,8 +96,7 @@ v1(struct http_request *http_req)
return jsonrpc_error(&req, -4,
"Failed to get printable date time");
return jsonrpc_result(&req, write_json_string,
timestamp);
return jsonrpc_result(&req, write_string, timestamp);
}
return jsonrpc_error(&req, JSONRPC_METHOD_NOT_FOUND, NULL);

10
examples/jsonrpc/test/integ/jsonrpc.bats
View File

@ -105,17 +105,17 @@ printrep() {
grepstr "$result" '"error"[ \t\n]*:[ \t\n]*{[ \t\n]*"code"'
grepstr "$result" '"id"[ \t\n]*:[ \t\n]*1'
}
@test "result responses give back the string request" {
query='{"jsonrpc":"2.0","method":"echo","params":"foobar","id":"tau"}'
@test "result responses give back the string request id" {
query='{"jsonrpc":"2.0","method":"echo","params":["foobar"],"id":"tau"}'
result=`query "$query"`
printrep "$query" "$result"
grepstr "$result" '"result"[ \t\n]*:[ \t\n]*"foobar"'
grepstr "$result" '"result"[ \t\n]*:[ \t\n]*[[ \t\n]*"foobar"[ \t\n]*]'
grepstr "$result" '"id"[ \t\n]*:[ \t\n]*"tau"'
}
@test "result responses give back the integer request id" {
query='{"jsonrpc":"2.0","method":"echo","params":"foobar","id":6}'
query='{"jsonrpc":"2.0","method":"echo","params":["foobar"],"id":6}'
result=`query "$query"`
printrep "$query" "$result"
grepstr "$result" '"result"[ \t\n]*:[ \t\n]*"foobar"'
grepstr "$result" '"result"[ \t\n]*:[ \t\n]*[[ \t\n]*"foobar"[ \t\n]*]'
grepstr "$result" '"id"[ \t\n]*:[ \t\n]*6'
}

2
includes/jsonrpc.h
View File

@ -53,7 +53,7 @@ struct jsonrpc_request
yajl_gen_number((CTX), (unsigned char *)(STR), sizeof (STR) - 1)
#define YAJL_GEN_KO(OPERATION) \
(OPERATION) != yajl_gen_status_ok
((OPERATION) != yajl_gen_status_ok)
enum jsonrpc_error_code
{

8
src/jsonrpc.c
View File

@ -210,8 +210,14 @@ parse_json_body(struct jsonrpc_request *req)
return (JSONRPC_PARSE_ERROR);
}
/* Retrieve params. */
/* Check params. */
req->params = yajl_tree_get(req->json, params_path, yajl_t_any);
if (!(req->params == NULL || YAJL_IS_ARRAY(req->params)
|| YAJL_IS_OBJECT(req->params))) {
jsonrpc_log(req, LOG_ERR,
"JSON-RPC params MUST be Object or Array");
return (JSONRPC_PARSE_ERROR);
}
return (0);
}