mirror of https://github.com/docker/cli.git
Merge pull request #3218 from thaJeztah/deprecate_encrypted_tls
context: deprecate support for encrypted TLS private keys
This commit is contained in:
commit
e879f1aea7
|
@ -255,7 +255,7 @@ func (cli *DockerCli) Initialize(opts *cliflags.ClientOptions, ops ...Initialize
|
||||||
if tlsconfig.IsErrEncryptedKey(err) {
|
if tlsconfig.IsErrEncryptedKey(err) {
|
||||||
passRetriever := passphrase.PromptRetrieverWithInOut(cli.In(), cli.Out(), nil)
|
passRetriever := passphrase.PromptRetrieverWithInOut(cli.In(), cli.Out(), nil)
|
||||||
newClient := func(password string) (client.APIClient, error) {
|
newClient := func(password string) (client.APIClient, error) {
|
||||||
cli.dockerEndpoint.TLSPassword = password
|
cli.dockerEndpoint.TLSPassword = password //nolint: staticcheck // SA1019: cli.dockerEndpoint.TLSPassword is deprecated
|
||||||
return newAPIClientFromEndpoint(cli.dockerEndpoint, cli.configFile)
|
return newAPIClientFromEndpoint(cli.dockerEndpoint, cli.configFile)
|
||||||
}
|
}
|
||||||
cli.client, err = getClientWithPassword(passRetriever, newClient)
|
cli.client, err = getClientWithPassword(passRetriever, newClient)
|
||||||
|
|
|
@ -27,6 +27,11 @@ type EndpointMeta = context.EndpointMetaBase
|
||||||
type Endpoint struct {
|
type Endpoint struct {
|
||||||
EndpointMeta
|
EndpointMeta
|
||||||
TLSData *context.TLSData
|
TLSData *context.TLSData
|
||||||
|
|
||||||
|
// Deprecated: Use of encrypted TLS private keys has been deprecated, and
|
||||||
|
// will be removed in a future release. Golang has deprecated support for
|
||||||
|
// legacy PEM encryption (as specified in RFC 1423), as it is insecure by
|
||||||
|
// design (see https://go-review.googlesource.com/c/go/+/264159).
|
||||||
TLSPassword string
|
TLSPassword string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -50,6 +50,7 @@ The table below provides an overview of the current status of deprecated feature
|
||||||
|
|
||||||
Status | Feature | Deprecated | Remove
|
Status | Feature | Deprecated | Remove
|
||||||
-----------|------------------------------------------------------------------------------------------------------------------------------------|------------|------------
|
-----------|------------------------------------------------------------------------------------------------------------------------------------|------------|------------
|
||||||
|
Deprecated | [Support for encrypted TLS private keys](#support-for-encrypted-tls-private-keys) | v20.10 | -
|
||||||
Deprecated | [Kubernetes stack and context support](#kubernetes-stack-and-context-support) | v20.10 | -
|
Deprecated | [Kubernetes stack and context support](#kubernetes-stack-and-context-support) | v20.10 | -
|
||||||
Deprecated | [Pulling images from non-compliant image registries](#pulling-images-from-non-compliant-image-registries) | v20.10 | -
|
Deprecated | [Pulling images from non-compliant image registries](#pulling-images-from-non-compliant-image-registries) | v20.10 | -
|
||||||
Deprecated | [Linux containers on Windows (LCOW)](#linux-containers-on-windows-lcow-experimental) | v20.10 | -
|
Deprecated | [Linux containers on Windows (LCOW)](#linux-containers-on-windows-lcow-experimental) | v20.10 | -
|
||||||
|
@ -98,6 +99,15 @@ Removed | [`--api-enable-cors` flag on `dockerd`](#--api-enable-cors-flag-on-
|
||||||
Removed | [`--run` flag on `docker commit`](#--run-flag-on-docker-commit) | v0.10 | v1.13
|
Removed | [`--run` flag on `docker commit`](#--run-flag-on-docker-commit) | v0.10 | v1.13
|
||||||
Removed | [Three arguments form in `docker import`](#three-arguments-form-in-docker-import) | v0.6.7 | v1.12
|
Removed | [Three arguments form in `docker import`](#three-arguments-form-in-docker-import) | v0.6.7 | v1.12
|
||||||
|
|
||||||
|
### Support for encrypted TLS private keys
|
||||||
|
|
||||||
|
**Deprecated in Release: v20.10**
|
||||||
|
|
||||||
|
Use of encrypted TLS private keys has been deprecated, and will be removed in a
|
||||||
|
future release. Golang has deprecated support for legacy PEM encryption (as
|
||||||
|
specified in [RFC 1423](https://datatracker.ietf.org/doc/html/rfc1423)), as it
|
||||||
|
is insecure by design (see [https://go-review.googlesource.com/c/go/+/264159](https://go-review.googlesource.com/c/go/+/264159)).
|
||||||
|
|
||||||
### Kubernetes stack and context support
|
### Kubernetes stack and context support
|
||||||
|
|
||||||
**Deprecated in Release: v20.10**
|
**Deprecated in Release: v20.10**
|
||||||
|
|
Loading…
Reference in New Issue