extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-21 10:18:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support Signal server with TLS (#76)

Browse Source 
* tlsEnabled flag and DialOption

* Update signal client invocations
This commit is contained in:
Maycon Santos 2021-08-01 12:54:35 +02:00 committed by GitHub
parent ea99def502
commit 6ce5b2c815
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/up.go
View File

@ -28,8 +28,10 @@ var (
os.Exit(ExitSetupFailed)
}
var sigTLSEnabled = false
ctx := context.Background()
signalClient, err := sig.NewClient(ctx, config.SignalAddr, myKey)
signalClient, err := sig.NewClient(ctx, config.SignalAddr, myKey, sigTLSEnabled)
if err != nil {
log.Errorf("error while connecting to the Signal Exchange Service %s: %s", config.SignalAddr, err)
os.Exit(ExitSetupFailed)

4
connection/engine_test.go
View File

@ -39,7 +39,9 @@ func Test_Start(t *testing.T) {
iFaceBlackList := make(map[string]struct{})
signalClient, err := sig.NewClient(ctx, "signal.wiretrustee.com:10000", testKey)
var sigTLSEnabled = false
signalClient, err := sig.NewClient(ctx, "signal.wiretrustee.com:10000", testKey, sigTLSEnabled)
if err != nil {
t.Fatal(err)
}

12
signal/client.go
View File

@ -2,6 +2,7 @@ package signal
import (
"context"
"crypto/tls"
"fmt"
"github.com/cenkalti/backoff/v4"
log "github.com/sirupsen/logrus"
@ -10,6 +11,7 @@ import (
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/keepalive"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
@ -38,12 +40,18 @@ func (c *Client) Close() error {
}
// NewClient creates a new Signal client
func NewClient(ctx context.Context, addr string, key wgtypes.Key) (*Client, error) {
func NewClient(ctx context.Context, addr string, key wgtypes.Key, tlsEnabled bool) (*Client, error) {
transportOption := grpc.WithInsecure()
if tlsEnabled {
transportOption = grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{}))
}
conn, err := grpc.DialContext(
ctx,
addr,
grpc.WithInsecure(),
transportOption,
grpc.WithBlock(),
grpc.WithKeepaliveParams(keepalive.ClientParameters{
Time: 3 * time.Second,

3
signal/signal_test.go
View File

@ -144,7 +144,8 @@ var _ = Describe("Client", func() {
})
func createSignalClient(addr string, key wgtypes.Key) *signal.Client {
client, err := signal.NewClient(context.Background(), addr, key)
var sigTLSEnabled = false
client, err := signal.NewClient(context.Background(), addr, key, sigTLSEnabled)
if err != nil {
Fail("failed creating signal client")
}