From 5118bc2a459addcf8140be655ca97594d118f7d6 Mon Sep 17 00:00:00 2001
From: Eyal Ben Moshe <eyalbenmoshe@jfrog.com>
Date: Sun, 14 May 2023 08:48:41 +0300
Subject: [PATCH] Extend go-git timeout (#335)

---
 commands/utils/git.go | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/commands/utils/git.go b/commands/utils/git.go
index 10ff919da..754ab548d 100644
--- a/commands/utils/git.go
+++ b/commands/utils/git.go
@@ -6,7 +6,9 @@ import (
 	"github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing/protocol/packp/capability"
 	"github.com/go-git/go-git/v5/plumbing/transport"
+	"github.com/go-git/go-git/v5/plumbing/transport/client"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
+	"net/http"
 	"os"
 	"strings"
 	"time"
@@ -15,12 +17,17 @@ import (
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/format/gitignore"
 	"github.com/go-git/go-git/v5/plumbing/object"
-	"github.com/go-git/go-git/v5/plumbing/transport/http"
+	githttp "github.com/go-git/go-git/v5/plumbing/transport/http"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
 
-const refFormat = "refs/heads/%s:refs/heads/%[1]s"
+const (
+	refFormat = "refs/heads/%s:refs/heads/%[1]s"
+
+	// Timout is seconds for the git operations performed by the go-git client.
+	goGitTimeoutSeconds = 60
+)
 
 type GitManager struct {
 	// repository represents a git repository as a .git dir.
@@ -28,7 +35,7 @@ type GitManager struct {
 	// remoteName is name of the Git remote server
 	remoteName string
 	// The authentication struct consisting a username/password
-	auth *http.BasicAuth
+	auth *githttp.BasicAuth
 	// dryRun is used for testing purposes, mocking part of the git commands that requires networking
 	dryRun bool
 	// When dryRun is enabled, dryRunRepoPath specifies the repository local path to clone
@@ -47,6 +54,7 @@ type CustomTemplates struct {
 }
 
 func NewGitManager(dryRun bool, clonedRepoPath, projectPath, remoteName, token, username string, g *Git) (*GitManager, error) {
+	setGoGitCustomClient()
 	repository, err := git.PlainOpen(projectPath)
 	if err != nil {
 		return nil, err
@@ -326,14 +334,14 @@ func (gm *GitManager) dryRunClone(destination string) error {
 	return nil
 }
 
-func toBasicAuth(token, username string) *http.BasicAuth {
+func toBasicAuth(token, username string) *githttp.BasicAuth {
 	// The username can be anything except for an empty string
 	if username == "" {
 		username = "username"
 	}
 	// Bitbucket server username starts with ~ prefix as the project key. We need to trim it for the authentication
 	username = strings.TrimPrefix(username, "~")
-	return &http.BasicAuth{
+	return &githttp.BasicAuth{
 		Username: username,
 		Password: token,
 	}
@@ -357,3 +365,13 @@ func loadCustomTemplates(commitMessageTemplate, branchNameTemplate, pullRequestT
 	}
 	return template, nil
 }
+
+func setGoGitCustomClient() {
+	log.Debug("Setting timeout for go-git to", goGitTimeoutSeconds, "seconds ...")
+	customClient := &http.Client{
+		Timeout: goGitTimeoutSeconds * time.Second,
+	}
+
+	client.InstallProtocol("http", githttp.NewClient(customClient))
+	client.InstallProtocol("https", githttp.NewClient(customClient))
+}