Fix regexes

Signed-off-by: Caroline Scherf <fcaroline@vmware.com>

Author: fcaroline2020

pkg/secret/factory.go

@@ -5,12 +5,13 @@ package secret
 
 import (
 	"encoding/json"
-	"github.com/google/go-containerregistry/pkg/name"
 	"os"
 	"regexp"
 	"sort"
 	"strings"
 
+	"github.com/google/go-containerregistry/pkg/name"
+
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
@@ -24,6 +25,9 @@ const (
 	GitAnnotation = "kpack.io/git"
 )
 
+var gitHttpUrlRegex = regexp.MustCompile(`^(?:https?://)?(?:[a-zA-Z0-9\-\.])+\.(?:\w+)(:(?:\d){3,5})?$`)
+var gitSshRegex = regexp.MustCompile(`^((?:ssh://)?(?:[A-Za-z0-9])+@(?:[A-Za-z0-9+.-])+\.(?:\w+)(:(?:\d){3,5})?)$|^(?:[A-Za-z0-9][A-Za-z0-9+.-]+)\.(?:[A-Za-z0-9]+)$`)
+
 type CredentialFetcher interface {
 	FetchPassword(envVar, prompt string) (string, error)
 }
@@ -106,24 +110,17 @@ func (f *Factory) validate() error {
 		}
 	}
 
-	if f.GitUser != "" {
-		if match, _ := regexp.Match(`^(?:https?://)(?:[a-zA-Z0-9\-\.]+(?::\d+)?)(?:\/(?:$|[^/]))?$`, []byte(f.GitUrl)); !match {
-			return errors.Errorf("must provide a valid git url without the repository path for basic auth (ex. https://github.com)")
-		}
+	if f.GitUser != "" && !gitHttpUrlRegex.MatchString(f.GitUrl) {
+		return errors.Errorf("must provide a valid git url without the repository path for basic auth (ex. https://github.com)")
 	}
 
-	if f.GitSshKeyFile != "" && !validateGitSshAddress(f.GitUrl) {
+	if f.GitSshKeyFile != "" && !gitSshRegex.MatchString(f.GitUrl) {
 		return errors.Errorf("must provide a valid git url for SSH (ex. git@github.com)")
 	}
 
 	return nil
 }
 
-func validateGitSshAddress(address string) bool {
-	re := regexp.MustCompile(`^git@github\.com$`)
-	return re.MatchString(address)
-}
-
 func (f *Factory) getSecretKind() (secretKind, error) {
 	if f.DockerhubId != "" {
 		return dockerHubKind, nil

pkg/secret/factory_test.go

@@ -132,7 +132,11 @@ func testSecretFactory(t *testing.T, when spec.G, it spec.S) {
 				"https://github.com",
 				"http://github.com",
 				"https://github.enterprise:1234",
-				"http://github.enterprise:1234",
+				"http://github.enterprise:134",
+				"https://domain.com",
+				"http://domain.com",
+				"github.com",
+				"bitbucket.org",
 			}
 			for _, testUrl := range validGitUrls {
 				factory.GitUrl = testUrl
@@ -147,6 +151,9 @@ func testSecretFactory(t *testing.T, when spec.G, it spec.S) {
 			invalidGitUrls := []string{
 				"some-git",
 				"https://some-git.com/test",
+				"https://some-git.com/",
+				"https://domain.com/stash/csm/blabla/project.git",
+				"http://github.enterprise:13444456",
 			}
 			for _, testUrl := range invalidGitUrls {
 				factory.GitUrl = testUrl
@@ -162,6 +169,11 @@ func testSecretFactory(t *testing.T, when spec.G, it spec.S) {
 		it("creates a secret when a valid ssh git url is passed", func() {
 			validGitSshUrls := []string{
 				"git@github.com",
+				"user@domain.com",
+				"test@github.com",
+				"domain.com",
+				"ssh://git@github.com:123",
+				"ssh://git@github.com",
 			}
 			for _, testUrl := range validGitSshUrls {
 				factory.GitUrl = testUrl
@@ -181,6 +193,13 @@ func testSecretFactory(t *testing.T, when spec.G, it spec.S) {
 				"git@github.com:user/repo.git",
 				"git@github.com:buildpacks-community/kpack-cli.git",
 				"ssh://git@ssh.github.com:443/YOUR-USERNAME/YOUR-REPOSITORY.git",
+				"git@github.com/abc.git",
+				"git@github.com:user/repo.git",
+				"ssh://git@example.com/path/to/repo.git",
+				"ssh://user@bitbucket.org/group/my-repo.git",
+				"git@custom-git-server.local:myrepo.git",
+				"git@gitlab.com:username/project.git",
+				"git@github.com:44335678",
 			}
 			for _, testUrl := range invalidGitSshUrls {
 				factory.GitUrl = testUrl