diff options
| -rw-r--r-- | go/internal/handler/receive_pack.go | 10 | ||||
| -rw-r--r-- | go/internal/handler/upload_pack.go | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/go/internal/handler/receive_pack.go b/go/internal/handler/receive_pack.go index 781bbab..ee55780 100644 --- a/go/internal/handler/receive_pack.go +++ b/go/internal/handler/receive_pack.go @@ -5,7 +5,10 @@ import ( "fmt" "os" + "google.golang.org/grpc" + pb "gitlab.com/gitlab-org/gitaly-proto/go" + "gitlab.com/gitlab-org/gitaly/auth" "gitlab.com/gitlab-org/gitaly/client" ) @@ -14,7 +17,12 @@ func ReceivePack(gitalyAddress string, request *pb.SSHReceivePackRequest) (int32 return -1, fmt.Errorf("no gitaly_address given") } - conn, err := client.Dial(gitalyAddress, client.DefaultDialOpts) + connOpts := client.DefaultDialOpts + if token := os.Getenv("GITALY_TOKEN"); token != "" { + connOpts = append(client.DefaultDialOpts, grpc.WithPerRPCCredentials(gitalyauth.RPCCredentials(token))) + } + + conn, err := client.Dial(gitalyAddress, connOpts) if err != nil { return -1, err } diff --git a/go/internal/handler/upload_pack.go b/go/internal/handler/upload_pack.go index 27620f0..b7e81f0 100644 --- a/go/internal/handler/upload_pack.go +++ b/go/internal/handler/upload_pack.go @@ -5,7 +5,10 @@ import ( "fmt" "os" + "google.golang.org/grpc" + pb "gitlab.com/gitlab-org/gitaly-proto/go" + "gitlab.com/gitlab-org/gitaly/auth" "gitlab.com/gitlab-org/gitaly/client" ) @@ -14,7 +17,12 @@ func UploadPack(gitalyAddress string, request *pb.SSHUploadPackRequest) (int32, return -1, fmt.Errorf("no gitaly_address given") } - conn, err := client.Dial(gitalyAddress, client.DefaultDialOpts) + connOpts := client.DefaultDialOpts + if token := os.Getenv("GITALY_TOKEN"); token != "" { + connOpts = append(client.DefaultDialOpts, grpc.WithPerRPCCredentials(gitalyauth.RPCCredentials(token))) + } + + conn, err := client.Dial(gitalyAddress, connOpts) if err != nil { return -1, err } |