nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #1709: fix: use cookie file auth for new wallets with managed bitcoind

Browse Source 
63ef4838a705a6f9187cf607a4e320b71f374557 fix: use cookie file auth for new wallets with managed bitcoind (Michael Mallan)

Pull request description:

  This fixes #1708.

  There would be no way to get the RPC password of an existing managed bitcoind installation without looking in other daemon.toml files.

  An existing rpcauth field in the bitcoin.conf file will remain unchanged so that an existing wallet using username/password authentication will continue to work.

ACKs for top commit:
  edouardparis:
    ACK 63ef4838a705a6f9187cf607a4e320b71f374557

Tree-SHA512: 69d6c0f5eed78227be0854306bdfe53abf2ea989083e4adfae5b17d952ee6570b8f98ede8bf43bcfbe2e3b529a19088a7500aa59ecca276323f0bf8cd0281f6e
This commit is contained in:
edouardparis 2025-05-16 17:42:41 +02:00
commit e7e4a8d474
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
2 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
liana-gui/src/installer/mod.rs
View File

@ -12,7 +12,7 @@ use liana_ui::{
component::network_banner,
widget::{Column, Element},
};
use lianad::config::Config;
use lianad::config::{BitcoinBackend, BitcoindConfig, BitcoindRpcAuth, Config};
use std::ops::Deref;
use tracing::{error, info, warn};
@ -721,9 +721,26 @@ pub fn extract_daemon_config(ctx: &Context) -> Result<Config, Error> {
.to_path_buf()
.canonicalize()
.map_err(|e| Error::Unexpected(format!("Failed to canonicalize datadir path: {}", e)))?;
let bitcoin_backend = if let Some(BitcoinBackend::Bitcoind(BitcoindConfig {
rpc_auth: BitcoindRpcAuth::CookieFile(cookie_path),
addr,
})) = &ctx.bitcoin_backend
{
// The cookie path must exist for this canonicalization to succeed, which means bitcoind must be running.
// We already checked in the installer that bitcoind is running.
let cookie_path = cookie_path
.canonicalize()
.map_err(|e| Error::Unexpected(format!("Failed to canonicalize cookie path: {}", e)))?;
Some(BitcoinBackend::Bitcoind(BitcoindConfig {
rpc_auth: BitcoindRpcAuth::CookieFile(cookie_path),
addr: *addr,
}))
} else {
ctx.bitcoin_backend.clone()
};
Ok(Config::new(
ctx.bitcoin_config.clone(),
ctx.bitcoin_backend.clone(),
bitcoin_backend,
log::LevelFilter::Info,
ctx.descriptor
.clone()

46
liana-gui/src/installer/step/node/bitcoind.rs
View File

@ -29,9 +29,9 @@ use crate::{
view, Error,
},
node::bitcoind::{
self, bitcoind_network_dir, internal_bitcoind_datadir, internal_bitcoind_directory,
Bitcoind, ConfigField, InternalBitcoindConfig, InternalBitcoindConfigError,
InternalBitcoindNetworkConfig, RpcAuth, RpcAuthType, RpcAuthValues,
self, bitcoind_network_dir, internal_bitcoind_cookie_path, internal_bitcoind_datadir,
internal_bitcoind_directory, Bitcoind, ConfigField, InternalBitcoindConfig,
InternalBitcoindConfigError, InternalBitcoindNetworkConfig, RpcAuthType, RpcAuthValues,
StartInternalBitcoindError, VERSION,
},
};
@ -583,9 +583,9 @@ impl Step for InternalBitcoindStep {
return Task::none();
}
};
let (rpc_port, p2p_port) = if let Some(network_conf) =
conf.networks.get(&self.network)
{
let network_conf = conf.networks.get(&self.network);
// Use same ports again if there is an existing installation.
let (rpc_port, p2p_port) = if let Some(network_conf) = network_conf {
(network_conf.rpc_port, network_conf.p2p_port)
} else {
match (get_available_port(), get_available_port()) {
@ -611,24 +611,28 @@ impl Step for InternalBitcoindStep {
}
}
};
let (rpc_auth, rpc_password) = match RpcAuth::new("liana") {
Ok((rpc_auth, password)) => (rpc_auth, password),
Err(e) => {
self.error = Some(e.to_string());
return Task::none();
}
};
// Use cookie file authentication for new wallets.
// For an existing bitcoind, we would not know the RPC password to use without checking
// in other daemon.toml files.
let cookie_file_auth = BitcoindRpcAuth::CookieFile(
internal_bitcoind_cookie_path(&self.bitcoind_datadir, &self.network),
);
let bitcoind_config = BitcoindConfig {
rpc_auth: BitcoindRpcAuth::UserPass(rpc_auth.user.clone(), rpc_password),
rpc_auth: cookie_file_auth,
addr: internal_bitcoind_address(rpc_port),
};
let network_conf = InternalBitcoindNetworkConfig {
rpc_port,
p2p_port,
prune: PRUNE_DEFAULT,
// Overwrite any previous entry for this network as we would no longer know the RPC password.
rpc_auth: Some(rpc_auth),
};
// Use existing network conf if it exists as it may have rpc_auth field set.
// This ensures an existing wallet using username/password authentication will continue to work.
let network_conf =
network_conf
.cloned()
.unwrap_or(InternalBitcoindNetworkConfig {
rpc_port,
p2p_port,
prune: PRUNE_DEFAULT,
rpc_auth: None, // can be omitted for new bitcoin.conf entries
});
conf.networks.insert(self.network, network_conf);
if let Err(e) = conf.to_file(&bitcoind::internal_bitcoind_config_path(
&self.bitcoind_datadir,