summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim "BKC" Carlbäcker <kim.carlbacker@gmail.com>2017-07-07 17:24:57 +0200
committerKim "BKC" Carlbäcker <kim.carlbacker@gmail.com>2017-07-07 17:24:57 +0200
commit8083562991255f20667f362ba6147d94e2b98a5e (patch)
treecf18d8d160992ad17ba5a0402d11b6e13242976c
parent164baba2298062626c69124baea0321174c452ef (diff)
downloadgitlab-shell-8083562991255f20667f362ba6147d94e2b98a5e.tar.gz
tokens!
-rw-r--r--go/internal/handler/handler.go2
-rw-r--r--go/internal/handler/receive_pack.go2
-rw-r--r--go/internal/handler/upload_pack.go2
3 files changed, 3 insertions, 3 deletions
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
}