From 1130100f6743e6d0cd4dabbf189909e23b2d20bf Mon Sep 17 00:00:00 2001 From: Jeff Vandrew Jr <43861226+JeffVandrewJr@users.noreply.github.com> Date: Tue, 2 Apr 2019 23:06:06 -0400 Subject: [PATCH] Remove Sensitive RPC Data from Logs (#2520) Fixes: #2424 --- lightningd/bitcoind.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lightningd/bitcoind.c b/lightningd/bitcoind.c index d88181897..f68752913 100644 --- a/lightningd/bitcoind.c +++ b/lightningd/bitcoind.c @@ -117,8 +117,14 @@ static char *bcli_args(const tal_t *ctx, struct bitcoin_cli *bcli) char *ret = tal_strdup(ctx, bcli->args[0]); for (i = 1; bcli->args[i]; i++) { - ret = tal_strcat(ctx, take(ret), " "); - ret = tal_strcat(ctx, take(ret), bcli->args[i]); + ret = tal_strcat(ctx, take(ret), " "); + if (strstarts(bcli->args[i], "-rpcpassword")) { + ret = tal_strcat(ctx, take(ret), "-rpcpassword=..."); + } else if (strstarts(bcli->args[i], "-rpcuser")) { + ret = tal_strcat(ctx, take(ret), "-rpcuser=..."); + } else { + ret = tal_strcat(ctx, take(ret), bcli->args[i]); + } } return ret; }