Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "lightningd: always require "jsonrpc": "2.0" in request." #5783

Merged
merged 1 commit into from
Dec 6, 2022
Merged

Revert "lightningd: always require "jsonrpc": "2.0" in request." #5783

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions lightningd/jsonrpc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ static void replace_command(struct rpc_command_hook_payload *p,
const char *buffer,
const jsmntok_t *replacetok)
{
const jsmntok_t *method = NULL, *params = NULL, *jsonrpc;
const jsmntok_t *method = NULL, *params = NULL;
const char *bad;

/* Must contain "method", "params" and "id" */
Expand Down Expand Up @@ -743,10 +743,14 @@ static void replace_command(struct rpc_command_hook_payload *p,
goto fail;
}

jsonrpc = json_get_member(buffer, replacetok, "jsonrpc");
if (!jsonrpc || jsonrpc->type != JSMN_STRING || !json_tok_streq(buffer, jsonrpc, "2.0")) {
bad = "jsonrpc: \"2.0\" must be specified in the request";
goto fail;
// deprecated phase to give the possibility to all to migrate and stay safe
// from this more restrictive change.
if (!deprecated_apis) {
const jsmntok_t *jsonrpc = json_get_member(buffer, replacetok, "jsonrpc");
if (!jsonrpc || jsonrpc->type != JSMN_STRING || !json_tok_streq(buffer, jsonrpc, "2.0")) {
bad = "jsonrpc: \"2.0\" must be specified in the request";
goto fail;
}
}

was_pending(command_exec(p->cmd->jcon, p->cmd, buffer, replacetok,
Expand Down Expand Up @@ -883,7 +887,7 @@ REGISTER_PLUGIN_HOOK(rpc_command,
static struct command_result *
parse_request(struct json_connection *jcon, const jsmntok_t tok[])
{
const jsmntok_t *method, *id, *params, *filter, *jsonrpc;
const jsmntok_t *method, *id, *params, *filter;
struct command *c;
struct rpc_command_hook_payload *rpc_hook;
bool completed;
Expand Down Expand Up @@ -912,11 +916,13 @@ parse_request(struct json_connection *jcon, const jsmntok_t tok[])

// Adding a deprecated phase to make sure that all the Core Lightning wrapper
// can migrate all the frameworks
jsonrpc = json_get_member(jcon->buffer, tok, "jsonrpc");
if (!deprecated_apis) {
const jsmntok_t *jsonrpc = json_get_member(jcon->buffer, tok, "jsonrpc");

if (!jsonrpc || jsonrpc->type != JSMN_STRING || !json_tok_streq(jcon->buffer, jsonrpc, "2.0")) {
json_command_malformed(jcon, "null", "jsonrpc: \"2.0\" must be specified in the request");
return NULL;
if (!jsonrpc || jsonrpc->type != JSMN_STRING || !json_tok_streq(jcon->buffer, jsonrpc, "2.0")) {
json_command_malformed(jcon, "null", "jsonrpc: \"2.0\" must be specified in the request");
return NULL;
}
}

/* Allocate the command off of the `jsonrpc` object and not
Expand Down