mirror of
https://github.com/docker/cli.git
synced 2026-11-06 13:10:41 -04:00
Sebastiaan van Stijn
b9a052a987
Changes: - raise minimum supported Go version to go1.23 - sockets: `ConfigureTransport`: prevent idle connections leaking FDs. - sockets: implement `WithAdditionalUsersAndGroups` for windows. - tlsconfig: add ChaCha20-Poly1305 cipher suites to align closer with stdlib defaults. - nat: SortPortMap: accept `map[Port][]PortBinding` as argument. - nat: add benchmarks, optimize, and improve errors. - proxy: check for `net.ErrClosed` instead of string-matching "use of closed network connection". Breaking changes: - tlsconfig: deprecate `tlsconfig.SystemCertPool` in favor of stdlib `x509.SystemCertPool`. - sockets: remove deprecated `DialPipe`, `GetProxyEnv`, `DialerFromEnvironment` Dependency updates: - update github.com/Microsoft/go-winio to go v0.6.2 - update golang.org/x/sys to v0.10.0 full diff: https://github.com/docker/go-connections/compare/v0.6.0...v0.7.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
67 lines
2.0 KiB
Go
67 lines
2.0 KiB
Go
// Package sockets provides helper functions to create and configure Unix or TCP sockets.
|
|
package sockets
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"net"
|
|
"net/http"
|
|
"syscall"
|
|
"time"
|
|
)
|
|
|
|
const (
|
|
defaultTimeout = 10 * time.Second
|
|
maxUnixSocketPathSize = len(syscall.RawSockaddrUnix{}.Path)
|
|
)
|
|
|
|
// ErrProtocolNotAvailable is returned when a given transport protocol is not provided by the operating system.
|
|
var ErrProtocolNotAvailable = errors.New("protocol not available")
|
|
|
|
// ConfigureTransport configures the specified [http.Transport] according to the specified proto
|
|
// and addr.
|
|
//
|
|
// If the proto is unix (using a unix socket to communicate) or npipe the compression is disabled.
|
|
// For other protos, compression is enabled. If you want to manually enable/disable compression,
|
|
// make sure you do it _after_ any subsequent calls to ConfigureTransport is made against the same
|
|
// [http.Transport].
|
|
func ConfigureTransport(tr *http.Transport, proto, addr string) error {
|
|
if tr.MaxIdleConns == 0 {
|
|
// prevent long-lived processes from leaking connections
|
|
// due to idle connections not being released.
|
|
//
|
|
// TODO: see if we can also address this from the server side; see: https://github.com/moby/moby/issues/45539
|
|
tr.MaxIdleConns = 6
|
|
tr.IdleConnTimeout = 30 * time.Second
|
|
}
|
|
switch proto {
|
|
case "unix":
|
|
return configureUnixTransport(tr, addr)
|
|
case "npipe":
|
|
return configureNpipeTransport(tr, addr)
|
|
default:
|
|
tr.Proxy = http.ProxyFromEnvironment
|
|
tr.DisableCompression = false
|
|
tr.DialContext = (&net.Dialer{
|
|
Timeout: defaultTimeout,
|
|
}).DialContext
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func configureUnixTransport(tr *http.Transport, addr string) error {
|
|
if len(addr) > maxUnixSocketPathSize {
|
|
return fmt.Errorf("unix socket path %q is too long", addr)
|
|
}
|
|
// No need for compression in local communications.
|
|
tr.DisableCompression = true
|
|
dialer := &net.Dialer{
|
|
Timeout: defaultTimeout,
|
|
}
|
|
tr.DialContext = func(ctx context.Context, _, _ string) (net.Conn, error) {
|
|
return dialer.DialContext(ctx, "unix", addr)
|
|
}
|
|
return nil
|
|
}
|