lncfg: update ParseAddressString to be able to parse tor addrs
This commit is contained in:
parent
c03f731643
commit
5d66635aee
@ -12,23 +12,30 @@ var (
|
|||||||
loopBackAddrs = []string{"localhost", "127.0.0.1", "[::1]"}
|
loopBackAddrs = []string{"localhost", "127.0.0.1", "[::1]"}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type tcpResolver = func(network, addr string) (*net.TCPAddr, error)
|
||||||
|
|
||||||
// NormalizeAddresses returns a new slice with all the passed addresses
|
// NormalizeAddresses returns a new slice with all the passed addresses
|
||||||
// normalized with the given default port and all duplicates removed.
|
// normalized with the given default port and all duplicates removed.
|
||||||
func NormalizeAddresses(addrs []string,
|
func NormalizeAddresses(addrs []string, defaultPort string,
|
||||||
defaultPort string) ([]net.Addr, error) {
|
tcpResolver tcpResolver) ([]net.Addr, error) {
|
||||||
|
|
||||||
result := make([]net.Addr, 0, len(addrs))
|
result := make([]net.Addr, 0, len(addrs))
|
||||||
seen := map[string]struct{}{}
|
seen := map[string]struct{}{}
|
||||||
for _, strAddr := range addrs {
|
|
||||||
addr, err := ParseAddressString(strAddr, defaultPort)
|
for _, addr := range addrs {
|
||||||
|
parsedAddr, err := ParseAddressString(
|
||||||
|
addr, defaultPort, tcpResolver,
|
||||||
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, ok := seen[addr.String()]; !ok {
|
if _, ok := seen[parsedAddr.String()]; !ok {
|
||||||
result = append(result, addr)
|
result = append(result, parsedAddr)
|
||||||
seen[addr.String()] = struct{}{}
|
seen[parsedAddr.String()] = struct{}{}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -57,14 +64,12 @@ func EnforceSafeAuthentication(addrs []net.Addr, macaroonsActive bool) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListenOnAddress creates a listener that listens on the given
|
// ListenOnAddress creates a listener that listens on the given address.
|
||||||
// address.
|
|
||||||
func ListenOnAddress(addr net.Addr) (net.Listener, error) {
|
func ListenOnAddress(addr net.Addr) (net.Listener, error) {
|
||||||
return net.Listen(addr.Network(), addr.String())
|
return net.Listen(addr.Network(), addr.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
// TlsListenOnAddress creates a TLS listener that listens on the given
|
// TlsListenOnAddress creates a TLS listener that listens on the given address.
|
||||||
// address.
|
|
||||||
func TlsListenOnAddress(addr net.Addr,
|
func TlsListenOnAddress(addr net.Addr,
|
||||||
config *tls.Config) (net.Listener, error) {
|
config *tls.Config) (net.Listener, error) {
|
||||||
return tls.Listen(addr.Network(), addr.String(), config)
|
return tls.Listen(addr.Network(), addr.String(), config)
|
||||||
@ -81,20 +86,23 @@ func IsLoopback(addr net.Addr) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
// isUnix returns true if an address describes an Unix socket address.
|
// IsUnix returns true if an address describes an Unix socket address.
|
||||||
func IsUnix(addr net.Addr) bool {
|
func IsUnix(addr net.Addr) bool {
|
||||||
return strings.HasPrefix(addr.Network(), "unix")
|
return strings.HasPrefix(addr.Network(), "unix")
|
||||||
}
|
}
|
||||||
|
|
||||||
// ParseAddressString converts an address in string format to a net.Addr that is
|
// ParseAddressString converts an address in string format to a net.Addr that is
|
||||||
// compatible with lnd. UDP is not supported because lnd needs reliable
|
// compatible with lnd. UDP is not supported because lnd needs reliable
|
||||||
// connections.
|
// connections. We accept a custom function to resolve any TCP addresses so
|
||||||
func ParseAddressString(strAddress string,
|
// that caller is able control exactly how resolution is performed.
|
||||||
defaultPort string) (net.Addr, error) {
|
func ParseAddressString(strAddress string, defaultPort string,
|
||||||
|
tcpResolver tcpResolver) (net.Addr, error) {
|
||||||
|
|
||||||
var parsedNetwork, parsedAddr string
|
var parsedNetwork, parsedAddr string
|
||||||
|
|
||||||
// Addresses can either be in network://address:port format or only
|
// Addresses can either be in network://address:port format,
|
||||||
// address:port. We want to support both.
|
// network:address:port, address:port, or just port. We want to support
|
||||||
|
// all possible types.
|
||||||
if strings.Contains(strAddress, "://") {
|
if strings.Contains(strAddress, "://") {
|
||||||
parts := strings.Split(strAddress, "://")
|
parts := strings.Split(strAddress, "://")
|
||||||
parsedNetwork, parsedAddr = parts[0], parts[1]
|
parsedNetwork, parsedAddr = parts[0], parts[1]
|
||||||
@ -109,18 +117,45 @@ func ParseAddressString(strAddress string,
|
|||||||
switch parsedNetwork {
|
switch parsedNetwork {
|
||||||
case "unix", "unixpacket":
|
case "unix", "unixpacket":
|
||||||
return net.ResolveUnixAddr(parsedNetwork, parsedAddr)
|
return net.ResolveUnixAddr(parsedNetwork, parsedAddr)
|
||||||
|
|
||||||
case "tcp", "tcp4", "tcp6":
|
case "tcp", "tcp4", "tcp6":
|
||||||
return net.ResolveTCPAddr(parsedNetwork,
|
return tcpResolver(
|
||||||
verifyPort(parsedAddr, defaultPort))
|
parsedNetwork, verifyPort(parsedAddr, defaultPort),
|
||||||
|
)
|
||||||
|
|
||||||
case "ip", "ip4", "ip6", "udp", "udp4", "udp6", "unixgram":
|
case "ip", "ip4", "ip6", "udp", "udp4", "udp6", "unixgram":
|
||||||
return nil, fmt.Errorf("only TCP or unix socket "+
|
return nil, fmt.Errorf("only TCP or unix socket "+
|
||||||
"addresses are supported: %s", parsedAddr)
|
"addresses are supported: %s", parsedAddr)
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// There was no network specified, just try to parse as host
|
// We'll now possibly apply the default port, use the local
|
||||||
// and port.
|
// host short circuit, or parse out an all interfaces listen.
|
||||||
return net.ResolveTCPAddr(
|
addrWithPort := verifyPort(strAddress, defaultPort)
|
||||||
"tcp", verifyPort(strAddress, defaultPort),
|
rawHost, rawPort, _ := net.SplitHostPort(addrWithPort)
|
||||||
)
|
|
||||||
|
// If we reach this point, then we'll check to see if we have
|
||||||
|
// an onion addresses, if so, we can directly pass the raw
|
||||||
|
// address and port to create the proper address.
|
||||||
|
if tor.IsOnionHost(rawHost) {
|
||||||
|
portNum, err := strconv.Atoi(rawPort)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &tor.OnionAddr{
|
||||||
|
OnionService: rawHost,
|
||||||
|
Port: portNum,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Otherwise, we'll attempt the resolve the host. The Tor
|
||||||
|
// resolver is unable to resolve local addresses, so we'll use
|
||||||
|
// the system resolver instead.
|
||||||
|
if rawHost == "" || IsLoopback(rawHost) {
|
||||||
|
return net.ResolveTCPAddr("tcp", addrWithPort)
|
||||||
|
}
|
||||||
|
|
||||||
|
return tcpResolver("tcp", addrWithPort)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -148,14 +183,17 @@ func verifyPort(strAddress string, defaultPort string) string {
|
|||||||
|
|
||||||
// ClientAddressDialer creates a gRPC dialer that can also dial unix socket
|
// ClientAddressDialer creates a gRPC dialer that can also dial unix socket
|
||||||
// addresses instead of just TCP addresses.
|
// addresses instead of just TCP addresses.
|
||||||
func ClientAddressDialer(defaultPort string) func(string,
|
func ClientAddressDialer(defaultPort string) func(string, time.Duration) (net.Conn, error) {
|
||||||
time.Duration) (net.Conn, error) {
|
|
||||||
return func(addr string, timeout time.Duration) (net.Conn, error) {
|
return func(addr string, timeout time.Duration) (net.Conn, error) {
|
||||||
parsedAddr, err := ParseAddressString(addr, defaultPort)
|
parsedAddr, err := ParseAddressString(
|
||||||
|
addr, defaultPort, net.ResolveTCPAddr,
|
||||||
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return net.DialTimeout(parsedAddr.Network(),
|
|
||||||
parsedAddr.String(), timeout)
|
return net.DialTimeout(
|
||||||
|
parsedAddr.Network(), parsedAddr.String(), timeout,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user