mirror of
https://github.com/traefik/traefik.git
synced 2025-08-07 07:07:12 +02:00
Merge 282a2f7ac1
into c20802b07e
This commit is contained in:
commit
d2065fb94b
@ -364,6 +364,9 @@
|
|||||||
serverName = "foobar"
|
serverName = "foobar"
|
||||||
insecureSkipVerify = true
|
insecureSkipVerify = true
|
||||||
rootCAs = ["foobar", "foobar"]
|
rootCAs = ["foobar", "foobar"]
|
||||||
|
cipherSuites = ["foobar", "foobar"]
|
||||||
|
minVersion = "foobar"
|
||||||
|
maxVersion = "foobar"
|
||||||
maxIdleConnsPerHost = 42
|
maxIdleConnsPerHost = 42
|
||||||
disableHTTP2 = true
|
disableHTTP2 = true
|
||||||
peerCertURI = "foobar"
|
peerCertURI = "foobar"
|
||||||
@ -388,6 +391,9 @@
|
|||||||
serverName = "foobar"
|
serverName = "foobar"
|
||||||
insecureSkipVerify = true
|
insecureSkipVerify = true
|
||||||
rootCAs = ["foobar", "foobar"]
|
rootCAs = ["foobar", "foobar"]
|
||||||
|
cipherSuites = ["foobar", "foobar"]
|
||||||
|
minVersion = "foobar"
|
||||||
|
maxVersion = "foobar"
|
||||||
maxIdleConnsPerHost = 42
|
maxIdleConnsPerHost = 42
|
||||||
disableHTTP2 = true
|
disableHTTP2 = true
|
||||||
peerCertURI = "foobar"
|
peerCertURI = "foobar"
|
||||||
|
@ -426,6 +426,11 @@ http:
|
|||||||
keyFile: foobar
|
keyFile: foobar
|
||||||
- certFile: foobar
|
- certFile: foobar
|
||||||
keyFile: foobar
|
keyFile: foobar
|
||||||
|
cipherSuites:
|
||||||
|
- foobar
|
||||||
|
- foobar
|
||||||
|
minVersion: foobar
|
||||||
|
maxVersion: foobar
|
||||||
maxIdleConnsPerHost: 42
|
maxIdleConnsPerHost: 42
|
||||||
forwardingTimeouts:
|
forwardingTimeouts:
|
||||||
dialTimeout: 42s
|
dialTimeout: 42s
|
||||||
@ -451,6 +456,11 @@ http:
|
|||||||
keyFile: foobar
|
keyFile: foobar
|
||||||
- certFile: foobar
|
- certFile: foobar
|
||||||
keyFile: foobar
|
keyFile: foobar
|
||||||
|
cipherSuites:
|
||||||
|
- foobar
|
||||||
|
- foobar
|
||||||
|
minVersion: foobar
|
||||||
|
maxVersion: foobar
|
||||||
maxIdleConnsPerHost: 42
|
maxIdleConnsPerHost: 42
|
||||||
forwardingTimeouts:
|
forwardingTimeouts:
|
||||||
dialTimeout: 42s
|
dialTimeout: 42s
|
||||||
|
@ -2217,6 +2217,12 @@ spec:
|
|||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
type: array
|
type: array
|
||||||
|
cipherSuites:
|
||||||
|
description: CipherSuites defines a list of cipher to use to contact
|
||||||
|
the backend servers.
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
type: array
|
||||||
disableHTTP2:
|
disableHTTP2:
|
||||||
description: DisableHTTP2 disables HTTP/2 for connections with backend
|
description: DisableHTTP2 disables HTTP/2 for connections with backend
|
||||||
servers.
|
servers.
|
||||||
@ -2277,6 +2283,14 @@ spec:
|
|||||||
to keep per-host.
|
to keep per-host.
|
||||||
minimum: 0
|
minimum: 0
|
||||||
type: integer
|
type: integer
|
||||||
|
maxVersion:
|
||||||
|
description: MaxVersion defines TLS maximum version to use to contact
|
||||||
|
the backend servers.
|
||||||
|
type: string
|
||||||
|
minVersion:
|
||||||
|
description: MinVersion defines TLS minimum version to use to contact
|
||||||
|
the backend servers.
|
||||||
|
type: string
|
||||||
peerCertURI:
|
peerCertURI:
|
||||||
description: PeerCertURI defines the peer cert URI used to match against
|
description: PeerCertURI defines the peer cert URI used to match against
|
||||||
SAN URI during the peer certificate verification.
|
SAN URI during the peer certificate verification.
|
||||||
|
@ -237,6 +237,8 @@ THIS FILE MUST NOT BE EDITED BY HAND
|
|||||||
| `traefik/http/serversTransports/ServersTransport0/certificates/0/keyFile` | `foobar` |
|
| `traefik/http/serversTransports/ServersTransport0/certificates/0/keyFile` | `foobar` |
|
||||||
| `traefik/http/serversTransports/ServersTransport0/certificates/1/certFile` | `foobar` |
|
| `traefik/http/serversTransports/ServersTransport0/certificates/1/certFile` | `foobar` |
|
||||||
| `traefik/http/serversTransports/ServersTransport0/certificates/1/keyFile` | `foobar` |
|
| `traefik/http/serversTransports/ServersTransport0/certificates/1/keyFile` | `foobar` |
|
||||||
|
| `traefik/http/serversTransports/ServersTransport0/cipherSuites/0` | `foobar` |
|
||||||
|
| `traefik/http/serversTransports/ServersTransport0/cipherSuites/1` | `foobar` |
|
||||||
| `traefik/http/serversTransports/ServersTransport0/disableHTTP2` | `true` |
|
| `traefik/http/serversTransports/ServersTransport0/disableHTTP2` | `true` |
|
||||||
| `traefik/http/serversTransports/ServersTransport0/forwardingTimeouts/dialTimeout` | `42s` |
|
| `traefik/http/serversTransports/ServersTransport0/forwardingTimeouts/dialTimeout` | `42s` |
|
||||||
| `traefik/http/serversTransports/ServersTransport0/forwardingTimeouts/idleConnTimeout` | `42s` |
|
| `traefik/http/serversTransports/ServersTransport0/forwardingTimeouts/idleConnTimeout` | `42s` |
|
||||||
@ -245,6 +247,8 @@ THIS FILE MUST NOT BE EDITED BY HAND
|
|||||||
| `traefik/http/serversTransports/ServersTransport0/forwardingTimeouts/responseHeaderTimeout` | `42s` |
|
| `traefik/http/serversTransports/ServersTransport0/forwardingTimeouts/responseHeaderTimeout` | `42s` |
|
||||||
| `traefik/http/serversTransports/ServersTransport0/insecureSkipVerify` | `true` |
|
| `traefik/http/serversTransports/ServersTransport0/insecureSkipVerify` | `true` |
|
||||||
| `traefik/http/serversTransports/ServersTransport0/maxIdleConnsPerHost` | `42` |
|
| `traefik/http/serversTransports/ServersTransport0/maxIdleConnsPerHost` | `42` |
|
||||||
|
| `traefik/http/serversTransports/ServersTransport0/maxVersion` | `foobar` |
|
||||||
|
| `traefik/http/serversTransports/ServersTransport0/minVersion` | `foobar` |
|
||||||
| `traefik/http/serversTransports/ServersTransport0/peerCertURI` | `foobar` |
|
| `traefik/http/serversTransports/ServersTransport0/peerCertURI` | `foobar` |
|
||||||
| `traefik/http/serversTransports/ServersTransport0/rootCAs/0` | `foobar` |
|
| `traefik/http/serversTransports/ServersTransport0/rootCAs/0` | `foobar` |
|
||||||
| `traefik/http/serversTransports/ServersTransport0/rootCAs/1` | `foobar` |
|
| `traefik/http/serversTransports/ServersTransport0/rootCAs/1` | `foobar` |
|
||||||
@ -256,6 +260,8 @@ THIS FILE MUST NOT BE EDITED BY HAND
|
|||||||
| `traefik/http/serversTransports/ServersTransport1/certificates/0/keyFile` | `foobar` |
|
| `traefik/http/serversTransports/ServersTransport1/certificates/0/keyFile` | `foobar` |
|
||||||
| `traefik/http/serversTransports/ServersTransport1/certificates/1/certFile` | `foobar` |
|
| `traefik/http/serversTransports/ServersTransport1/certificates/1/certFile` | `foobar` |
|
||||||
| `traefik/http/serversTransports/ServersTransport1/certificates/1/keyFile` | `foobar` |
|
| `traefik/http/serversTransports/ServersTransport1/certificates/1/keyFile` | `foobar` |
|
||||||
|
| `traefik/http/serversTransports/ServersTransport1/cipherSuites/0` | `foobar` |
|
||||||
|
| `traefik/http/serversTransports/ServersTransport1/cipherSuites/1` | `foobar` |
|
||||||
| `traefik/http/serversTransports/ServersTransport1/disableHTTP2` | `true` |
|
| `traefik/http/serversTransports/ServersTransport1/disableHTTP2` | `true` |
|
||||||
| `traefik/http/serversTransports/ServersTransport1/forwardingTimeouts/dialTimeout` | `42s` |
|
| `traefik/http/serversTransports/ServersTransport1/forwardingTimeouts/dialTimeout` | `42s` |
|
||||||
| `traefik/http/serversTransports/ServersTransport1/forwardingTimeouts/idleConnTimeout` | `42s` |
|
| `traefik/http/serversTransports/ServersTransport1/forwardingTimeouts/idleConnTimeout` | `42s` |
|
||||||
@ -264,6 +270,8 @@ THIS FILE MUST NOT BE EDITED BY HAND
|
|||||||
| `traefik/http/serversTransports/ServersTransport1/forwardingTimeouts/responseHeaderTimeout` | `42s` |
|
| `traefik/http/serversTransports/ServersTransport1/forwardingTimeouts/responseHeaderTimeout` | `42s` |
|
||||||
| `traefik/http/serversTransports/ServersTransport1/insecureSkipVerify` | `true` |
|
| `traefik/http/serversTransports/ServersTransport1/insecureSkipVerify` | `true` |
|
||||||
| `traefik/http/serversTransports/ServersTransport1/maxIdleConnsPerHost` | `42` |
|
| `traefik/http/serversTransports/ServersTransport1/maxIdleConnsPerHost` | `42` |
|
||||||
|
| `traefik/http/serversTransports/ServersTransport1/maxVersion` | `foobar` |
|
||||||
|
| `traefik/http/serversTransports/ServersTransport1/minVersion` | `foobar` |
|
||||||
| `traefik/http/serversTransports/ServersTransport1/peerCertURI` | `foobar` |
|
| `traefik/http/serversTransports/ServersTransport1/peerCertURI` | `foobar` |
|
||||||
| `traefik/http/serversTransports/ServersTransport1/rootCAs/0` | `foobar` |
|
| `traefik/http/serversTransports/ServersTransport1/rootCAs/0` | `foobar` |
|
||||||
| `traefik/http/serversTransports/ServersTransport1/rootCAs/1` | `foobar` |
|
| `traefik/http/serversTransports/ServersTransport1/rootCAs/1` | `foobar` |
|
||||||
|
@ -49,6 +49,12 @@ spec:
|
|||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
type: array
|
type: array
|
||||||
|
cipherSuites:
|
||||||
|
description: CipherSuites defines a list of cipher to use to contact
|
||||||
|
the backend servers.
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
type: array
|
||||||
disableHTTP2:
|
disableHTTP2:
|
||||||
description: DisableHTTP2 disables HTTP/2 for connections with backend
|
description: DisableHTTP2 disables HTTP/2 for connections with backend
|
||||||
servers.
|
servers.
|
||||||
@ -109,6 +115,14 @@ spec:
|
|||||||
to keep per-host.
|
to keep per-host.
|
||||||
minimum: 0
|
minimum: 0
|
||||||
type: integer
|
type: integer
|
||||||
|
maxVersion:
|
||||||
|
description: MaxVersion defines TLS maximum version to use to contact
|
||||||
|
the backend servers.
|
||||||
|
type: string
|
||||||
|
minVersion:
|
||||||
|
description: MinVersion defines TLS minimum version to use to contact
|
||||||
|
the backend servers.
|
||||||
|
type: string
|
||||||
peerCertURI:
|
peerCertURI:
|
||||||
description: PeerCertURI defines the peer cert URI used to match against
|
description: PeerCertURI defines the peer cert URI used to match against
|
||||||
SAN URI during the peer certificate verification.
|
SAN URI during the peer certificate verification.
|
||||||
|
@ -35,6 +35,11 @@ http:
|
|||||||
- "spiffe://example.org/id1"
|
- "spiffe://example.org/id1"
|
||||||
- "spiffe://example.org/id2"
|
- "spiffe://example.org/id2"
|
||||||
trustDomain: "example.org"
|
trustDomain: "example.org"
|
||||||
|
cipherSuites:
|
||||||
|
- TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
|
||||||
|
- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
|
||||||
|
minVersion: VersionTLS12
|
||||||
|
maxVersion: VersionTLS12
|
||||||
```
|
```
|
||||||
|
|
||||||
```toml tab="Structured (TOML)"
|
```toml tab="Structured (TOML)"
|
||||||
@ -46,6 +51,9 @@ http:
|
|||||||
maxIdleConnsPerHost = 100
|
maxIdleConnsPerHost = 100
|
||||||
disableHTTP2 = true
|
disableHTTP2 = true
|
||||||
peerCertURI = "spiffe://example.org/peer"
|
peerCertURI = "spiffe://example.org/peer"
|
||||||
|
cipherSuites = ["TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256","TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"]
|
||||||
|
minVersion = "VersionTLS12"
|
||||||
|
maxVersion = "VersionTLS12"
|
||||||
|
|
||||||
[http.serversTransports.mytransport.forwardingTimeouts]
|
[http.serversTransports.mytransport.forwardingTimeouts]
|
||||||
dialTimeout = "30s"
|
dialTimeout = "30s"
|
||||||
@ -100,6 +108,9 @@ labels:
|
|||||||
| `certificates` | Defines the list of certificates (as file paths, or data bytes) that will be set as client certificates for mTLS. | [] | No |
|
| `certificates` | Defines the list of certificates (as file paths, or data bytes) that will be set as client certificates for mTLS. | [] | No |
|
||||||
| `insecureSkipVerify` | Controls whether the server's certificate chain and host name is verified. | false | No |
|
| `insecureSkipVerify` | Controls whether the server's certificate chain and host name is verified. | false | No |
|
||||||
| `rootcas` | Set of root certificate authorities to use when verifying server certificates. (for mTLS connections). | [] | No |
|
| `rootcas` | Set of root certificate authorities to use when verifying server certificates. (for mTLS connections). | [] | No |
|
||||||
|
| `cipherSuites` | Defines a list of cipher to use to contact the backend servers. | [] | No |
|
||||||
|
| `minVersion` | Defines a TLS minimum version to use to contact the backend servers. | "" | No |
|
||||||
|
| `maxVersion` | Defines a TLS maximum version to use to contact the backend servers. | "" | No |
|
||||||
| `maxIdleConnsPerHost` | Maximum idle (keep-alive) connections to keep per-host. | 200 | No |
|
| `maxIdleConnsPerHost` | Maximum idle (keep-alive) connections to keep per-host. | 200 | No |
|
||||||
| `disableHTTP2` | Disables HTTP/2 for connections with servers. | false | No |
|
| `disableHTTP2` | Disables HTTP/2 for connections with servers. | false | No |
|
||||||
| `peerCertURI` | Defines the URI used to match against SAN URIs during the server's certificate verification. | "" | No |
|
| `peerCertURI` | Defines the URI used to match against SAN URIs during the server's certificate verification. | "" | No |
|
||||||
|
@ -59,6 +59,9 @@ spec:
|
|||||||
| `serverstransport.`<br />`insecureSkipVerify` | Controls whether the server's certificate chain and host name is verified. | false | No |
|
| `serverstransport.`<br />`insecureSkipVerify` | Controls whether the server's certificate chain and host name is verified. | false | No |
|
||||||
| `serverstransport.`<br />`rootcas` | Set of root certificate authorities to use when verifying server certificates. (for mTLS connections). | | No |
|
| `serverstransport.`<br />`rootcas` | Set of root certificate authorities to use when verifying server certificates. (for mTLS connections). | | No |
|
||||||
| `serverstransport.`<br />`certificatesSecrets` | Certificates to present to the server for mTLS. | | No |
|
| `serverstransport.`<br />`certificatesSecrets` | Certificates to present to the server for mTLS. | | No |
|
||||||
|
| `serverstransport.`<br />`cipherSuites` | Defines a list of cipher to use to contact the backend servers. | [] | No |
|
||||||
|
| `serverstransport.`<br />`minVersion` | Defines a TLS minimum version to use to contact the backend servers. | "" | No |
|
||||||
|
| `serverstransport.`<br />`maxVersion` | Defines a TLS maximum version to use to contact the backend servers. | "" | No |
|
||||||
| `serverstransport.`<br />`maxIdleConnsPerHost` | Maximum idle (keep-alive) connections to keep per-host. | 200 | No |
|
| `serverstransport.`<br />`maxIdleConnsPerHost` | Maximum idle (keep-alive) connections to keep per-host. | 200 | No |
|
||||||
| `serverstransport.`<br />`disableHTTP2` | Disables HTTP/2 for connections with servers. | false | No |
|
| `serverstransport.`<br />`disableHTTP2` | Disables HTTP/2 for connections with servers. | false | No |
|
||||||
| `serverstransport.`<br />`peerCertURI` | Defines the URI used to match against SAN URIs during the server's certificate verification. | "" | No |
|
| `serverstransport.`<br />`peerCertURI` | Defines the URI used to match against SAN URIs during the server's certificate verification. | "" | No |
|
||||||
|
@ -1869,6 +1869,11 @@ Register the `TLSStore` kind in the Kubernetes cluster before creating `TLSStore
|
|||||||
- spiffe://trust-domain/id1
|
- spiffe://trust-domain/id1
|
||||||
- spiffe://trust-domain/id2
|
- spiffe://trust-domain/id2
|
||||||
trustDomain: "spiffe://trust-domain" # [14]
|
trustDomain: "spiffe://trust-domain" # [14]
|
||||||
|
cipherSuites: # [15]
|
||||||
|
- TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
|
||||||
|
- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
|
||||||
|
minVersion: VersionTLS11 # [16]
|
||||||
|
maxVersion: VersionTLS12 # [17]
|
||||||
```
|
```
|
||||||
|
|
||||||
| Ref | Attribute | Purpose |
|
| Ref | Attribute | Purpose |
|
||||||
@ -1887,6 +1892,9 @@ Register the `TLSStore` kind in the Kubernetes cluster before creating `TLSStore
|
|||||||
| [12] | `spiffe` | The spiffe configuration. |
|
| [12] | `spiffe` | The spiffe configuration. |
|
||||||
| [13] | `ids` | Defines the allowed SPIFFE IDs (takes precedence over the SPIFFE TrustDomain). |
|
| [13] | `ids` | Defines the allowed SPIFFE IDs (takes precedence over the SPIFFE TrustDomain). |
|
||||||
| [14] | `trustDomain` | Defines the allowed SPIFFE trust domain. |
|
| [14] | `trustDomain` | Defines the allowed SPIFFE trust domain. |
|
||||||
|
| [15] | `cipherSuites` | Defines a list of cipher to use to contact the backend servers. |
|
||||||
|
| [16] | `minVersion` | Defines TLS minimum version to use to contact the backend servers. |
|
||||||
|
| [17] | `maxVersion` | Defines TLS maximum version to use to contact the backend servers. |
|
||||||
|
|
||||||
!!! info "CA Secret"
|
!!! info "CA Secret"
|
||||||
|
|
||||||
|
@ -771,6 +771,100 @@ data:
|
|||||||
ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=
|
ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=
|
||||||
```
|
```
|
||||||
|
|
||||||
|
#### `cipherSuites`
|
||||||
|
|
||||||
|
_Optional_
|
||||||
|
|
||||||
|
`cipherSuites` defines a list of cipher to use to contact the backend servers.
|
||||||
|
|
||||||
|
```yaml tab="File (YAML)"
|
||||||
|
## Dynamic configuration
|
||||||
|
http:
|
||||||
|
serversTransports:
|
||||||
|
mytransport:
|
||||||
|
cipherSuites:
|
||||||
|
- TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
|
||||||
|
- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
|
||||||
|
```
|
||||||
|
|
||||||
|
```toml tab="File (TOML)"
|
||||||
|
## Dynamic configuration
|
||||||
|
[http.serversTransports.mytransport]
|
||||||
|
cipherSuites = ["TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256","TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"]
|
||||||
|
```
|
||||||
|
|
||||||
|
```yaml tab="Kubernetes"
|
||||||
|
apiVersion: traefik.io/v1alpha1
|
||||||
|
kind: ServersTransport
|
||||||
|
metadata:
|
||||||
|
name: mytransport
|
||||||
|
namespace: default
|
||||||
|
spec:
|
||||||
|
cipherSuites:
|
||||||
|
- TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
|
||||||
|
- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
|
||||||
|
```
|
||||||
|
|
||||||
|
#### `minVersion`
|
||||||
|
|
||||||
|
_Optional_
|
||||||
|
|
||||||
|
`minVersion` defines TLS minimum version to use to contact the backend servers.
|
||||||
|
|
||||||
|
```yaml tab="File (YAML)"
|
||||||
|
## Dynamic configuration
|
||||||
|
http:
|
||||||
|
serversTransports:
|
||||||
|
mytransport:
|
||||||
|
minVersion: VersionTLS12
|
||||||
|
```
|
||||||
|
|
||||||
|
```toml tab="File (TOML)"
|
||||||
|
## Dynamic configuration
|
||||||
|
[http.serversTransports.mytransport]
|
||||||
|
minVersion = "VersionTLS12"
|
||||||
|
```
|
||||||
|
|
||||||
|
```yaml tab="Kubernetes"
|
||||||
|
apiVersion: traefik.io/v1alpha1
|
||||||
|
kind: ServersTransport
|
||||||
|
metadata:
|
||||||
|
name: mytransport
|
||||||
|
namespace: default
|
||||||
|
spec:
|
||||||
|
minVersion: VersionTLS12
|
||||||
|
```
|
||||||
|
|
||||||
|
#### `maxVersion`
|
||||||
|
|
||||||
|
_Optional_
|
||||||
|
|
||||||
|
`maxVersion` defines TLS maximum version to use to contact the backend servers.
|
||||||
|
|
||||||
|
```yaml tab="File (YAML)"
|
||||||
|
## Dynamic configuration
|
||||||
|
http:
|
||||||
|
serversTransports:
|
||||||
|
mytransport:
|
||||||
|
maxVersion: VersionTLS12
|
||||||
|
```
|
||||||
|
|
||||||
|
```toml tab="File (TOML)"
|
||||||
|
## Dynamic configuration
|
||||||
|
[http.serversTransports.mytransport]
|
||||||
|
maxVersion = "VersionTLS12"
|
||||||
|
```
|
||||||
|
|
||||||
|
```yaml tab="Kubernetes"
|
||||||
|
apiVersion: traefik.io/v1alpha1
|
||||||
|
kind: ServersTransport
|
||||||
|
metadata:
|
||||||
|
name: mytransport
|
||||||
|
namespace: default
|
||||||
|
spec:
|
||||||
|
maxVersion: VersionTLS12
|
||||||
|
```
|
||||||
|
|
||||||
#### `maxIdleConnsPerHost`
|
#### `maxIdleConnsPerHost`
|
||||||
|
|
||||||
_Optional, Default=2_
|
_Optional, Default=2_
|
||||||
|
@ -2217,6 +2217,12 @@ spec:
|
|||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
type: array
|
type: array
|
||||||
|
cipherSuites:
|
||||||
|
description: CipherSuites defines a list of cipher to use to contact
|
||||||
|
the backend servers.
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
type: array
|
||||||
disableHTTP2:
|
disableHTTP2:
|
||||||
description: DisableHTTP2 disables HTTP/2 for connections with backend
|
description: DisableHTTP2 disables HTTP/2 for connections with backend
|
||||||
servers.
|
servers.
|
||||||
@ -2277,6 +2283,14 @@ spec:
|
|||||||
to keep per-host.
|
to keep per-host.
|
||||||
minimum: 0
|
minimum: 0
|
||||||
type: integer
|
type: integer
|
||||||
|
maxVersion:
|
||||||
|
description: MaxVersion defines TLS maximum version to use to contact
|
||||||
|
the backend servers.
|
||||||
|
type: string
|
||||||
|
minVersion:
|
||||||
|
description: MinVersion defines TLS minimum version to use to contact
|
||||||
|
the backend servers.
|
||||||
|
type: string
|
||||||
peerCertURI:
|
peerCertURI:
|
||||||
description: PeerCertURI defines the peer cert URI used to match against
|
description: PeerCertURI defines the peer cert URI used to match against
|
||||||
SAN URI during the peer certificate verification.
|
SAN URI during the peer certificate verification.
|
||||||
|
@ -347,6 +347,9 @@ type ServersTransport struct {
|
|||||||
InsecureSkipVerify bool `description:"Disables SSL certificate verification." json:"insecureSkipVerify,omitempty" toml:"insecureSkipVerify,omitempty" yaml:"insecureSkipVerify,omitempty" export:"true"`
|
InsecureSkipVerify bool `description:"Disables SSL certificate verification." json:"insecureSkipVerify,omitempty" toml:"insecureSkipVerify,omitempty" yaml:"insecureSkipVerify,omitempty" export:"true"`
|
||||||
RootCAs []types.FileOrContent `description:"Defines a list of CA certificates used to validate server certificates." json:"rootCAs,omitempty" toml:"rootCAs,omitempty" yaml:"rootCAs,omitempty"`
|
RootCAs []types.FileOrContent `description:"Defines a list of CA certificates used to validate server certificates." json:"rootCAs,omitempty" toml:"rootCAs,omitempty" yaml:"rootCAs,omitempty"`
|
||||||
Certificates traefiktls.Certificates `description:"Defines a list of client certificates for mTLS." json:"certificates,omitempty" toml:"certificates,omitempty" yaml:"certificates,omitempty" export:"true"`
|
Certificates traefiktls.Certificates `description:"Defines a list of client certificates for mTLS." json:"certificates,omitempty" toml:"certificates,omitempty" yaml:"certificates,omitempty" export:"true"`
|
||||||
|
CipherSuites []string `description:"Defines a list of cipher to use to contact the backend servers." json:"cipherSuites,omitempty" toml:"cipherSuites,omitempty" yaml:"cipherSuites,omitempty" export:"true"`
|
||||||
|
MinVersion string `description:"Defines a TLS minimum version to use to contact the backend servers." json:"minVersion,omitempty" toml:"minVersion,omitempty" yaml:"minVersion,omitempty" export:"true"`
|
||||||
|
MaxVersion string `description:"Defines a TLS maximum version to use to contact the backend servers." json:"maxVersion,omitempty" toml:"maxVersion,omitempty" yaml:"maxVersion,omitempty" export:"true"`
|
||||||
MaxIdleConnsPerHost int `description:"If non-zero, controls the maximum idle (keep-alive) to keep per-host. If zero, DefaultMaxIdleConnsPerHost is used" json:"maxIdleConnsPerHost,omitempty" toml:"maxIdleConnsPerHost,omitempty" yaml:"maxIdleConnsPerHost,omitempty" export:"true"`
|
MaxIdleConnsPerHost int `description:"If non-zero, controls the maximum idle (keep-alive) to keep per-host. If zero, DefaultMaxIdleConnsPerHost is used" json:"maxIdleConnsPerHost,omitempty" toml:"maxIdleConnsPerHost,omitempty" yaml:"maxIdleConnsPerHost,omitempty" export:"true"`
|
||||||
ForwardingTimeouts *ForwardingTimeouts `description:"Defines the timeouts for requests forwarded to the backend servers." json:"forwardingTimeouts,omitempty" toml:"forwardingTimeouts,omitempty" yaml:"forwardingTimeouts,omitempty" export:"true"`
|
ForwardingTimeouts *ForwardingTimeouts `description:"Defines the timeouts for requests forwarded to the backend servers." json:"forwardingTimeouts,omitempty" toml:"forwardingTimeouts,omitempty" yaml:"forwardingTimeouts,omitempty" export:"true"`
|
||||||
DisableHTTP2 bool `description:"Disables HTTP/2 for connections with backend servers." json:"disableHTTP2,omitempty" toml:"disableHTTP2,omitempty" yaml:"disableHTTP2,omitempty" export:"true"`
|
DisableHTTP2 bool `description:"Disables HTTP/2 for connections with backend servers." json:"disableHTTP2,omitempty" toml:"disableHTTP2,omitempty" yaml:"disableHTTP2,omitempty" export:"true"`
|
||||||
|
@ -1514,6 +1514,11 @@ func (in *ServersTransport) DeepCopyInto(out *ServersTransport) {
|
|||||||
*out = make(tls.Certificates, len(*in))
|
*out = make(tls.Certificates, len(*in))
|
||||||
copy(*out, *in)
|
copy(*out, *in)
|
||||||
}
|
}
|
||||||
|
if in.CipherSuites != nil {
|
||||||
|
in, out := &in.CipherSuites, &out.CipherSuites
|
||||||
|
*out = make([]string, len(*in))
|
||||||
|
copy(*out, *in)
|
||||||
|
}
|
||||||
if in.ForwardingTimeouts != nil {
|
if in.ForwardingTimeouts != nil {
|
||||||
in, out := &in.ForwardingTimeouts, &out.ForwardingTimeouts
|
in, out := &in.ForwardingTimeouts, &out.ForwardingTimeouts
|
||||||
*out = new(ForwardingTimeouts)
|
*out = new(ForwardingTimeouts)
|
||||||
|
@ -169,6 +169,11 @@ spec:
|
|||||||
- spiffe://foo/buz
|
- spiffe://foo/buz
|
||||||
- spiffe://bar/biz
|
- spiffe://bar/biz
|
||||||
trustDomain: spiffe://lol
|
trustDomain: spiffe://lol
|
||||||
|
cipherSuites:
|
||||||
|
- TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
|
||||||
|
- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
|
||||||
|
minVersion: VersionTLS11
|
||||||
|
maxVersion: VersionTLS12
|
||||||
|
|
||||||
---
|
---
|
||||||
apiVersion: traefik.io/v1alpha1
|
apiVersion: traefik.io/v1alpha1
|
||||||
|
@ -409,6 +409,39 @@ func (p *Provider) loadConfigurationFromCRD(ctx context.Context, client Client)
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sTransport := &dynamic.ServersTransport{}
|
||||||
|
if serversTransport.Spec.CipherSuites != nil {
|
||||||
|
for _, cipher := range serversTransport.Spec.CipherSuites {
|
||||||
|
if _, exists := tls.CipherSuites[cipher]; exists {
|
||||||
|
sTransport.CipherSuites = append(sTransport.CipherSuites, cipher)
|
||||||
|
} else {
|
||||||
|
// CipherSuite listed in the configuration does not exist in our list
|
||||||
|
logger.Error().Msgf("invalid CipherSuite: %s", cipher)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if serversTransport.Spec.MinVersion != "" {
|
||||||
|
if _, exists := tls.MinVersion[serversTransport.Spec.MinVersion]; exists {
|
||||||
|
sTransport.MinVersion = serversTransport.Spec.MinVersion
|
||||||
|
} else {
|
||||||
|
// Min TLS version does not exist
|
||||||
|
logger.Error().Msgf("invalid TLS minimal version: %s", serversTransport.Spec.MinVersion)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if serversTransport.Spec.MaxVersion != "" {
|
||||||
|
if _, exists := tls.MaxVersion[serversTransport.Spec.MaxVersion]; exists {
|
||||||
|
sTransport.MaxVersion = serversTransport.Spec.MaxVersion
|
||||||
|
} else {
|
||||||
|
// Min TLS version does not exist
|
||||||
|
logger.Error().Msgf("invalid TLS maximal version: %s", serversTransport.Spec.MaxVersion)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
forwardingTimeout := &dynamic.ForwardingTimeouts{}
|
forwardingTimeout := &dynamic.ForwardingTimeouts{}
|
||||||
forwardingTimeout.SetDefaults()
|
forwardingTimeout.SetDefaults()
|
||||||
|
|
||||||
@ -455,6 +488,9 @@ func (p *Provider) loadConfigurationFromCRD(ctx context.Context, client Client)
|
|||||||
InsecureSkipVerify: serversTransport.Spec.InsecureSkipVerify,
|
InsecureSkipVerify: serversTransport.Spec.InsecureSkipVerify,
|
||||||
RootCAs: rootCAs,
|
RootCAs: rootCAs,
|
||||||
Certificates: certs,
|
Certificates: certs,
|
||||||
|
CipherSuites: sTransport.CipherSuites,
|
||||||
|
MinVersion: sTransport.MinVersion,
|
||||||
|
MaxVersion: sTransport.MaxVersion,
|
||||||
DisableHTTP2: serversTransport.Spec.DisableHTTP2,
|
DisableHTTP2: serversTransport.Spec.DisableHTTP2,
|
||||||
MaxIdleConnsPerHost: serversTransport.Spec.MaxIdleConnsPerHost,
|
MaxIdleConnsPerHost: serversTransport.Spec.MaxIdleConnsPerHost,
|
||||||
ForwardingTimeouts: forwardingTimeout,
|
ForwardingTimeouts: forwardingTimeout,
|
||||||
|
@ -4745,6 +4745,9 @@ func TestLoadIngressRoutes(t *testing.T) {
|
|||||||
{CertFile: "TESTCERT2", KeyFile: "TESTKEY2"},
|
{CertFile: "TESTCERT2", KeyFile: "TESTKEY2"},
|
||||||
{CertFile: "TESTCERT3", KeyFile: "TESTKEY3"},
|
{CertFile: "TESTCERT3", KeyFile: "TESTKEY3"},
|
||||||
},
|
},
|
||||||
|
CipherSuites: []string{"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"},
|
||||||
|
MinVersion: "VersionTLS11",
|
||||||
|
MaxVersion: "VersionTLS12",
|
||||||
MaxIdleConnsPerHost: 42,
|
MaxIdleConnsPerHost: 42,
|
||||||
DisableHTTP2: true,
|
DisableHTTP2: true,
|
||||||
ForwardingTimeouts: &dynamic.ForwardingTimeouts{
|
ForwardingTimeouts: &dynamic.ForwardingTimeouts{
|
||||||
|
@ -38,6 +38,12 @@ type ServersTransportSpec struct {
|
|||||||
RootCAsSecrets []string `json:"rootCAsSecrets,omitempty"`
|
RootCAsSecrets []string `json:"rootCAsSecrets,omitempty"`
|
||||||
// CertificatesSecrets defines a list of secret storing client certificates for mTLS.
|
// CertificatesSecrets defines a list of secret storing client certificates for mTLS.
|
||||||
CertificatesSecrets []string `json:"certificatesSecrets,omitempty"`
|
CertificatesSecrets []string `json:"certificatesSecrets,omitempty"`
|
||||||
|
// CipherSuites defines a list of cipher to use to contact the backend servers.
|
||||||
|
CipherSuites []string `json:"cipherSuites,omitempty"`
|
||||||
|
// MinVersion defines TLS minimum version to use to contact the backend servers.
|
||||||
|
MinVersion string `json:"minVersion,omitempty"`
|
||||||
|
// MaxVersion defines TLS maximum version to use to contact the backend servers.
|
||||||
|
MaxVersion string `json:"maxVersion,omitempty"`
|
||||||
// MaxIdleConnsPerHost controls the maximum idle (keep-alive) to keep per-host.
|
// MaxIdleConnsPerHost controls the maximum idle (keep-alive) to keep per-host.
|
||||||
// +kubebuilder:validation:Minimum=0
|
// +kubebuilder:validation:Minimum=0
|
||||||
MaxIdleConnsPerHost int `json:"maxIdleConnsPerHost,omitempty"`
|
MaxIdleConnsPerHost int `json:"maxIdleConnsPerHost,omitempty"`
|
||||||
|
@ -1395,6 +1395,11 @@ func (in *ServersTransportSpec) DeepCopyInto(out *ServersTransportSpec) {
|
|||||||
*out = make([]string, len(*in))
|
*out = make([]string, len(*in))
|
||||||
copy(*out, *in)
|
copy(*out, *in)
|
||||||
}
|
}
|
||||||
|
if in.CipherSuites != nil {
|
||||||
|
in, out := &in.CipherSuites, &out.CipherSuites
|
||||||
|
*out = make([]string, len(*in))
|
||||||
|
copy(*out, *in)
|
||||||
|
}
|
||||||
if in.ForwardingTimeouts != nil {
|
if in.ForwardingTimeouts != nil {
|
||||||
in, out := &in.ForwardingTimeouts, &out.ForwardingTimeouts
|
in, out := &in.ForwardingTimeouts, &out.ForwardingTimeouts
|
||||||
*out = new(ForwardingTimeouts)
|
*out = new(ForwardingTimeouts)
|
||||||
|
@ -169,16 +169,54 @@ func (t *TransportManager) createTLSConfig(cfg *dynamic.ServersTransport) (*tls.
|
|||||||
config = tlsconfig.MTLSClientConfig(t.spiffeX509Source, t.spiffeX509Source, spiffeAuthorizer)
|
config = tlsconfig.MTLSClientConfig(t.spiffeX509Source, t.spiffeX509Source, spiffeAuthorizer)
|
||||||
}
|
}
|
||||||
|
|
||||||
if cfg.InsecureSkipVerify || len(cfg.RootCAs) > 0 || len(cfg.ServerName) > 0 || len(cfg.Certificates) > 0 || cfg.PeerCertURI != "" {
|
if cfg.InsecureSkipVerify || len(cfg.RootCAs) > 0 || len(cfg.ServerName) > 0 || len(cfg.Certificates) > 0 || cfg.PeerCertURI != "" || len(cfg.CipherSuites) > 0 || cfg.MaxVersion != "" || cfg.MinVersion != "" {
|
||||||
if config != nil {
|
if config != nil {
|
||||||
return nil, errors.New("TLS and SPIFFE configuration cannot be defined at the same time")
|
return nil, errors.New("TLS and SPIFFE configuration cannot be defined at the same time")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// map and validate the CipherSuite passed in the configuration
|
||||||
|
ciphersList := make([]uint16, 0)
|
||||||
|
if cfg.CipherSuites != nil {
|
||||||
|
for _, cipher := range cfg.CipherSuites {
|
||||||
|
if cipherID, exists := traefiktls.CipherSuites[cipher]; exists {
|
||||||
|
ciphersList = append(ciphersList, cipherID)
|
||||||
|
} else {
|
||||||
|
// CipherSuite listed in the configuration does not exist in our list
|
||||||
|
return nil, fmt.Errorf("invalid CipherSuite: %s", cipher)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set the min TLS version if set in the config
|
||||||
|
var minVer uint16
|
||||||
|
if cfg.MinVersion != "" {
|
||||||
|
if minConst, exists := traefiktls.MinVersion[cfg.MinVersion]; exists {
|
||||||
|
minVer = minConst
|
||||||
|
} else {
|
||||||
|
// Min TLS version does not exist
|
||||||
|
return nil, fmt.Errorf("invalid TLS minimal version: %v", minVer)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set the min TLS version if set in the config
|
||||||
|
var maxVer uint16
|
||||||
|
if cfg.MinVersion != "" {
|
||||||
|
if maxConst, exists := traefiktls.MaxVersion[cfg.MaxVersion]; exists {
|
||||||
|
maxVer = maxConst
|
||||||
|
} else {
|
||||||
|
// Max TLS version does not exist
|
||||||
|
return nil, fmt.Errorf("invalid TLS maximal version: %v", maxVer)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
config = &tls.Config{
|
config = &tls.Config{
|
||||||
ServerName: cfg.ServerName,
|
ServerName: cfg.ServerName,
|
||||||
InsecureSkipVerify: cfg.InsecureSkipVerify,
|
InsecureSkipVerify: cfg.InsecureSkipVerify,
|
||||||
RootCAs: createRootCACertPool(cfg.RootCAs),
|
RootCAs: createRootCACertPool(cfg.RootCAs),
|
||||||
Certificates: cfg.Certificates.GetCertificates(),
|
Certificates: cfg.Certificates.GetCertificates(),
|
||||||
|
CipherSuites: ciphersList,
|
||||||
|
MinVersion: minVer,
|
||||||
|
MaxVersion: maxVer,
|
||||||
}
|
}
|
||||||
|
|
||||||
if cfg.PeerCertURI != "" {
|
if cfg.PeerCertURI != "" {
|
||||||
|
@ -183,6 +183,47 @@ func TestKeepConnectionWhenSameConfiguration(t *testing.T) {
|
|||||||
assert.EqualValues(t, 2, count)
|
assert.EqualValues(t, 2, count)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestCipherSuites(t *testing.T) {
|
||||||
|
srv := httptest.NewUnstartedServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
|
||||||
|
rw.WriteHeader(http.StatusOK)
|
||||||
|
}))
|
||||||
|
|
||||||
|
cert, err := tls.X509KeyPair(LocalhostCert, LocalhostKey)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
srv.TLS = &tls.Config{
|
||||||
|
Certificates: []tls.Certificate{cert},
|
||||||
|
MaxVersion: tls.VersionTLS12,
|
||||||
|
CipherSuites: []uint16{
|
||||||
|
tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
srv.StartTLS()
|
||||||
|
|
||||||
|
transportManager := NewTransportManager(nil)
|
||||||
|
|
||||||
|
dynamicConf := map[string]*dynamic.ServersTransport{
|
||||||
|
"test": {
|
||||||
|
ServerName: "example.com",
|
||||||
|
RootCAs: []types.FileOrContent{types.FileOrContent(LocalhostCert)},
|
||||||
|
CipherSuites: []string{"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"},
|
||||||
|
MaxVersion: "VersionTLS12",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
transportManager.Update(dynamicConf)
|
||||||
|
|
||||||
|
tr, err := transportManager.GetRoundTripper("test")
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
client := http.Client{Transport: tr}
|
||||||
|
|
||||||
|
resp, err := client.Get(srv.URL)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
assert.Equal(t, http.StatusOK, resp.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
func TestMTLS(t *testing.T) {
|
func TestMTLS(t *testing.T) {
|
||||||
srv := httptest.NewUnstartedServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
|
srv := httptest.NewUnstartedServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
|
||||||
rw.WriteHeader(http.StatusOK)
|
rw.WriteHeader(http.StatusOK)
|
||||||
|
Loading…
Reference in New Issue
Block a user