lfg2025/archy
1
0
Fork 0
Code Issues 16 Pull Requests Actions Packages Projects Releases 44 Wiki Activity

fix: LND and ElectrumX Tor onion address resolution

Browse Source 
- lnd.rs: check tor-hostnames readable copy, then /var/lib/tor/, then
  legacy /var/lib/archipelago/tor/ with sudo fallback for each
- electrs_status.rs: same multi-path resolution for ElectrumX onion
- Both servers: created /var/lib/archipelago/tor-hostnames/ with readable
  copies of onion addresses (avoids sudo on every API call)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Dorian 2026-03-20 12:31:30 +00:00
parent 6f5188ef7f
commit 2295a34667
2 changed files with 63 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
core/archipelago/src/api/rpc/lnd.rs
View File

@ -922,13 +922,38 @@ impl RpcHandler {
let macaroon_b64url = let macaroon_b64url =
base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(&macaroon_bytes); base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(&macaroon_bytes);
// Read Tor onion address if available // Read Tor onion address — check system Tor path first, then legacy
let tor_onion = tokio::fs::read_to_string( let tor_onion = {
"/var/lib/archipelago/tor/hidden_service_lnd/hostname", let mut onion = None;
) for path in &[
.await "/var/lib/archipelago/tor-hostnames/lnd",
.ok() "/var/lib/tor/hidden_service_lnd/hostname",
.map(|s| s.trim().to_string()); "/var/lib/archipelago/tor/hidden_service_lnd/hostname",
] {
if let Ok(addr) = tokio::fs::read_to_string(path).await {
let addr = addr.trim().to_string();
if addr.ends_with(".onion") {
onion = Some(addr);
break;
}
}
// Try sudo for system Tor dirs (owned by debian-tor, 0700)
if let Ok(output) = tokio::process::Command::new("sudo")
.args(["cat", path])
.output()
.await
{
if output.status.success() {
let addr = String::from_utf8_lossy(&output.stdout).trim().to_string();
if addr.ends_with(".onion") {
onion = Some(addr);
break;
}
}
}
}
onion
};
Ok(serde_json::json!({ Ok(serde_json::json!({
"cert_base64url": cert_b64url, "cert_base64url": cert_b64url,

38
core/archipelago/src/electrs_status.rs
View File

@ -146,13 +146,37 @@ pub async fn get_electrs_sync_status() -> ElectrsSyncStatus {
None None
}; };
// Read Tor onion address if available // Read Tor onion address — check system Tor path first, then legacy
let tor_onion = tokio::fs::read_to_string( let tor_onion = {
"/var/lib/archipelago/tor/hidden_service_electrs/hostname", let mut onion = None;
) for path in &[
.await "/var/lib/archipelago/tor-hostnames/electrs",
.ok() "/var/lib/tor/hidden_service_electrs/hostname",
.map(|s| s.trim().to_string()); "/var/lib/archipelago/tor/hidden_service_electrs/hostname",
] {
if let Ok(addr) = tokio::fs::read_to_string(path).await {
let addr = addr.trim().to_string();
if addr.ends_with(".onion") {
onion = Some(addr);
break;
}
}
if let Ok(output) = tokio::process::Command::new("sudo")
.args(["cat", path])
.output()
.await
{
if output.status.success() {
let addr = String::from_utf8_lossy(&output.stdout).trim().to_string();
if addr.ends_with(".onion") {
onion = Some(addr);
break;
}
}
}
}
onion
};
let network_height = match bitcoin_network_height().await { let network_height = match bitcoin_network_height().await {
Ok(h) => h, Ok(h) => h,