-
Notifications
You must be signed in to change notification settings - Fork 9
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
COCOS-160 - Enable mTLS when using aTLS #172
Open
smithjilks
wants to merge
7
commits into
ultravioletrs:main
Choose a base branch
from
smithjilks:cocos-160
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
4b8582f
Enable mTLS when using aTLS
smithjilks 805fc1b
Update go mod
smithjilks dfb33f2
Remove logging of tls/mtls cert info.
smithjilks e707409
Update connect.go and grpc.go
smithjilks 9d20823
Update go mod
smithjilks 1d45473
Fix grpc.go
smithjilks e8cd004
Update grpc.go
smithjilks 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 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 |
---|---|---|
|
@@ -18,6 +18,7 @@ import ( | |
"math/big" | ||
"net" | ||
"os" | ||
"strings" | ||
"time" | ||
|
||
"github.com/google/go-sev-guest/client" | ||
|
@@ -92,7 +93,7 @@ func (s *Server) Start() error { | |
creds := grpc.Creds(insecure.NewCredentials()) | ||
|
||
switch { | ||
case s.Config.AttestedTLS: | ||
case s.Config.AttestedTLS && (s.Config.ClientCAFile != "" || s.Config.ServerCAFile != ""): | ||
certificateBytes, privateKeyBytes, err := generateCertificatesForATLS(s.quoteProvider) | ||
if err != nil { | ||
return fmt.Errorf("failed to create certificate: %w", err) | ||
|
@@ -103,25 +104,11 @@ func (s *Server) Start() error { | |
return fmt.Errorf("falied due to invalid key pair: %w", err) | ||
} | ||
|
||
tlsConfig := &tls.Config{ | ||
ClientAuth: tls.NoClientCert, | ||
Certificates: []tls.Certificate{certificate}, | ||
} | ||
|
||
creds = grpc.Creds(credentials.NewTLS(tlsConfig)) | ||
s.Logger.Info(fmt.Sprintf("%s service gRPC server listening at %s with Attested TLS", s.Name, s.Address)) | ||
case s.Config.CertFile != "" || s.Config.KeyFile != "": | ||
certificate, err := loadX509KeyPair(s.Config.CertFile, s.Config.KeyFile) | ||
if err != nil { | ||
return fmt.Errorf("failed to load auth certificates: %w", err) | ||
} | ||
tlsConfig := &tls.Config{ | ||
ClientAuth: tls.RequireAndVerifyClientCert, | ||
Certificates: []tls.Certificate{certificate}, | ||
} | ||
|
||
var mtlsCA string | ||
// Loading Server CA file | ||
rootCA, err := loadCertFile(s.Config.ServerCAFile) | ||
if err != nil { | ||
return fmt.Errorf("failed to load root ca file: %w", err) | ||
|
@@ -133,7 +120,6 @@ func (s *Server) Start() error { | |
if !tlsConfig.RootCAs.AppendCertsFromPEM(rootCA) { | ||
return fmt.Errorf("failed to append root ca to tls.Config") | ||
} | ||
mtlsCA = fmt.Sprintf("root ca %s", s.Config.ServerCAFile) | ||
} | ||
|
||
// Loading Client CA File | ||
|
@@ -148,15 +134,41 @@ func (s *Server) Start() error { | |
if !tlsConfig.ClientCAs.AppendCertsFromPEM(clientCA) { | ||
return fmt.Errorf("failed to append client ca to tls.Config") | ||
} | ||
mtlsCA = fmt.Sprintf("%s client ca %s", mtlsCA, s.Config.ClientCAFile) | ||
} | ||
|
||
if err != nil { | ||
return err | ||
} | ||
|
||
tlsConfig.Certificates = append(tlsConfig.Certificates, certificate) | ||
creds = grpc.Creds(credentials.NewTLS(tlsConfig)) | ||
switch { | ||
case mtlsCA != "": | ||
s.Logger.Info(fmt.Sprintf("%s service gRPC server listening at %s with TLS/mTLS cert %s , key %s and %s", s.Name, s.Address, s.Config.CertFile, s.Config.KeyFile, mtlsCA)) | ||
default: | ||
s.Logger.Info(fmt.Sprintf("%s service gRPC server listening at %s with TLS cert %s and key %s", s.Name, s.Address, s.Config.CertFile, s.Config.KeyFile)) | ||
s.Logger.Info(fmt.Sprintf("%s service gRPC server listening at %s with Attested TLS", s.Name, s.Address)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. distinguish this with line 163 |
||
|
||
case s.Config.AttestedTLS: | ||
certificateBytes, privateKeyBytes, err := generateCertificatesForATLS(s.quoteProvider) | ||
if err != nil { | ||
return fmt.Errorf("failed to create certificate: %w", err) | ||
} | ||
|
||
certificate, err := tls.X509KeyPair(certificateBytes, privateKeyBytes) | ||
if err != nil { | ||
return fmt.Errorf("falied due to invalid key pair: %w", err) | ||
} | ||
|
||
tlsConfig := &tls.Config{ | ||
ClientAuth: tls.NoClientCert, | ||
Certificates: []tls.Certificate{certificate}, | ||
} | ||
|
||
creds = grpc.Creds(credentials.NewTLS(tlsConfig)) | ||
s.Logger.Info(fmt.Sprintf("%s service gRPC server listening at %s with Attested TLS", s.Name, s.Address)) | ||
case s.Config.CertFile != "" && s.Config.KeyFile != "": | ||
tlsConfig, err := s.setupTLSConfig() | ||
if err != nil { | ||
return err | ||
} | ||
creds = grpc.Creds(credentials.NewTLS(tlsConfig)) | ||
|
||
default: | ||
s.Logger.Info(fmt.Sprintf("%s service gRPC server listening at %s without TLS", s.Name, s.Address)) | ||
} | ||
|
@@ -196,35 +208,39 @@ func (s *Server) Stop() error { | |
} | ||
|
||
func loadCertFile(certFile string) ([]byte, error) { | ||
if certFile != "" { | ||
return os.ReadFile(certFile) | ||
if len(certFile) < 1000 && !strings.Contains(certFile, "\n") { | ||
data, err := os.ReadFile(certFile) | ||
if err == nil { | ||
return data, nil | ||
} | ||
} | ||
return []byte{}, nil | ||
return []byte(certFile), nil | ||
} | ||
|
||
func loadX509KeyPair(certfile, keyfile string) (tls.Certificate, error) { | ||
func loadX509KeyPair(certFile, keyFile string) (tls.Certificate, error) { | ||
var cert, key []byte | ||
var err error | ||
if _, err = os.Stat(certfile); err == nil { | ||
cert, err = os.ReadFile(certfile) | ||
if err != nil { | ||
return tls.Certificate{}, err | ||
|
||
readFileOrData := func(input string) ([]byte, error) { | ||
if len(input) < 1000 && !strings.Contains(input, "\n") { | ||
data, err := os.ReadFile(input) | ||
if err == nil { | ||
return data, nil | ||
} | ||
} | ||
} else if os.IsNotExist(err) { | ||
cert = []byte(certfile) | ||
} else { | ||
return tls.Certificate{}, err | ||
return []byte(input), nil | ||
} | ||
if _, err := os.Stat(keyfile); err == nil { | ||
key, err = os.ReadFile(keyfile) | ||
if err != nil { | ||
return tls.Certificate{}, err | ||
} | ||
} else if os.IsNotExist(err) { | ||
key = []byte(keyfile) | ||
} else { | ||
return tls.Certificate{}, err | ||
|
||
cert, err = readFileOrData(certFile) | ||
if err != nil { | ||
return tls.Certificate{}, fmt.Errorf("failed to read cert: %v", err) | ||
} | ||
|
||
key, err = readFileOrData(keyFile) | ||
if err != nil { | ||
return tls.Certificate{}, fmt.Errorf("failed to read key: %v", err) | ||
} | ||
|
||
return tls.X509KeyPair(cert, key) | ||
} | ||
|
||
|
@@ -292,3 +308,53 @@ func generateCertificatesForATLS(qp client.QuoteProvider) ([]byte, []byte, error | |
|
||
return certBytes, keyBytes, nil | ||
} | ||
|
||
func (s *Server) setupTLSConfig() (*tls.Config, error) { | ||
certificate, err := loadX509KeyPair(s.Config.CertFile, s.Config.KeyFile) | ||
if err != nil { | ||
return &tls.Config{}, fmt.Errorf("failed to load auth certificates: %w", err) | ||
} | ||
tlsConfig := &tls.Config{ | ||
ClientAuth: tls.RequireAndVerifyClientCert, | ||
Certificates: []tls.Certificate{certificate}, | ||
} | ||
|
||
var mtlsCA string | ||
// Loading Server CA file | ||
rootCA, err := loadCertFile(s.Config.ServerCAFile) | ||
if err != nil { | ||
return &tls.Config{}, fmt.Errorf("failed to load root ca file: %w", err) | ||
} | ||
if len(rootCA) > 0 { | ||
if tlsConfig.RootCAs == nil { | ||
tlsConfig.RootCAs = x509.NewCertPool() | ||
} | ||
if !tlsConfig.RootCAs.AppendCertsFromPEM(rootCA) { | ||
return &tls.Config{}, fmt.Errorf("failed to append root ca to tls.Config") | ||
} | ||
mtlsCA = fmt.Sprintf("root ca %s", s.Config.ServerCAFile) | ||
} | ||
|
||
// Loading Client CA File | ||
clientCA, err := loadCertFile(s.Config.ClientCAFile) | ||
if err != nil { | ||
return &tls.Config{}, fmt.Errorf("failed to load client ca file: %w", err) | ||
} | ||
if len(clientCA) > 0 { | ||
if tlsConfig.ClientCAs == nil { | ||
tlsConfig.ClientCAs = x509.NewCertPool() | ||
} | ||
if !tlsConfig.ClientCAs.AppendCertsFromPEM(clientCA) { | ||
return &tls.Config{}, fmt.Errorf("failed to append client ca to tls.Config") | ||
} | ||
mtlsCA = fmt.Sprintf("%s client ca %s", mtlsCA, s.Config.ClientCAFile) | ||
} | ||
switch { | ||
case mtlsCA != "": | ||
s.Logger.Info(fmt.Sprintf("%s service gRPC server listening at %s with TLS/mTLS", s.Name, s.Address)) | ||
default: | ||
s.Logger.Info(fmt.Sprintf("%s service gRPC server listening at %s with TLS", s.Name, s.Address)) | ||
} | ||
|
||
return tlsConfig, nil | ||
} |
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what is the purpose of this error check