Saves 352 KB, removing one of our two HTTP/2 implementations linked into the binary. Fixes #17305 Updates #15015 Change-Id: I53a04b1f2687dca73c8541949465038b69aa6ade Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>main
Brad Fitzpatrick
7 months ago
committed by
Brad Fitzpatrick
parent
c45f8813b4
commit
1d93bdce20
@ -1,394 +0,0 @@ |
||||
// Copyright (c) Tailscale Inc & AUTHORS
|
||||
// SPDX-License-Identifier: BSD-3-Clause
|
||||
|
||||
package controlclient |
||||
|
||||
import ( |
||||
"bytes" |
||||
"cmp" |
||||
"context" |
||||
"encoding/json" |
||||
"errors" |
||||
"math" |
||||
"net/http" |
||||
"net/netip" |
||||
"net/url" |
||||
"sync" |
||||
"time" |
||||
|
||||
"golang.org/x/net/http2" |
||||
"tailscale.com/control/controlhttp" |
||||
"tailscale.com/control/ts2021" |
||||
"tailscale.com/health" |
||||
"tailscale.com/net/dnscache" |
||||
"tailscale.com/net/netmon" |
||||
"tailscale.com/net/tsdial" |
||||
"tailscale.com/tailcfg" |
||||
"tailscale.com/tstime" |
||||
"tailscale.com/types/key" |
||||
"tailscale.com/types/logger" |
||||
"tailscale.com/util/mak" |
||||
"tailscale.com/util/singleflight" |
||||
) |
||||
|
||||
// NoiseClient provides a http.Client to connect to tailcontrol over
|
||||
// the ts2021 protocol.
|
||||
type NoiseClient struct { |
||||
// Client is an HTTP client to talk to the coordination server.
|
||||
// It automatically makes a new Noise connection as needed.
|
||||
// It does not support node key proofs. To do that, call
|
||||
// noiseClient.getConn instead to make a connection.
|
||||
*http.Client |
||||
|
||||
// h2t is the HTTP/2 transport we use a bit to create new
|
||||
// *http2.ClientConns. We don't use its connection pool and we don't use its
|
||||
// dialing. We use it for exactly one reason: its idle timeout that can only
|
||||
// be configured via the HTTP/1 config. And then we call NewClientConn (with
|
||||
// an existing Noise connection) on the http2.Transport which sets up an
|
||||
// http2.ClientConn using that idle timeout from an http1.Transport.
|
||||
h2t *http2.Transport |
||||
|
||||
// sfDial ensures that two concurrent requests for a noise connection only
|
||||
// produce one shared one between the two callers.
|
||||
sfDial singleflight.Group[struct{}, *ts2021.Conn] |
||||
|
||||
dialer *tsdial.Dialer |
||||
dnsCache *dnscache.Resolver |
||||
privKey key.MachinePrivate |
||||
serverPubKey key.MachinePublic |
||||
host string // the host part of serverURL
|
||||
httpPort string // the default port to dial
|
||||
httpsPort string // the fallback Noise-over-https port or empty if none
|
||||
|
||||
// dialPlan optionally returns a ControlDialPlan previously received
|
||||
// from the control server; either the function or the return value can
|
||||
// be nil.
|
||||
dialPlan func() *tailcfg.ControlDialPlan |
||||
|
||||
logf logger.Logf |
||||
netMon *netmon.Monitor |
||||
health *health.Tracker |
||||
|
||||
// mu only protects the following variables.
|
||||
mu sync.Mutex |
||||
closed bool |
||||
last *ts2021.Conn // or nil
|
||||
nextID int |
||||
connPool map[int]*ts2021.Conn // active connections not yet closed; see ts2021.Conn.Close
|
||||
} |
||||
|
||||
// NoiseOpts contains options for the NewNoiseClient function. All fields are
|
||||
// required unless otherwise specified.
|
||||
type NoiseOpts struct { |
||||
// PrivKey is this node's private key.
|
||||
PrivKey key.MachinePrivate |
||||
// ServerPubKey is the public key of the server.
|
||||
ServerPubKey key.MachinePublic |
||||
// ServerURL is the URL of the server to connect to.
|
||||
ServerURL string |
||||
// Dialer's SystemDial function is used to connect to the server.
|
||||
Dialer *tsdial.Dialer |
||||
// DNSCache is the caching Resolver to use to connect to the server.
|
||||
//
|
||||
// This field can be nil.
|
||||
DNSCache *dnscache.Resolver |
||||
// Logf is the log function to use. This field can be nil.
|
||||
Logf logger.Logf |
||||
// NetMon is the network monitor that, if set, will be used to get the
|
||||
// network interface state. This field can be nil; if so, the current
|
||||
// state will be looked up dynamically.
|
||||
NetMon *netmon.Monitor |
||||
// HealthTracker, if non-nil, is the health tracker to use.
|
||||
HealthTracker *health.Tracker |
||||
// DialPlan, if set, is a function that should return an explicit plan
|
||||
// on how to connect to the server.
|
||||
DialPlan func() *tailcfg.ControlDialPlan |
||||
} |
||||
|
||||
// NewNoiseClient returns a new noiseClient for the provided server and machine key.
|
||||
// serverURL is of the form https://<host>:<port> (no trailing slash).
|
||||
//
|
||||
// netMon may be nil, if non-nil it's used to do faster interface lookups.
|
||||
// dialPlan may be nil
|
||||
func NewNoiseClient(opts NoiseOpts) (*NoiseClient, error) { |
||||
logf := opts.Logf |
||||
u, err := url.Parse(opts.ServerURL) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
if u.Scheme != "http" && u.Scheme != "https" { |
||||
return nil, errors.New("invalid ServerURL scheme, must be http or https") |
||||
} |
||||
|
||||
var httpPort string |
||||
var httpsPort string |
||||
addr, _ := netip.ParseAddr(u.Hostname()) |
||||
isPrivateHost := addr.IsPrivate() || addr.IsLoopback() || u.Hostname() == "localhost" |
||||
if port := u.Port(); port != "" { |
||||
// If there is an explicit port specified, entirely rely on the scheme,
|
||||
// unless it's http with a private host in which case we never try using HTTPS.
|
||||
if u.Scheme == "https" { |
||||
httpPort = "" |
||||
httpsPort = port |
||||
} else if u.Scheme == "http" { |
||||
httpPort = port |
||||
httpsPort = "443" |
||||
if isPrivateHost { |
||||
logf("setting empty HTTPS port with http scheme and private host %s", u.Hostname()) |
||||
httpsPort = "" |
||||
} |
||||
} |
||||
} else if u.Scheme == "http" && isPrivateHost { |
||||
// Whenever the scheme is http and the hostname is an IP address, do not set the HTTPS port,
|
||||
// as there cannot be a TLS certificate issued for an IP, unless it's a public IP.
|
||||
httpPort = "80" |
||||
httpsPort = "" |
||||
} else { |
||||
// Otherwise, use the standard ports
|
||||
httpPort = "80" |
||||
httpsPort = "443" |
||||
} |
||||
|
||||
np := &NoiseClient{ |
||||
serverPubKey: opts.ServerPubKey, |
||||
privKey: opts.PrivKey, |
||||
host: u.Hostname(), |
||||
httpPort: httpPort, |
||||
httpsPort: httpsPort, |
||||
dialer: opts.Dialer, |
||||
dnsCache: opts.DNSCache, |
||||
dialPlan: opts.DialPlan, |
||||
logf: opts.Logf, |
||||
netMon: opts.NetMon, |
||||
health: opts.HealthTracker, |
||||
} |
||||
|
||||
// Create the HTTP/2 Transport using a net/http.Transport
|
||||
// (which only does HTTP/1) because it's the only way to
|
||||
// configure certain properties on the http2.Transport. But we
|
||||
// never actually use the net/http.Transport for any HTTP/1
|
||||
// requests.
|
||||
h2Transport, err := http2.ConfigureTransports(&http.Transport{ |
||||
IdleConnTimeout: time.Minute, |
||||
}) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
np.h2t = h2Transport |
||||
|
||||
np.Client = &http.Client{Transport: np} |
||||
return np, nil |
||||
} |
||||
|
||||
// contextErr is an error that wraps another error and is used to indicate that
|
||||
// the error was because a context expired.
|
||||
type contextErr struct { |
||||
err error |
||||
} |
||||
|
||||
func (e contextErr) Error() string { |
||||
return e.err.Error() |
||||
} |
||||
|
||||
func (e contextErr) Unwrap() error { |
||||
return e.err |
||||
} |
||||
|
||||
// getConn returns a ts2021.Conn that can be used to make requests to the
|
||||
// coordination server. It may return a cached connection or create a new one.
|
||||
// Dials are singleflighted, so concurrent calls to getConn may only dial once.
|
||||
// As such, context values may not be respected as there are no guarantees that
|
||||
// the context passed to getConn is the same as the context passed to dial.
|
||||
func (nc *NoiseClient) getConn(ctx context.Context) (*ts2021.Conn, error) { |
||||
nc.mu.Lock() |
||||
if last := nc.last; last != nil && last.CanTakeNewRequest() { |
||||
nc.mu.Unlock() |
||||
return last, nil |
||||
} |
||||
nc.mu.Unlock() |
||||
|
||||
for { |
||||
// We singeflight the dial to avoid making multiple connections, however
|
||||
// that means that we can't simply cancel the dial if the context is
|
||||
// canceled. Instead, we have to additionally check that the context
|
||||
// which was canceled is our context and retry if our context is still
|
||||
// valid.
|
||||
conn, err, _ := nc.sfDial.Do(struct{}{}, func() (*ts2021.Conn, error) { |
||||
c, err := nc.dial(ctx) |
||||
if err != nil { |
||||
if ctx.Err() != nil { |
||||
return nil, contextErr{ctx.Err()} |
||||
} |
||||
return nil, err |
||||
} |
||||
return c, nil |
||||
}) |
||||
var ce contextErr |
||||
if err == nil || !errors.As(err, &ce) { |
||||
return conn, err |
||||
} |
||||
if ctx.Err() == nil { |
||||
// The dial failed because of a context error, but our context
|
||||
// is still valid. Retry.
|
||||
continue |
||||
} |
||||
// The dial failed because our context was canceled. Return the
|
||||
// underlying error.
|
||||
return nil, ce.Unwrap() |
||||
} |
||||
} |
||||
|
||||
func (nc *NoiseClient) RoundTrip(req *http.Request) (*http.Response, error) { |
||||
ctx := req.Context() |
||||
conn, err := nc.getConn(ctx) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
return conn.RoundTrip(req) |
||||
} |
||||
|
||||
// connClosed removes the connection with the provided ID from the pool
|
||||
// of active connections.
|
||||
func (nc *NoiseClient) connClosed(id int) { |
||||
nc.mu.Lock() |
||||
defer nc.mu.Unlock() |
||||
conn := nc.connPool[id] |
||||
if conn != nil { |
||||
delete(nc.connPool, id) |
||||
if nc.last == conn { |
||||
nc.last = nil |
||||
} |
||||
} |
||||
} |
||||
|
||||
// Close closes all the underlying noise connections.
|
||||
// It is a no-op and returns nil if the connection is already closed.
|
||||
func (nc *NoiseClient) Close() error { |
||||
nc.mu.Lock() |
||||
nc.closed = true |
||||
conns := nc.connPool |
||||
nc.connPool = nil |
||||
nc.mu.Unlock() |
||||
|
||||
var errs []error |
||||
for _, c := range conns { |
||||
if err := c.Close(); err != nil { |
||||
errs = append(errs, err) |
||||
} |
||||
} |
||||
return errors.Join(errs...) |
||||
} |
||||
|
||||
// dial opens a new connection to tailcontrol, fetching the server noise key
|
||||
// if not cached.
|
||||
func (nc *NoiseClient) dial(ctx context.Context) (*ts2021.Conn, error) { |
||||
nc.mu.Lock() |
||||
connID := nc.nextID |
||||
nc.nextID++ |
||||
nc.mu.Unlock() |
||||
|
||||
if tailcfg.CurrentCapabilityVersion > math.MaxUint16 { |
||||
// Panic, because a test should have started failing several
|
||||
// thousand version numbers before getting to this point.
|
||||
panic("capability version is too high to fit in the wire protocol") |
||||
} |
||||
|
||||
var dialPlan *tailcfg.ControlDialPlan |
||||
if nc.dialPlan != nil { |
||||
dialPlan = nc.dialPlan() |
||||
} |
||||
|
||||
// If we have a dial plan, then set our timeout as slightly longer than
|
||||
// the maximum amount of time contained therein; we assume that
|
||||
// explicit instructions on timeouts are more useful than a single
|
||||
// hard-coded timeout.
|
||||
//
|
||||
// The default value of 5 is chosen so that, when there's no dial plan,
|
||||
// we retain the previous behaviour of 10 seconds end-to-end timeout.
|
||||
timeoutSec := 5.0 |
||||
if dialPlan != nil { |
||||
for _, c := range dialPlan.Candidates { |
||||
if v := c.DialStartDelaySec + c.DialTimeoutSec; v > timeoutSec { |
||||
timeoutSec = v |
||||
} |
||||
} |
||||
} |
||||
|
||||
// After we establish a connection, we need some time to actually
|
||||
// upgrade it into a Noise connection. With a ballpark worst-case RTT
|
||||
// of 1000ms, give ourselves an extra 5 seconds to complete the
|
||||
// handshake.
|
||||
timeoutSec += 5 |
||||
|
||||
// Be extremely defensive and ensure that the timeout is in the range
|
||||
// [5, 60] seconds (e.g. if we accidentally get a negative number).
|
||||
if timeoutSec > 60 { |
||||
timeoutSec = 60 |
||||
} else if timeoutSec < 5 { |
||||
timeoutSec = 5 |
||||
} |
||||
|
||||
timeout := time.Duration(timeoutSec * float64(time.Second)) |
||||
ctx, cancel := context.WithTimeout(ctx, timeout) |
||||
defer cancel() |
||||
|
||||
clientConn, err := (&controlhttp.Dialer{ |
||||
Hostname: nc.host, |
||||
HTTPPort: nc.httpPort, |
||||
HTTPSPort: cmp.Or(nc.httpsPort, controlhttp.NoPort), |
||||
MachineKey: nc.privKey, |
||||
ControlKey: nc.serverPubKey, |
||||
ProtocolVersion: uint16(tailcfg.CurrentCapabilityVersion), |
||||
Dialer: nc.dialer.SystemDial, |
||||
DNSCache: nc.dnsCache, |
||||
DialPlan: dialPlan, |
||||
Logf: nc.logf, |
||||
NetMon: nc.netMon, |
||||
HealthTracker: nc.health, |
||||
Clock: tstime.StdClock{}, |
||||
}).Dial(ctx) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
ncc, err := ts2021.New(clientConn.Conn, nc.h2t, connID, nc.connClosed) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
nc.mu.Lock() |
||||
if nc.closed { |
||||
nc.mu.Unlock() |
||||
ncc.Close() // Needs to be called without holding the lock.
|
||||
return nil, errors.New("noise client closed") |
||||
} |
||||
defer nc.mu.Unlock() |
||||
mak.Set(&nc.connPool, connID, ncc) |
||||
nc.last = ncc |
||||
return ncc, nil |
||||
} |
||||
|
||||
// post does a POST to the control server at the given path, JSON-encoding body.
|
||||
// The provided nodeKey is an optional load balancing hint.
|
||||
func (nc *NoiseClient) post(ctx context.Context, path string, nodeKey key.NodePublic, body any) (*http.Response, error) { |
||||
return nc.doWithBody(ctx, "POST", path, nodeKey, body) |
||||
} |
||||
|
||||
func (nc *NoiseClient) doWithBody(ctx context.Context, method, path string, nodeKey key.NodePublic, body any) (*http.Response, error) { |
||||
jbody, err := json.Marshal(body) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
req, err := http.NewRequestWithContext(ctx, method, "https://"+nc.host+path, bytes.NewReader(jbody)) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
addLBHeader(req, nodeKey) |
||||
req.Header.Set("Content-Type", "application/json") |
||||
conn, err := nc.getConn(ctx) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
return conn.RoundTrip(req) |
||||
} |
||||
@ -0,0 +1,289 @@ |
||||
// Copyright (c) Tailscale Inc & AUTHORS
|
||||
// SPDX-License-Identifier: BSD-3-Clause
|
||||
|
||||
package ts2021 |
||||
|
||||
import ( |
||||
"bytes" |
||||
"cmp" |
||||
"context" |
||||
"encoding/json" |
||||
"errors" |
||||
"fmt" |
||||
"log" |
||||
"math" |
||||
"net" |
||||
"net/http" |
||||
"net/netip" |
||||
"net/url" |
||||
"sync" |
||||
"time" |
||||
|
||||
"tailscale.com/control/controlhttp" |
||||
"tailscale.com/health" |
||||
"tailscale.com/net/dnscache" |
||||
"tailscale.com/net/netmon" |
||||
"tailscale.com/net/tsdial" |
||||
"tailscale.com/tailcfg" |
||||
"tailscale.com/tstime" |
||||
"tailscale.com/types/key" |
||||
"tailscale.com/types/logger" |
||||
) |
||||
|
||||
// Client provides a http.Client to connect to tailcontrol over
|
||||
// the ts2021 protocol.
|
||||
type Client struct { |
||||
// Client is an HTTP client to talk to the coordination server.
|
||||
// It automatically makes a new Noise connection as needed.
|
||||
*http.Client |
||||
|
||||
logf logger.Logf // non-nil
|
||||
opts ClientOpts |
||||
host string // the host part of serverURL
|
||||
httpPort string // the default port to dial
|
||||
httpsPort string // the fallback Noise-over-https port or empty if none
|
||||
|
||||
// mu protects the following
|
||||
mu sync.Mutex |
||||
closed bool |
||||
} |
||||
|
||||
// ClientOpts contains options for the [NewClient] function. All fields are
|
||||
// required unless otherwise specified.
|
||||
type ClientOpts struct { |
||||
// ServerURL is the URL of the server to connect to.
|
||||
ServerURL string |
||||
|
||||
// PrivKey is this node's private key.
|
||||
PrivKey key.MachinePrivate |
||||
|
||||
// ServerPubKey is the public key of the server.
|
||||
// It is of the form https://<host>:<port> (no trailing slash).
|
||||
ServerPubKey key.MachinePublic |
||||
|
||||
// Dialer's SystemDial function is used to connect to the server.
|
||||
Dialer *tsdial.Dialer |
||||
|
||||
// Optional fields follow
|
||||
|
||||
// Logf is the log function to use.
|
||||
// If nil, log.Printf is used.
|
||||
Logf logger.Logf |
||||
|
||||
// NetMon is the network monitor that will be used to get the
|
||||
// network interface state. This field can be nil; if so, the current
|
||||
// state will be looked up dynamically.
|
||||
NetMon *netmon.Monitor |
||||
|
||||
// DNSCache is the caching Resolver to use to connect to the server.
|
||||
//
|
||||
// This field can be nil.
|
||||
DNSCache *dnscache.Resolver |
||||
|
||||
// HealthTracker, if non-nil, is the health tracker to use.
|
||||
HealthTracker *health.Tracker |
||||
|
||||
// DialPlan, if set, is a function that should return an explicit plan
|
||||
// on how to connect to the server.
|
||||
DialPlan func() *tailcfg.ControlDialPlan |
||||
|
||||
// ProtocolVersion, if non-zero, specifies an alternate
|
||||
// protocol version to use instead of the default,
|
||||
// of [tailcfg.CurrentCapabilityVersion].
|
||||
ProtocolVersion uint16 |
||||
} |
||||
|
||||
// NewClient returns a new noiseClient for the provided server and machine key.
|
||||
//
|
||||
// netMon may be nil, if non-nil it's used to do faster interface lookups.
|
||||
// dialPlan may be nil
|
||||
func NewClient(opts ClientOpts) (*Client, error) { |
||||
logf := opts.Logf |
||||
if logf == nil { |
||||
logf = log.Printf |
||||
} |
||||
if opts.ServerURL == "" { |
||||
return nil, errors.New("ServerURL is required") |
||||
} |
||||
if opts.PrivKey.IsZero() { |
||||
return nil, errors.New("PrivKey is required") |
||||
} |
||||
if opts.ServerPubKey.IsZero() { |
||||
return nil, errors.New("ServerPubKey is required") |
||||
} |
||||
if opts.Dialer == nil { |
||||
return nil, errors.New("Dialer is required") |
||||
} |
||||
|
||||
u, err := url.Parse(opts.ServerURL) |
||||
if err != nil { |
||||
return nil, fmt.Errorf("invalid ClientOpts.ServerURL: %w", err) |
||||
} |
||||
if u.Scheme != "http" && u.Scheme != "https" { |
||||
return nil, errors.New("invalid ServerURL scheme, must be http or https") |
||||
} |
||||
|
||||
httpPort, httpsPort := "80", "443" |
||||
addr, _ := netip.ParseAddr(u.Hostname()) |
||||
isPrivateHost := addr.IsPrivate() || addr.IsLoopback() || u.Hostname() == "localhost" |
||||
if port := u.Port(); port != "" { |
||||
// If there is an explicit port specified, entirely rely on the scheme,
|
||||
// unless it's http with a private host in which case we never try using HTTPS.
|
||||
if u.Scheme == "https" { |
||||
httpPort = "" |
||||
httpsPort = port |
||||
} else if u.Scheme == "http" { |
||||
httpPort = port |
||||
httpsPort = "443" |
||||
if isPrivateHost { |
||||
logf("setting empty HTTPS port with http scheme and private host %s", u.Hostname()) |
||||
httpsPort = "" |
||||
} |
||||
} |
||||
} else if u.Scheme == "http" && isPrivateHost { |
||||
// Whenever the scheme is http and the hostname is an IP address, do not set the HTTPS port,
|
||||
// as there cannot be a TLS certificate issued for an IP, unless it's a public IP.
|
||||
httpPort = "80" |
||||
httpsPort = "" |
||||
} |
||||
|
||||
np := &Client{ |
||||
opts: opts, |
||||
host: u.Hostname(), |
||||
httpPort: httpPort, |
||||
httpsPort: httpsPort, |
||||
logf: logf, |
||||
} |
||||
|
||||
tr := &http.Transport{ |
||||
Protocols: new(http.Protocols), |
||||
MaxConnsPerHost: 1, |
||||
} |
||||
// We force only HTTP/2 for this transport, which is what the control server
|
||||
// speaks inside the ts2021 Noise encryption. But Go doesn't know about that,
|
||||
// so we use "SetUnencryptedHTTP2" even though it's actually encrypted.
|
||||
tr.Protocols.SetUnencryptedHTTP2(true) |
||||
tr.DialTLSContext = func(ctx context.Context, network, addr string) (net.Conn, error) { |
||||
return np.dial(ctx) |
||||
} |
||||
|
||||
np.Client = &http.Client{Transport: tr} |
||||
return np, nil |
||||
} |
||||
|
||||
// Close closes all the underlying noise connections.
|
||||
// It is a no-op and returns nil if the connection is already closed.
|
||||
func (nc *Client) Close() error { |
||||
nc.mu.Lock() |
||||
defer nc.mu.Unlock() |
||||
nc.closed = true |
||||
nc.Client.CloseIdleConnections() |
||||
return nil |
||||
} |
||||
|
||||
// dial opens a new connection to tailcontrol, fetching the server noise key
|
||||
// if not cached.
|
||||
func (nc *Client) dial(ctx context.Context) (*Conn, error) { |
||||
if tailcfg.CurrentCapabilityVersion > math.MaxUint16 { |
||||
// Panic, because a test should have started failing several
|
||||
// thousand version numbers before getting to this point.
|
||||
panic("capability version is too high to fit in the wire protocol") |
||||
} |
||||
|
||||
var dialPlan *tailcfg.ControlDialPlan |
||||
if nc.opts.DialPlan != nil { |
||||
dialPlan = nc.opts.DialPlan() |
||||
} |
||||
|
||||
// If we have a dial plan, then set our timeout as slightly longer than
|
||||
// the maximum amount of time contained therein; we assume that
|
||||
// explicit instructions on timeouts are more useful than a single
|
||||
// hard-coded timeout.
|
||||
//
|
||||
// The default value of 5 is chosen so that, when there's no dial plan,
|
||||
// we retain the previous behaviour of 10 seconds end-to-end timeout.
|
||||
timeoutSec := 5.0 |
||||
if dialPlan != nil { |
||||
for _, c := range dialPlan.Candidates { |
||||
if v := c.DialStartDelaySec + c.DialTimeoutSec; v > timeoutSec { |
||||
timeoutSec = v |
||||
} |
||||
} |
||||
} |
||||
|
||||
// After we establish a connection, we need some time to actually
|
||||
// upgrade it into a Noise connection. With a ballpark worst-case RTT
|
||||
// of 1000ms, give ourselves an extra 5 seconds to complete the
|
||||
// handshake.
|
||||
timeoutSec += 5 |
||||
|
||||
// Be extremely defensive and ensure that the timeout is in the range
|
||||
// [5, 60] seconds (e.g. if we accidentally get a negative number).
|
||||
if timeoutSec > 60 { |
||||
timeoutSec = 60 |
||||
} else if timeoutSec < 5 { |
||||
timeoutSec = 5 |
||||
} |
||||
|
||||
timeout := time.Duration(timeoutSec * float64(time.Second)) |
||||
ctx, cancel := context.WithTimeout(ctx, timeout) |
||||
defer cancel() |
||||
|
||||
chd := &controlhttp.Dialer{ |
||||
Hostname: nc.host, |
||||
HTTPPort: nc.httpPort, |
||||
HTTPSPort: cmp.Or(nc.httpsPort, controlhttp.NoPort), |
||||
MachineKey: nc.opts.PrivKey, |
||||
ControlKey: nc.opts.ServerPubKey, |
||||
ProtocolVersion: cmp.Or(nc.opts.ProtocolVersion, uint16(tailcfg.CurrentCapabilityVersion)), |
||||
Dialer: nc.opts.Dialer.SystemDial, |
||||
DNSCache: nc.opts.DNSCache, |
||||
DialPlan: dialPlan, |
||||
Logf: nc.logf, |
||||
NetMon: nc.opts.NetMon, |
||||
HealthTracker: nc.opts.HealthTracker, |
||||
Clock: tstime.StdClock{}, |
||||
} |
||||
clientConn, err := chd.Dial(ctx) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
ncc := NewConn(clientConn.Conn) |
||||
|
||||
nc.mu.Lock() |
||||
if nc.closed { |
||||
nc.mu.Unlock() |
||||
ncc.Close() // Needs to be called without holding the lock.
|
||||
return nil, errors.New("noise client closed") |
||||
} |
||||
defer nc.mu.Unlock() |
||||
return ncc, nil |
||||
} |
||||
|
||||
// post does a POST to the control server at the given path, JSON-encoding body.
|
||||
// The provided nodeKey is an optional load balancing hint.
|
||||
func (nc *Client) Post(ctx context.Context, path string, nodeKey key.NodePublic, body any) (*http.Response, error) { |
||||
return nc.DoWithBody(ctx, "POST", path, nodeKey, body) |
||||
} |
||||
|
||||
func (nc *Client) DoWithBody(ctx context.Context, method, path string, nodeKey key.NodePublic, body any) (*http.Response, error) { |
||||
jbody, err := json.Marshal(body) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
req, err := http.NewRequestWithContext(ctx, method, "https://"+nc.host+path, bytes.NewReader(jbody)) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
AddLBHeader(req, nodeKey) |
||||
req.Header.Set("Content-Type", "application/json") |
||||
return nc.Do(req) |
||||
} |
||||
|
||||
// AddLBHeader adds the load balancer header to req if nodeKey is non-zero.
|
||||
func AddLBHeader(req *http.Request, nodeKey key.NodePublic) { |
||||
if !nodeKey.IsZero() { |
||||
req.Header.Add(tailcfg.LBHeader, nodeKey.String()) |
||||
} |
||||
} |
||||
Loading…
Reference in new issue