-
Notifications
You must be signed in to change notification settings - Fork 4.6k
xds: add support for mTLS Credentials in xDS bootstrap #6757
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
b214d59
xds/internal/xdsclient: A65 - mTLS Credentials
atollena 114af39
feedback from Arvind
atollena fcac456
Merge branch 'master' into a65
atollena 85e4902
comments from easwars
atollena 1c1654b
reload both CA and certs on each handshake - add test for failing pro…
atollena c0c0804
address easwars comments
atollena f696ce2
Merge branch 'master' into a65
atollena ce57581
comments from easwar on bundle test
atollena 31df4f3
update tests based on easwars feedback
atollena e3a4724
fix more test formatting
atollena d958a21
Merge branch 'master' into a65
atollena 0053a94
fix flaky TestFailingProvider test
atollena 50ab88d
provider error test: use a fake provider instead of trying to close.
atollena 7c2cda2
add license
atollena 0d8263d
comments from easwar
atollena c995f8d
Merge branch 'master' into a65
atollena 1505f65
make returned bundle closeable
atollena 1ea8603
fix tests
atollena 8f3472e
generic xds client cleanups
atollena e694f4c
feedback from easwar:
atollena 01f8c82
latest review from easwar
atollena File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
arvindbr8 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,177 @@ | ||
| /* | ||
| * | ||
| * Copyright 2023 gRPC authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| // Package creds implements gRFC A65: mTLS Credentials in xDS Bootstrap File. | ||
| package creds | ||
easwars marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| import ( | ||
| "context" | ||
| "crypto/tls" | ||
| "encoding/json" | ||
| "fmt" | ||
| "net" | ||
| "sync" | ||
|
|
||
| "google.golang.org/grpc/credentials" | ||
| "google.golang.org/grpc/credentials/tls/certprovider" | ||
| _ "google.golang.org/grpc/credentials/tls/certprovider/pemfile" // for file_watcher provider | ||
| ) | ||
|
|
||
| type tlsBundle struct { | ||
arvindbr8 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| jd json.RawMessage | ||
| transportCredentials credentials.TransportCredentials | ||
| } | ||
|
|
||
| // NewTLS returns a credentials.Bundle which delegates certificate loading to | ||
| // a file_watcher provider for mTLS transport security. See gRFC A65. | ||
arvindbr8 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| func NewTLS(jd json.RawMessage) (credentials.Bundle, error) { | ||
| cfg := &struct { | ||
| CertificateFile string `json:"certificate_file"` | ||
| CACertificateFile string `json:"ca_certificate_file"` | ||
| PrivateKeyFile string `json:"private_key_file"` | ||
| }{} | ||
|
|
||
| tlsConfig := tls.Config{} | ||
| if err := json.Unmarshal(jd, cfg); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // We cannot simply always use a file_watcher provider because it behaves | ||
| // slightly differently from the xDS TLS config. Quoting A65: | ||
| // | ||
| // > The only difference between the file-watcher certificate provider | ||
| // > config and this one is that in the file-watcher certificate provider, | ||
| // > at least one of the "certificate_file" or "ca_certificate_file" fields | ||
| // > must be specified, whereas in this configuration, it is acceptable to | ||
| // > specify neither one. | ||
| // | ||
| // We only use a file_watcher provider if either one of them or both are | ||
| // specified. | ||
| if cfg.CACertificateFile != "" || cfg.CertificateFile != "" || cfg.PrivateKeyFile != "" { | ||
easwars marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| // file_watcher currently ignores BuildOptions, but we set them for good | ||
| // measure. | ||
| opts := certprovider.BuildOptions{} | ||
| if cfg.CACertificateFile != "" { | ||
| opts.WantRoot = true | ||
| } | ||
| if cfg.CertificateFile != "" { | ||
| opts.WantIdentity = true | ||
| } | ||
easwars marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| provider, err := certprovider.GetProvider("file_watcher", jd, opts) | ||
| if err != nil { | ||
| // GetProvider fails if jd is invalid, e.g. if only one of private | ||
| // key and certificate is specified. | ||
| return nil, fmt.Errorf("failed to get TLS provider: %w", err) | ||
easwars marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
| if cfg.CertificateFile != "" { | ||
| tlsConfig.GetClientCertificate = func(*tls.CertificateRequestInfo) (*tls.Certificate, error) { | ||
| // Client cert reloading for mTLS. | ||
| km, err := provider.KeyMaterial(context.Background()) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if len(km.Certs) != 1 { | ||
| return nil, fmt.Errorf("there should be exactly exactly one certificate") | ||
arvindbr8 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
| return &km.Certs[0], nil | ||
| } | ||
| if cfg.CACertificateFile == "" { | ||
| // no need for a callback to load the CA. Use the normal mTLS | ||
arvindbr8 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| // transport credentials. | ||
| return &tlsBundle{ | ||
| jd: jd, | ||
| transportCredentials: credentials.NewTLS(&tlsConfig), | ||
| }, nil | ||
| } | ||
| } | ||
| return &tlsBundle{ | ||
| jd: jd, | ||
| transportCredentials: &caReloadingClientTLSCreds{ | ||
| baseConfig: &tlsConfig, | ||
| provider: provider, | ||
| }, | ||
| }, nil | ||
| } | ||
|
|
||
| // None of certificate_file and ca_certificate_file are set. | ||
| // Use the system-wide root certs. | ||
| return &tlsBundle{ | ||
| jd: jd, | ||
| transportCredentials: credentials.NewTLS(&tlsConfig), | ||
| }, nil | ||
| } | ||
|
|
||
| func (t *tlsBundle) TransportCredentials() credentials.TransportCredentials { | ||
| return t.transportCredentials | ||
| } | ||
|
|
||
| func (t *tlsBundle) PerRPCCredentials() credentials.PerRPCCredentials { | ||
| // No per-RPC credentials in A65. | ||
arvindbr8 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| return nil | ||
| } | ||
|
|
||
| func (t *tlsBundle) NewWithMode(_ string) (credentials.Bundle, error) { | ||
easwars marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| return NewTLS(t.jd) | ||
easwars marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| // caReloadingClientTLSCreds is a client mTLS credentials.TransportCredentials | ||
| // that attempts to reload the server root certificate from its provider on | ||
| // every client handshake. This is needed because Go's tls.Config does not | ||
| // support reloading the root CAs. | ||
| type caReloadingClientTLSCreds struct { | ||
| mu sync.Mutex | ||
| provider certprovider.Provider | ||
| baseConfig *tls.Config | ||
easwars marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| func (c *caReloadingClientTLSCreds) ClientHandshake(ctx context.Context, authority string, rawConn net.Conn) (net.Conn, credentials.AuthInfo, error) { | ||
| km, err := c.provider.KeyMaterial(ctx) | ||
| if err != nil { | ||
| return nil, nil, err | ||
| } | ||
| c.mu.Lock() | ||
| if !km.Roots.Equal(c.baseConfig.RootCAs) { | ||
| // provider returned a different root CA. Update it. | ||
arvindbr8 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| c.baseConfig.RootCAs = km.Roots | ||
| } | ||
| c.mu.Unlock() | ||
| return credentials.NewTLS(c.baseConfig).ClientHandshake(ctx, authority, rawConn) | ||
easwars marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| func (c *caReloadingClientTLSCreds) Info() credentials.ProtocolInfo { | ||
| c.mu.Lock() | ||
| defer c.mu.Unlock() | ||
| return credentials.NewTLS(c.baseConfig).Info() | ||
| } | ||
|
|
||
| func (c *caReloadingClientTLSCreds) Clone() credentials.TransportCredentials { | ||
| c.mu.Lock() | ||
| defer c.mu.Unlock() | ||
| return &caReloadingClientTLSCreds{ | ||
| provider: c.provider, | ||
| baseConfig: c.baseConfig.Clone(), | ||
| } | ||
| } | ||
|
|
||
| func (c *caReloadingClientTLSCreds) OverrideServerName(_ string) error { | ||
| panic("cannot override server name for private xds tls credentials") | ||
| } | ||
|
|
||
| func (c *caReloadingClientTLSCreds) ServerHandshake(_ net.Conn) (net.Conn, credentials.AuthInfo, error) { | ||
| panic("server handshake for xds tls credentials, which are client only") | ||
arvindbr8 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.