Skip to content
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

Jump to bottom

Add cli tls support #5027

Merged
merged 5 commits into from
Nov 29, 2022
Merged

Add cli tls support #5027

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
977f6d3
introduce tls cert flag to CLI frontend, add logic for building tls C…
charlese-instaclustr Nov 16, 2022
76e6d34
Merge branch 'uber:master' into add-cli-tls-support
charlese-instaclustr Nov 17, 2022
07f682b
remove explicit default value for cert flag for style consistency
charlese-instaclustr Nov 19, 2022
3e52a37
Merge branch 'master' into add-cli-tls-support
shijiesheng Nov 28, 2022
0349370
Merge branch 'master' into add-cli-tls-support
davidporter-id-au Nov 29, 2022
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
5 changes: 5 additions & 0 deletions tools/cli/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ func NewCliApp() *cli.App {
Usage: "optional argument for transport protocol format, either 'grpc' or 'tchannel'. Defaults to tchannel if not provided",
EnvVar: "CADENCE_CLI_TRANSPORT_PROTOCOL",
},
cli.StringFlag{
Name: FlagTLSCertPathWithAlias,
Usage: "optional argument for path to TLS certificate. Defaults to an empty string if not provided",
EnvVar: "CADENCE_CLI_TLS_CERT_PATH",
},
}
app.Commands = []cli.Command{
{
Expand Down
33 changes: 30 additions & 3 deletions tools/cli/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,22 @@ import (
"context"
"time"

"go.uber.org/yarpc/peer"
"go.uber.org/yarpc/peer/hostport"
"go.uber.org/yarpc/transport/grpc"
"go.uber.org/yarpc/transport/tchannel"
"google.golang.org/grpc/credentials"

"github.com/olivere/elastic"
"github.com/urfave/cli"
"go.uber.org/yarpc"
"go.uber.org/yarpc/api/transport"
"go.uber.org/zap"

"crypto/tls"
"crypto/x509"
"io/ioutil"

adminv1 "github.com/uber/cadence-idl/go/proto/admin/v1"
apiv1 "github.com/uber/cadence-idl/go/proto/api/v1"
serverAdmin "github.com/uber/cadence/.gen/go/admin/adminserviceclient"
Expand Down Expand Up @@ -152,9 +159,29 @@ func (b *clientFactory) ensureDispatcher(c *cli.Context) {
if addr := c.GlobalString(FlagAddress); addr != "" {
b.hostPort = addr
}

outbounds := transport.Outbounds{Unary: grpc.NewTransport().NewSingleOutbound(b.hostPort)}
if !shouldUseGrpc {
var outbounds transport.Outbounds
if shouldUseGrpc {
grpcTransport := grpc.NewTransport()
outbounds = transport.Outbounds{Unary: grpc.NewTransport().NewSingleOutbound(b.hostPort)}

tlsCertificatePath := c.GlobalString(FlagTLSCertPath)
if tlsCertificatePath != "" {
caCert, err := ioutil.ReadFile(tlsCertificatePath)
if err != nil {
b.logger.Fatal("Failed to load server CA certificate", zap.Error(err))
}
caCertPool := x509.NewCertPool()
if !caCertPool.AppendCertsFromPEM(caCert) {
b.logger.Fatal("Failed to add server CA certificate", zap.Error(err))
}
tlsConfig := tls.Config{
RootCAs: caCertPool,
}
tlsCreds := credentials.NewTLS(&tlsConfig)
tlsChooser := peer.NewSingle(hostport.Identify(b.hostPort), grpcTransport.NewDialer(grpc.DialerCredentials(tlsCreds)))
outbounds = transport.Outbounds{Unary: grpc.NewTransport().NewOutbound(tlsChooser)}
}
} else {
ch, err := tchannel.NewChannelTransport(tchannel.ServiceName(cadenceClientName), tchannel.ListenAddr("127.0.0.1:0"))
if err != nil {
b.logger.Fatal("Failed to create transport channel", zap.Error(err))
Expand Down
1 change: 1 addition & 0 deletions tools/cli/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ const (
FlagServiceZoneWithAlias = FlagServiceZone + ", sz"
FlagEnableTLS = "tls"
FlagTLSCertPath = "tls_cert_path"
FlagTLSCertPathWithAlias = FlagTLSCertPath + ", tcp"
FlagTLSKeyPath = "tls_key_path"
FlagTLSCaPath = "tls_ca_path"
FlagTLSEnableHostVerification = "tls_enable_host_verification"
Expand Down