aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

libplugin: don't turn non-string JSON ids into strings.

Browse Source 
When called with `"id": 1` we replied with `"id": "1"`.  lightningd doesn't
actually care, but it's weird.

Copy the entire token: this way we don't have to special case anything.

Also, remove the doubled test in json_add_jsonstr.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-12-27 17:39:34 +10:30
parent 9ed138f5e5
commit 2d8fff6b57
5 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/libplugin.c
View File

@@ -177,14 +177,22 @@ static const char *get_json_id(const tal_t *ctx,
const char *cmd_id,
const char *method)
{
if (cmd_id)
return tal_fmt(ctx, "%s/%s:%s#%"PRIu64,
cmd_id,
plugin->id, method,
plugin->next_outreq_id++);
return tal_fmt(ctx, "%s:%s#%"PRIu64,
plugin->id, method,
plugin->next_outreq_id++);
const char *prefix;
if (cmd_id) {
/* Strip quotes! */
if (strstarts(cmd_id, "\"")) {
assert(strlen(cmd_id) >= 2);
assert(strends(cmd_id, "\""));
prefix = tal_fmt(tmpctx, "%.*s/",
(int)strlen(cmd_id) - 2, cmd_id + 1);
} else
prefix = tal_fmt(tmpctx, "%s/", cmd_id);
} else
prefix = "";
return tal_fmt(ctx, "\"%s%s:%s#%"PRIu64"\"",
prefix, plugin->id, method, plugin->next_outreq_id++);
}
static void destroy_out_req(struct out_req *out_req, struct plugin *plugin)
@@ -225,7 +233,7 @@ jsonrpc_request_start_(struct plugin *plugin, struct command *cmd,
out->js = new_json_stream(NULL, cmd, NULL);
json_object_start(out->js, NULL);
json_add_string(out->js, "jsonrpc", "2.0");
json_add_string(out->js, "id", out->id);
json_add_id(out->js, out->id);
json_add_string(out->js, "method", method);
if (out->errcb)
json_object_start(out->js, "params");
@@ -251,7 +259,7 @@ static struct json_stream *jsonrpc_stream_start(struct command *cmd)
json_object_start(js, NULL);
json_add_string(js, "jsonrpc", "2.0");
json_add_string(js, "id", cmd->id);
json_add_id(js, cmd->id);
return js;
}
@@ -548,10 +556,12 @@ static const jsmntok_t *sync_req(const tal_t *ctx,
const jsmntok_t *contents;
int reqlen;
struct json_out *jout = json_out_new(tmpctx);
const char *id = get_json_id(tmpctx, plugin, "init", method);
json_out_start(jout, NULL, '{');
json_out_addstr(jout, "jsonrpc", "2.0");
json_out_addstr(jout, "id", get_json_id(tmpctx, plugin, "init", method));
/* Copy in id *literally* */
memcpy(json_out_member_direct(jout, "id", strlen(id)), id, strlen(id));
json_out_addstr(jout, "method", method);
json_out_add_splice(jout, "params", params);
if (taken(params))
@@ -810,8 +820,8 @@ static void handle_rpc_reply(struct plugin *plugin, const jsmntok_t *toks)
return;
out = strmap_getn(&plugin->out_reqs,
buf + idtok->start,
idtok->end - idtok->start);
json_tok_full(buf, idtok),
json_tok_full_len(idtok));
if (!out) {
/* This can actually happen, if they free req! */
plugin_log(plugin, LOG_DBG, "JSON reply with unknown id '%.*s'",
@@ -1376,7 +1386,7 @@ struct json_stream *plugin_notify_start(struct command *cmd, const char *method)
json_add_string(js, "method", method);
json_object_start(js, "params");
json_add_string(js, "id", cmd->id);
json_add_id(js, cmd->id);
return js;
}