cmd/derper, derp, tailcfg: add admission controller URL option

So derpers can check an external URL for whether to permit access
to a certain public key.

Updates tailscale/corp#17693

Change-Id: I8594de58f54a08be3e2dbef8bcd1ff9b728ab297
Co-authored-by: Maisem Ali <maisem@tailscale.com>
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
pull/11194/head
Brad Fitzpatrick 9 months ago committed by Brad Fitzpatrick
parent 2988c1ec52
commit 10d130b845

@ -54,6 +54,8 @@ var (
bootstrapDNS = flag.String("bootstrap-dns-names", "", "optional comma-separated list of hostnames to make available at /bootstrap-dns") bootstrapDNS = flag.String("bootstrap-dns-names", "", "optional comma-separated list of hostnames to make available at /bootstrap-dns")
unpublishedDNS = flag.String("unpublished-bootstrap-dns-names", "", "optional comma-separated list of hostnames to make available at /bootstrap-dns and not publish in the list") unpublishedDNS = flag.String("unpublished-bootstrap-dns-names", "", "optional comma-separated list of hostnames to make available at /bootstrap-dns and not publish in the list")
verifyClients = flag.Bool("verify-clients", false, "verify clients to this DERP server through a local tailscaled instance.") verifyClients = flag.Bool("verify-clients", false, "verify clients to this DERP server through a local tailscaled instance.")
verifyClientURL = flag.String("verify-client-url", "", "if non-empty, an admission controller URL for permitting client connections; see tailcfg.DERPAdmitClientRequest")
verifyFailOpen = flag.Bool("verify-client-url-fail-open", true, "whether we fail open if --verify-client-url is unreachable")
acceptConnLimit = flag.Float64("accept-connection-limit", math.Inf(+1), "rate limit for accepting new connection") acceptConnLimit = flag.Float64("accept-connection-limit", math.Inf(+1), "rate limit for accepting new connection")
acceptConnBurst = flag.Int("accept-connection-burst", math.MaxInt, "burst limit for accepting new connection") acceptConnBurst = flag.Int("accept-connection-burst", math.MaxInt, "burst limit for accepting new connection")
@ -147,6 +149,8 @@ func main() {
s := derp.NewServer(cfg.PrivateKey, log.Printf) s := derp.NewServer(cfg.PrivateKey, log.Printf)
s.SetVerifyClient(*verifyClients) s.SetVerifyClient(*verifyClients)
s.SetVerifyClientURL(*verifyClientURL)
s.SetVerifyClientURLFailOpen(*verifyFailOpen)
if *meshPSKFile != "" { if *meshPSKFile != "" {
b, err := os.ReadFile(*meshPSKFile) b, err := os.ReadFile(*meshPSKFile)

@ -7,6 +7,7 @@ package derp
import ( import (
"bufio" "bufio"
"bytes"
"context" "context"
"crypto/ed25519" "crypto/ed25519"
crand "crypto/rand" crand "crypto/rand"
@ -40,6 +41,7 @@ import (
"tailscale.com/envknob" "tailscale.com/envknob"
"tailscale.com/metrics" "tailscale.com/metrics"
"tailscale.com/syncs" "tailscale.com/syncs"
"tailscale.com/tailcfg"
"tailscale.com/tstime" "tailscale.com/tstime"
"tailscale.com/tstime/rate" "tailscale.com/tstime/rate"
"tailscale.com/types/key" "tailscale.com/types/key"
@ -144,9 +146,13 @@ type Server struct {
avgQueueDuration *uint64 // In milliseconds; accessed atomically avgQueueDuration *uint64 // In milliseconds; accessed atomically
tcpRtt metrics.LabelMap // histogram tcpRtt metrics.LabelMap // histogram
// verifyClients only accepts client connections to the DERP server if the clientKey is a // verifyClientsLocalTailscaled only accepts client connections to the DERP
// known peer in the network, as specified by a running tailscaled's client's LocalAPI. // server if the clientKey is a known peer in the network, as specified by a
verifyClients bool // running tailscaled's client's LocalAPI.
verifyClientsLocalTailscaled bool
verifyClientsURL string
verifyClientsURLFailOpen bool
mu sync.Mutex mu sync.Mutex
closed bool closed bool
@ -353,7 +359,20 @@ func (s *Server) SetMeshKey(v string) {
// //
// It must be called before serving begins. // It must be called before serving begins.
func (s *Server) SetVerifyClient(v bool) { func (s *Server) SetVerifyClient(v bool) {
s.verifyClients = v s.verifyClientsLocalTailscaled = v
}
// SetVerifyClientURL sets the admission controller URL to use for verifying clients.
// If empty, all clients are accepted (unless restricted by SetVerifyClient checking
// against tailscaled).
func (s *Server) SetVerifyClientURL(v string) {
s.verifyClientsURL = v
}
// SetVerifyClientURLFailOpen sets whether to allow clients to connect if the
// admission controller URL is unreachable.
func (s *Server) SetVerifyClientURLFailOpen(v bool) {
s.verifyClientsURLFailOpen = v
} }
// HasMeshKey reports whether the server is configured with a mesh key. // HasMeshKey reports whether the server is configured with a mesh key.
@ -691,7 +710,9 @@ func (s *Server) accept(ctx context.Context, nc Conn, brw *bufio.ReadWriter, rem
if err != nil { if err != nil {
return fmt.Errorf("receive client key: %v", err) return fmt.Errorf("receive client key: %v", err)
} }
if err := s.verifyClient(ctx, clientKey, clientInfo); err != nil {
clientAP, _ := netip.ParseAddrPort(remoteAddr)
if err := s.verifyClient(ctx, clientKey, clientInfo, clientAP.Addr()); err != nil {
return fmt.Errorf("client %x rejected: %v", clientKey, err) return fmt.Errorf("client %x rejected: %v", clientKey, err)
} }
@ -1116,10 +1137,11 @@ func (c *sclient) requestMeshUpdate() {
} }
} }
func (s *Server) verifyClient(ctx context.Context, clientKey key.NodePublic, info *clientInfo) error { // verifyClient checks whether the client is allowed to connect to the derper,
if !s.verifyClients { // depending on how & whether the server's been configured to verify.
return nil func (s *Server) verifyClient(ctx context.Context, clientKey key.NodePublic, info *clientInfo, clientIP netip.Addr) error {
} // tailscaled-based verification:
if s.verifyClientsLocalTailscaled {
status, err := tailscale.Status(ctx) status, err := tailscale.Status(ctx)
if err != nil { if err != nil {
return fmt.Errorf("failed to query local tailscaled status: %w", err) return fmt.Errorf("failed to query local tailscaled status: %w", err)
@ -1130,7 +1152,45 @@ func (s *Server) verifyClient(ctx context.Context, clientKey key.NodePublic, inf
if _, exists := status.Peer[clientKey]; !exists { if _, exists := status.Peer[clientKey]; !exists {
return fmt.Errorf("client %v not in set of peers", clientKey) return fmt.Errorf("client %v not in set of peers", clientKey)
} }
}
// admission controller-based verification:
if s.verifyClientsURL != "" {
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel()
jreq, err := json.Marshal(&tailcfg.DERPAdmitClientRequest{
NodePublic: clientKey,
Source: clientIP,
})
if err != nil {
return err
}
req, err := http.NewRequestWithContext(ctx, "POST", s.verifyClientsURL, bytes.NewReader(jreq))
if err != nil {
return err
}
res, err := http.DefaultClient.Do(req)
if err != nil {
if s.verifyClientsURLFailOpen {
s.logf("admission controller unreachable; allowing client %v", clientKey)
return nil
}
return err
}
defer res.Body.Close()
if res.StatusCode != 200 {
return fmt.Errorf("admission controller: %v", res.Status)
}
var jres tailcfg.DERPAdmitClientResponse
if err := json.NewDecoder(io.LimitReader(res.Body, 4<<10)).Decode(&jres); err != nil {
return err
}
if !jres.Allow {
return fmt.Errorf("admission controller: %v/%v not allowed", clientKey, clientIP)
}
// TODO(bradfitz): add policy for configurable bandwidth rate per client? // TODO(bradfitz): add policy for configurable bandwidth rate per client?
}
return nil return nil
} }

@ -3,7 +3,12 @@
package tailcfg package tailcfg
import "sort" import (
"net/netip"
"sort"
"tailscale.com/types/key"
)
// DERPMap describes the set of DERP packet relay servers that are available. // DERPMap describes the set of DERP packet relay servers that are available.
type DERPMap struct { type DERPMap struct {
@ -176,3 +181,17 @@ type DERPNode struct {
// DotInvalid is a fake DNS TLD used in tests for an invalid hostname. // DotInvalid is a fake DNS TLD used in tests for an invalid hostname.
const DotInvalid = ".invalid" const DotInvalid = ".invalid"
// DERPAdmitClientRequest is the JSON request body of a POST to derper's
// --verify-client-url admission controller URL.
type DERPAdmitClientRequest struct {
NodePublic key.NodePublic // key to query for admission
Source netip.Addr // derp client's IP address
}
// DERPAdmitClientResponse is the response to a DERPAdmitClientRequest.
type DERPAdmitClientResponse struct {
Allow bool // whether to permit client
// TODO(bradfitz,maisem): bandwidth limits, etc?
}

Loading…
Cancel
Save