p/json-rpc-shell
1
1
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 2 Wiki Activity

Warn on unexpected "id" fields

Browse Source
This commit is contained in:
Přemysl Eric Janouch 2020-09-01 20:54:23 +02:00
parent 16ec8261dc
commit f6225ac6cc
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
json-rpc-shell.c
View File

@ -2739,8 +2739,19 @@ display_via_pipeline (struct app_context *ctx,
} }
static bool static bool
parse_response (struct app_context *ctx, struct str *buf, const char *pipeline) process_response (struct app_context *ctx, const json_t *id, struct str *buf,
const char *pipeline)
{ {
if (!id)
{
printf ("[Notification]\n");
if (!buf->len)
return true;
print_warning ("we have been sent data back for a notification");
return false;
}
json_error_t e; json_error_t e;
json_t *response; json_t *response;
if (!(response = json_loadb (buf->str, buf->len, JSON_DECODE_ANY, &e))) if (!(response = json_loadb (buf->str, buf->len, JSON_DECODE_ANY, &e)))
@ -2759,10 +2770,16 @@ parse_response (struct app_context *ctx, struct str *buf, const char *pipeline)
else if (!json_is_string (v) || strcmp (json_string_value (v), "2.0")) else if (!json_is_string (v) || strcmp (json_string_value (v), "2.0"))
print_warning ("invalid `%s' field in response", "jsonrpc"); print_warning ("invalid `%s' field in response", "jsonrpc");
json_t *returned_id = json_object_get (response, "id");
json_t *result = json_object_get (response, "result"); json_t *result = json_object_get (response, "result");
json_t *error = json_object_get (response, "error"); json_t *error = json_object_get (response, "error");
json_t *data = NULL; json_t *data = NULL;
if (!returned_id)
print_warning ("`%s' field not present in response", "id");
if (!json_equal (id, returned_id))
print_warning ("mismatching `%s' field in response", "id");
if (!result && !error) if (!result && !error)
PARSE_FAIL ("neither `result' nor `error' present in response"); PARSE_FAIL ("neither `result' nor `error' present in response");
if (result && error) if (result && error)
@ -2906,19 +2923,7 @@ make_json_rpc_call (struct app_context *ctx,
free (buf_term); free (buf_term);
} }
bool success = false; if (!process_response (ctx, id, &buf, pipeline))
if (id)
success = parse_response (ctx, &buf, pipeline);
else
{
printf ("[Notification]\n");
if (buf.len)
print_warning ("we have been sent data back for a notification");
else
success = true;
}
if (!success)
{ {
char *s = iconv_xstrdup (ctx->term_from_utf8, char *s = iconv_xstrdup (ctx->term_from_utf8,
buf.str, buf.len + 1 /* null byte */, NULL); buf.str, buf.len + 1 /* null byte */, NULL);