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

plugin: Make unannounced notification topics no longer fatal

Browse Source 
Since plugins will start sending them soon, and they are likely to get
it wrong sometimes, be a bit more lenient, warn them in the logs
instead and then make sure it doesn't accidentally work anyway.
This commit is contained in:
Christian Decker
2021-04-29 11:18:19 +02:00
committed by Rusty Russell
parent c8c0c4dc99
commit 98aa3c3da7
3 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lightningd/plugin.c
View File

@@ -464,32 +464,21 @@ static const char *plugin_notification_handle(struct plugin *plugin,
methname = json_strdup(tmpctx, plugin->buffer, methtok);
if (notifications_have_topic(plugin->plugins, methname)) {
if (!plugin_notification_allowed(plugin, methname)) {
log_unusual(
plugin->log,
if (!plugin_notification_allowed(plugin, methname)) {
log_unusual(plugin->log,
"Plugin attempted to send a notification to topic "
"\"%s\" it hasn't declared in its manifest, not "
"forwarding to subscribers.",
methname);
return NULL;
} else {
} else if (notifications_have_topic(plugin->plugins, methname)) {
n = jsonrpc_notification_start(NULL, methname);
json_add_string(n->stream, "origin", plugin->shortname);
json_add_tok(n->stream, "payload", paramstok, plugin->buffer);
jsonrpc_notification_end(n);
n = jsonrpc_notification_start(NULL, methname);
json_add_string(n->stream, "origin", plugin->shortname);
json_add_tok(n->stream, "payload", paramstok,
plugin->buffer);
jsonrpc_notification_end(n);
plugins_notify(plugin->plugins, take(n));
return NULL;
}
} else {
return tal_fmt(plugin, "Unknown notification method %.*s",
json_tok_full_len(methtok),
json_tok_full(plugin->buffer, methtok));
plugins_notify(plugin->plugins, take(n));
}
return NULL;
}
/* Returns the error string, or NULL */