From 8083562991255f20667f362ba6147d94e2b98a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Fri, 7 Jul 2017 17:24:57 +0200 Subject: tokens! --- go/internal/handler/handler.go | 2 +- go/internal/handler/receive_pack.go | 2 +- go/internal/handler/upload_pack.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'go') diff --git a/go/internal/handler/handler.go b/go/internal/handler/handler.go index f6b3c44..990acd3 100644 --- a/go/internal/handler/handler.go +++ b/go/internal/handler/handler.go @@ -41,7 +41,7 @@ func execCommand(command string, args ...string) error { return syscall.Exec(binPath, args, os.Environ()) } -func dialOpts(token string) []grpc.DialOption { +func dialOpts() []grpc.DialOption { connOpts := client.DefaultDialOpts if token := os.Getenv("GITALY_TOKEN"); token != "" { connOpts = append(client.DefaultDialOpts, grpc.WithPerRPCCredentials(gitalyauth.RPCCredentials(token))) diff --git a/go/internal/handler/receive_pack.go b/go/internal/handler/receive_pack.go index 3116bd1..e69486f 100644 --- a/go/internal/handler/receive_pack.go +++ b/go/internal/handler/receive_pack.go @@ -14,7 +14,7 @@ func ReceivePack(gitalyAddress string, request *pb.SSHReceivePackRequest) (int32 return 0, fmt.Errorf("no gitaly_address given") } - conn, err := client.Dial(gitalyAddress, dialOpts(os.Getenv("GITALY_TOKEN"))) + conn, err := client.Dial(gitalyAddress, dialOpts()) if err != nil { return 0, err } diff --git a/go/internal/handler/upload_pack.go b/go/internal/handler/upload_pack.go index ed0b67b..51a2f3b 100644 --- a/go/internal/handler/upload_pack.go +++ b/go/internal/handler/upload_pack.go @@ -14,7 +14,7 @@ func UploadPack(gitalyAddress string, request *pb.SSHUploadPackRequest) (int32, return 0, fmt.Errorf("no gitaly_address given") } - conn, err := client.Dial(gitalyAddress, dialOpts(os.Getenv("GITALY_TOKEN"))) + conn, err := client.Dial(gitalyAddress, dialOpts()) if err != nil { return 0, err } -- cgit v1.2.1