Merge pull request #112 from Impa10r/v5.0.4

v5.0.4

Author: Impa10r

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Versions
 
+## 5.0.4
+
+- Bypass Tor proxy for LAN calls to bitcoind
+- Fix base64-encoded passwords truncated at "=" character
+
 ## 5.0.3
 
 - Allow capitalized supported_assets tickers in peerlist

cmd/psweb/bitcoin/bitcoin.go

@@ -156,9 +156,15 @@ func BitcoinClient() (c *RPCClient) {
 		if err != nil {
 			return nil
 		}
+		perHost := proxy.NewPerHost(dialer, proxy.Direct)
+		perHost.AddFromString("localhost")
+		perHost.AddFromString("127.0.0.1")
+		perHost.AddFromString("192.168.0.0/16")
+		perHost.AddFromString("10.0.0.0/8")
+		perHost.AddFromString("172.16.0.0/12")
 		httpClient = &http.Client{
 			Transport: &http.Transport{
-				Dial: dialer.Dial,
+				Dial: perHost.Dial,
 			},
 		}
 	} else {

cmd/psweb/config/cln.go

@@ -53,7 +53,7 @@ func loadDefaults(home, dataDir, network string) {
 			// ignore commented out lines
 			continue
 		}
-		if parts := strings.Split(l, "="); len(parts) > 1 {
+		if parts := strings.SplitN(l, "=", 2); len(parts) == 2 {
 			if parts[0] == "wallet" {
 				// ignore inline comments
 				value := strings.TrimSpace(strings.Split(parts[1], "#")[0])
@@ -240,7 +240,7 @@ func GetPeerswapCLNSetting(section, searchVariable string) string {
 				// end of section reached
 				break
 			}
-			if parts := strings.Split(line, "="); len(parts) > 1 {
+			if parts := strings.SplitN(line, "=", 2); len(parts) == 2 {
 				if parts[0] == searchVariable {
 					// ignore inline comments
 					value := strings.TrimSpace(strings.Split(parts[1], "#")[0])

cmd/psweb/config/lnd.go

@@ -211,7 +211,7 @@ func getConfSetting(searchVariable, filePath string) string {
 
 	lines := strings.Split(string(content), "\n")
 	for _, line := range lines {
-		if parts := strings.Split(line, "="); len(parts) > 1 {
+		if parts := strings.SplitN(line, "=", 2); len(parts) == 2 {
 			if parts[0] == searchVariable {
 				// ignore inline comments
 				return strings.TrimSpace(strings.Split(parts[1], "#")[0])

cmd/psweb/main.go

@@ -34,7 +34,7 @@ import (
 
 const (
 	// App VERSION tag
-	VERSION = "v5.0.3"
+	VERSION = "v5.0.4"
 	// Unusable BTC balance
 	ANCHOR_RESERVE = 25_000
 	// assume creatediscountct=1 for mainnet in elements.conf