Skip to content

Add support for mTLS #3136

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.

Sign up for GitHub

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

Open
miquelruiz wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −6
Open

Add support for mTLS #3136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,9 @@ type FlagsRemoteStore struct {
GRPCConnectionTimeout time.Duration `default:"3s" help:"The timeout duration for gRPC connection establishment."`
GRPCMaxConnectionRetries uint32 `default:"5" help:"The maximum number of retries to establish a gRPC connection."`
GRPCHeaders map[string]string `help:"Additional gRPC headers to send with each request (key=value pairs)."`

ClientCert string `help:"Client certificate for mTLS"`
ClientKey string `help:"Client key for mTLS"`
}

// FlagsDebuginfo contains flags to configure debuginfo.
Expand Down
28 changes: 22 additions & 6 deletions flags/grpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"crypto/tls"
"fmt"
"net/url"
"os"
"strings"
"time"
Expand Down Expand Up @@ -83,12 +84,27 @@ func (f FlagsRemoteStore) setupGrpcConnection(parent context.Context, metrics *g
if f.Insecure {
opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
} else {
opts = append(opts,
grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{
// Support only TLS1.3+ with valid CA certificates
MinVersion: tls.VersionTLS13,
InsecureSkipVerify: f.InsecureSkipVerify,
})))
tlsConfig := tls.Config{
// Support only TLS1.3+ with valid CA certificates
MinVersion: tls.VersionTLS13,
InsecureSkipVerify: f.InsecureSkipVerify,
}

if f.ClientKey != "" && f.ClientCert != "" {
cert, err := tls.LoadX509KeyPair(f.ClientCert, f.ClientKey)
if err != nil {
return nil, fmt.Errorf("failed to load client certificates: %w", err)
}
tlsConfig.Certificates = []tls.Certificate{cert}

url, err := url.Parse(f.Address)
if err != nil {
return nil, fmt.Errorf("couldn't parse address (%s): %w", f.Address, err)
}
tlsConfig.ServerName = url.Hostname()
}

opts = append(opts, grpc.WithTransportCredentials(credentials.NewTLS(&tlsConfig)))
}

// Auth
Expand Down