Skip to content

Commit

Permalink
Set minumum TLS version to 1.2 (#498)
Browse files Browse the repository at this point in the history
* add tls 1.2

Signed-off-by: Nikita Skrynnik <[email protected]>

* fix generation

Signed-off-by: Nikita Skrynnik <[email protected]>

* fix linter

Signed-off-by: Nikita Skrynnik <[email protected]>
  • Loading branch information
NikitaSkrynnik authored May 29, 2022
1 parent ef53231 commit 608d302
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
4 changes: 2 additions & 2 deletions internal/imports/gen.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2020-2021 Cisco and/or its affiliates.
// Copyright (c) 2020-2022 Cisco and/or its affiliates.
//
// SPDX-License-Identifier: Apache-2.0
//
Expand All @@ -18,5 +18,5 @@
package imports

//go:generate bash -c "rm -rf imports*.go"
//go:generate bash -c "cd $(mktemp -d) && GO111MODULE=on go get github.com/edwarnicke/[email protected]"
//go:generate bash -c "cd $(mktemp -d) && GO111MODULE=on go install github.com/edwarnicke/[email protected]"
//go:generate bash -c "GOOS=linux ${GOPATH}/bin/imports-gen"
1 change: 1 addition & 0 deletions internal/imports/imports_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package imports

import (
_ "context"
_ "crypto/tls"
_ "fmt"
_ "github.com/antonfisher/nested-logrus-formatter"
_ "github.com/edwarnicke/grpcfd"
Expand Down
10 changes: 8 additions & 2 deletions internal/manager/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package manager

import (
"context"
"crypto/tls"
"net"
"net/url"
"os"
Expand Down Expand Up @@ -111,6 +112,11 @@ func RunNsmgr(ctx context.Context, configuration *config.Config) error {

u := genPublishableURL(configuration.ListenOn, m.logger)

tlsClientConfig := tlsconfig.MTLSClientConfig(m.source, m.source, tlsconfig.AuthorizeAny())
tlsClientConfig.MinVersion = tls.VersionTLS12
tlsServerConfig := tlsconfig.MTLSServerConfig(m.source, m.source, tlsconfig.AuthorizeAny())
tlsServerConfig.MinVersion = tls.VersionTLS12

mgrOptions := []nsmgr.Option{
nsmgr.WithName(configuration.Name),
nsmgr.WithURL(u.String()),
Expand All @@ -121,7 +127,7 @@ func RunNsmgr(ctx context.Context, configuration *config.Config) error {
append(tracing.WithTracingDial(),
grpc.WithTransportCredentials(
GrpcfdTransportCredentials(
credentials.NewTLS(tlsconfig.MTLSClientConfig(m.source, m.source, tlsconfig.AuthorizeAny())),
credentials.NewTLS(tlsClientConfig),
),
),
grpc.WithBlock(),
Expand All @@ -147,7 +153,7 @@ func RunNsmgr(ctx context.Context, configuration *config.Config) error {
tracing.WithTracing(),
grpc.Creds(
GrpcfdTransportCredentials(
credentials.NewTLS(tlsconfig.MTLSServerConfig(m.source, m.source, tlsconfig.AuthorizeAny())),
credentials.NewTLS(tlsServerConfig),
),
),
)
Expand Down

0 comments on commit 608d302

Please sign in to comment.