mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 22:45:27 +01:00
Code Issues Projects Releases Wiki Activity

lightningd: clean up properly if we fail to exec plugin.

Browse source 
Reported-by: @niftynei
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Fixed: Plugins: we clean up properly if a plugin fails to start, and we don't kill all processes if it's from `plugin startdir`.
This commit is contained in:
Rusty Russell 2023-08-17 19:50:15 +09:30
parent 04ddb4af8d
commit f4e2d9a0ae
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lightningd/plugin.c
View file

@ -1869,7 +1869,7 @@ bool plugins_send_getmanifest(struct plugins *plugins, const char *cmd_id)
} }
if (plugins->startup) if (plugins->startup)
fatal("error starting plugin '%s': %s", p->cmd, err); fatal("error starting plugin '%s': %s", p->cmd, err);
plugin_kill(p, LOG_UNUSUAL, "%s", err); tal_free(p);
} }
return sent; return sent;

7
lightningd/plugin_control.c
View file

@ -74,13 +74,16 @@ plugin_dynamic_start(struct plugin_command *pcmd, const char *plugin_path,
"%s: %s", plugin_path, "%s: %s", plugin_path,
errno ? strerror(errno) : "already registered"); errno ? strerror(errno) : "already registered");
/* This will come back via plugin_cmd_killed or plugin_cmd_succeeded */
err = plugin_send_getmanifest(p, pcmd->cmd->id); err = plugin_send_getmanifest(p, pcmd->cmd->id);
if (err) if (err) {
/* Free plugin with cmd (it owns buffer and params!) */
tal_steal(pcmd->cmd, p);
return command_fail(pcmd->cmd, PLUGIN_ERROR, return command_fail(pcmd->cmd, PLUGIN_ERROR,
"%s: %s", "%s: %s",
plugin_path, err); plugin_path, err);
}
/* This will come back via plugin_cmd_killed or plugin_cmd_succeeded */
return command_still_pending(pcmd->cmd); return command_still_pending(pcmd->cmd);
} }

2
tests/test_plugin.py
View file

@ -4275,7 +4275,6 @@ def test_renepay_not_important(node_factory):
l1.rpc.plugin_start(os.path.join(os.getcwd(), 'plugins/cln-renepay')) l1.rpc.plugin_start(os.path.join(os.getcwd(), 'plugins/cln-renepay'))
@pytest.mark.xfail(strict=True)
@unittest.skipIf(VALGRIND, "Valgrind doesn't handle bad #! lines the same") @unittest.skipIf(VALGRIND, "Valgrind doesn't handle bad #! lines the same")
def test_plugin_nostart(node_factory): def test_plugin_nostart(node_factory):
"Should not appear in list if it didn't even start" "Should not appear in list if it didn't even start"
@ -4287,7 +4286,6 @@ def test_plugin_nostart(node_factory):
assert [p['name'] for p in l1.rpc.plugin_list()['plugins'] if 'badinterp' in p['name']] == [] assert [p['name'] for p in l1.rpc.plugin_list()['plugins'] if 'badinterp' in p['name']] == []
@pytest.mark.xfail(strict=True)
def test_plugin_startdir_lol(node_factory): def test_plugin_startdir_lol(node_factory):
"""Though we fail to start many of them, we don't crash!""" """Though we fail to start many of them, we don't crash!"""
l1 = node_factory.get_node(allow_broken_log=True) l1 = node_factory.get_node(allow_broken_log=True)