Sovran_Systems/Sovran_SystemsOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix deterministic LND/Alby Hub port collision

Browse Source
This commit is contained in:
copilot-swe-agent[bot]
2026-07-27 12:21:09 +00:00
committed by GitHub
parent fdd9d29db3
commit 37a15afa10
9 changed files with 342 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/sovran_systemsos_web/nwc_hub_manager.py
+6 -2
View File
@@ -1,7 +1,8 @@
"""
Alby Hub manager — shared backend for Wallet Connections API and recovery CLI.
Interfaces with the local Alby Hub instance at http://127.0.0.1:8080.
Interfaces with the local Alby Hub instance at
http://127.0.0.1:18080 by default (override with NWC_ALBY_HUB_API_BASE).
All sensitive values (passwords, bearer tokens, pairing URIs, macaroon
contents, Nostr private keys) are redacted from any exception messages
or log output.
@@ -24,7 +25,10 @@ logger = logging.getLogger(__name__)
# ── Constants ──────────────────────────────────────────────────────
DEFAULT_API_BASE = "http://127.0.0.1:8080"
DEFAULT_API_BASE = os.environ.get(
"NWC_ALBY_HUB_API_BASE",
"http://127.0.0.1:18080",
)
DEFAULT_UNLOCK_PASSWORD_FILE = "/var/lib/albyhub/unlock-password"
DEFAULT_MACAROON_FILE = os.environ.get(
"NWC_LND_MACAROON_FILE", "/run/lnd/albyhub.macaroon"
app/tests/test_wallet_connections.py
+65
View File
@@ -25,6 +25,8 @@ Tests cover:
"""
import json
import importlib
import os
import re
import shutil
import subprocess
@@ -169,6 +171,28 @@ def _fresh_manager() -> mgr.AlbyHubManager:
)
class ManagerApiBaseConfigurationTests(unittest.TestCase):
def setUp(self):
self._original_api_base = os.environ.get("NWC_ALBY_HUB_API_BASE")
def tearDown(self):
if self._original_api_base is None:
os.environ.pop("NWC_ALBY_HUB_API_BASE", None)
else:
os.environ["NWC_ALBY_HUB_API_BASE"] = self._original_api_base
importlib.reload(mgr)
def test_default_api_base_falls_back_to_18080(self):
os.environ.pop("NWC_ALBY_HUB_API_BASE", None)
reloaded_mgr = importlib.reload(mgr)
self.assertEqual(reloaded_mgr.DEFAULT_API_BASE, "http://127.0.0.1:18080")
def test_env_api_base_overrides_default(self):
os.environ["NWC_ALBY_HUB_API_BASE"] = "http://127.0.0.1:19999"
reloaded_mgr = importlib.reload(mgr)
self.assertEqual(reloaded_mgr.DEFAULT_API_BASE, "http://127.0.0.1:19999")
# ── Feature registry tests ────────────────────────────────────────
@@ -1113,6 +1137,7 @@ class NixPatchContractTests(unittest.TestCase):
"patchedAlbyHub = pkgs.albyhub.overrideAttrs (old: { patches = (old.patches or []) ++ [ "
"./packages/albyhub/0001-private-route-hints.patch "
"./packages/albyhub/0002-isolated-invoice-app-id.patch "
"./packages/albyhub/0003-loopback-bind-host.patch "
"]; }); "
f"in {result_expr}"
)
@@ -1124,10 +1149,13 @@ class NixPatchContractTests(unittest.TestCase):
self.assertIn("pkgs.albyhub.overrideAttrs", text)
self.assertIn("../packages/albyhub/0001-private-route-hints.patch", text)
self.assertIn("../packages/albyhub/0002-isolated-invoice-app-id.patch", text)
self.assertIn("../packages/albyhub/0003-loopback-bind-host.patch", text)
self.assertNotIn("sha256-AAAA", text)
self.assertNotIn("lib.fakeHash", text)
self.assertIn("AUTO_UNLOCK_PASSWORD", text)
self.assertNotIn("AUTO_UNLOCK_PASSWORD_FILE", text)
self.assertIn("albyHubPort = 18080;", text)
self.assertIn('albyHubApiBase = "http://127.0.0.1:${toString albyHubPort}";', text)
def test_nwc_module_uses_lib_getexe_for_albyhub_binary(self):
repo_root = Path(__file__).resolve().parents[2]
@@ -1215,6 +1243,43 @@ class NixPatchContractTests(unittest.TestCase):
self.assertIn("MakeInvoice(ctx, amountMsat, description,", text)
self.assertIn(", appId, nil, nil)", text)
def test_loopback_bind_host_patch_contains_required_changes(self):
repo_root = Path(__file__).resolve().parents[2]
patch_path = repo_root / "packages" / "albyhub" / "0003-loopback-bind-host.patch"
text = patch_path.read_text()
self.assertIn("diff --git a/cmd/http/main.go b/cmd/http/main.go", text)
self.assertIn("diff --git a/config/models.go b/config/models.go", text)
self.assertIn('Host string `envconfig:"HOST" default:"127.0.0.1"`', text)
self.assertIn("bindAddress := net.JoinHostPort", text)
self.assertIn("if err := e.Start(bindAddress);", text)
def test_nwc_services_share_authoritative_alby_hub_api_base(self):
repo_root = Path(__file__).resolve().parents[2]
module_path = repo_root / "modules" / "nwc-wallets.nix"
text = module_path.read_text()
self.assertIn("environment.NWC_ALBY_HUB_API_BASE = albyHubApiBase;", text)
self.assertIn("NWC_ALBY_HUB_API_BASE = albyHubApiBase;", text)
def test_albyhub_port_contract_and_assertions(self):
repo_root = Path(__file__).resolve().parents[2]
module_path = repo_root / "modules" / "nwc-wallets.nix"
text = module_path.read_text()
self.assertIn("PORT = toString albyHubPort;", text)
self.assertNotIn('PORT = "8080";', text)
self.assertIn("assertion = albyHubPort != config.services.lnd.restPort;", text)
self.assertIn("assertion = albyHubPort != 8181;", text)
self.assertIn("assertion = !(lib.elem albyHubPort config.networking.firewall.allowedTCPPorts);", text)
def test_recovery_cli_uses_manager_default_endpoint(self):
repo_root = Path(__file__).resolve().parents[2]
cli_path = repo_root / "app" / "sovran_systemsos_web" / "nwc_wallet_cli.py"
manager_path = repo_root / "app" / "sovran_systemsos_web" / "nwc_hub_manager.py"
cli_text = cli_path.read_text()
manager_text = manager_path.read_text()
self.assertIn("get_manager()", cli_text)
self.assertNotIn("127.0.0.1:8080", cli_text)
self.assertIn('"http://127.0.0.1:18080"', manager_text)
def test_nwc_lnurl_service_runs_as_albyhub(self):
"""nwc-lnurl.service must run as albyhub to read /var/lib/albyhub/unlock-password."""
repo_root = Path(__file__).resolve().parents[2]