fix regexp for ssh

Signed-off-by: cleverhu <[email protected]>

pkg/git/git.go

@@ -36,10 +36,8 @@ const (
 	sshMissingKnownHostsSSHCommand = "ssh -o StrictHostKeyChecking=accept-new"
 )
 
-var (
-	// sshURLRegexFormat matches the url of SSH git repository
-	sshURLRegexFormat = regexp.MustCompile(`(ssh://[\w\d\.]+|.+@?.+\..+:)(:[\d]+){0,1}/*(.*)`)
-)
+// sshURLRegexFormat matches the url of SSH git repository
+var sshURLRegexFormat = regexp.MustCompile(`(ssh://[\w\d\.]+|.+@?.+\..+:)(:[\d]+){0,1}/*(.*)`)
 
 func run(logger *zap.SugaredLogger, dir string, args ...string) (string, error) {
 	c := exec.Command("git", args...)
@@ -235,7 +233,7 @@ func ensureHomeEnv(logger *zap.SugaredLogger, homepath string) {
 	}
 }
 
-func ensureHomeEnvSSHLinkedFromPath(logger *zap.SugaredLogger, homeenv string, homepath string) {
+func ensureHomeEnvSSHLinkedFromPath(logger *zap.SugaredLogger, homeenv, homepath string) {
 	if filepath.Clean(homeenv) != filepath.Clean(homepath) {
 		homeEnvSSH := filepath.Join(homeenv, ".ssh")
 		homePathSSH := filepath.Join(homepath, ".ssh")
@@ -276,6 +274,9 @@ func validateGitAuth(logger *zap.SugaredLogger, credsDir, url string) {
 
 // validateGitSSHURLFormat validates the given URL format is SSH or not
 func validateGitSSHURLFormat(url string) bool {
+	if strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://") {
+		return false
+	}
 	return sshURLRegexFormat.MatchString(url)
 }
 

pkg/git/git_test.go

@@ -73,6 +73,10 @@ func TestValidateGitSSHURLFormat(t *testing.T) {
 			url:  "https://host.xz/path/to/repo.git/",
 			want: false,
 		},
+		{
+			url:  "https://host.xz:1443/path/to/repo.git/",
+			want: false,
+		},
 		{
 			url:  "ssh://[email protected]:port/path/to/repo.git/",
 			want: true,
@@ -260,7 +264,6 @@ func TestEnsureHomeEnv(t *testing.T) {
 			if _, err := os.Stat(filepath.Join(homedir, ".ssh")); os.IsNotExist(err) {
 				t.Errorf("SSH creds not present in homedir %s", homedir)
 			}
-
 		})
 	}
 }