Allow lnd to use tor over unix socket

Author: djkazic

config.go

@@ -1049,14 +1049,16 @@ func ValidateConfig(cfg Config, interceptor signal.Interceptor, fileParser,
 		cfg.Tor.DNS = dns.String()
 	}
 
-	control, err := lncfg.ParseAddressString(
-		cfg.Tor.Control, strconv.Itoa(defaultTorControlPort),
-		cfg.net.ResolveTCPAddr,
-	)
-	if err != nil {
-		return nil, mkErr("error parsing tor control address: %v", err)
+	if !strings.HasPrefix(cfg.Tor.Control, "unix://") {
+		control, err := lncfg.ParseAddressString(
+			cfg.Tor.Control, strconv.Itoa(defaultTorControlPort),
+			cfg.net.ResolveTCPAddr,
+		)
+		if err != nil {
+			return nil, mkErr("error parsing tor control address: %v", err)
+		}
+		cfg.Tor.Control = control.String()
 	}
-	cfg.Tor.Control = control.String()
 
 	// Ensure that tor socks host:port is not equal to tor control
 	// host:port. This would lead to lnd not starting up properly.

go.mod

@@ -210,6 +210,7 @@ replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
 // We want to format raw bytes as hex instead of base64. The forked version
 // allows us to specify that as an option.
 replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display
+replace github.com/lightningnetwork/lnd/tor => ./tor
 
 // If you change this please also update .github/pull_request_template.md and
 // docs/INSTALL.md.

tor/controller.go

@@ -120,6 +120,10 @@ type Controller struct {
 	// controller connections on.
 	controlAddr string
 
+	// controlAddrType is the type of address the Tor server is listening
+	// locally for controller connections on.
+	controlAddrType string
+
 	// password, if non-empty, signals that the controller should attempt to
 	// authenticate itself with the backing Tor daemon through the
 	// HASHEDPASSWORD authentication method with this value.
@@ -141,9 +145,16 @@ type Controller struct {
 // a Tor server.
 func NewController(controlAddr string, targetIPAddress string,
 	password string) *Controller {
-
+	cleanedControlAddr := controlAddr
+	controlAddrType := "tcp"
+	if strings.HasPrefix(controlAddr, "unix://") {
+		controlAddrType = "unix"
+                cleanedControlAddr = strings.Replace(controlAddr, "unix://", "", -1)
+	}
+        log.Infof("Tor controller controlAddr: %s", controlAddr)
 	return &Controller{
-		controlAddr:     controlAddr,
+		controlAddr:     cleanedControlAddr,
+		controlAddrType: controlAddrType,
 		targetIPAddress: targetIPAddress,
 		password:        password,
 	}
@@ -159,7 +170,7 @@ func (c *Controller) Start() error {
 
 	log.Info("Starting tor controller")
 
-	conn, err := textproto.Dial("tcp", c.controlAddr)
+	conn, err := textproto.Dial(c.controlAddrType, c.controlAddr)
 	if err != nil {
 		return fmt.Errorf("unable to connect to Tor server: %v", err)
 	}
@@ -222,7 +233,7 @@ func (c *Controller) Reconnect() error {
 	}
 
 	// Make a new connection and authenticate.
-	conn, err := textproto.Dial("tcp", c.controlAddr)
+	conn, err := textproto.Dial(c.controlAddrType, c.controlAddr)
 	if err != nil {
 		return fmt.Errorf("unable to connect to Tor server: %w", err)
 	}