Bug: Fix Crashing when scanning gitlab with sub groups

internal/scm-clients/clients/clients.go

@@ -73,10 +73,10 @@ func FetchClientData(accessToken string, repoUrl string, branch string) (*checkm
 	}, checksIds, nil
 }
 
-func getRepoInfo(repoUrl string) (scm string, org string, repo string, err error) {
-	u, err := url.Parse(repoUrl)
+func getRepoInfo(repoFullUrl string) (string, string, string, error) {
+	u, err := url.Parse(repoFullUrl)
 	if err != nil || u.Scheme == "" {
-		logger.Errorf(err, "error in parsing repoUrl %s", repoUrl)
+		logger.Errorf(err, "error in parsing repoUrl %s", repoFullUrl)
 		if err == nil {
 			err = errors.New("error in parsing the host")
 		}
@@ -85,9 +85,13 @@ func getRepoInfo(repoUrl string) (scm string, org string, repo string, err error
 
 	path := strings.Split(u.EscapedPath(), "/")
 	if len(path) < 3 {
-		return "", "", "", fmt.Errorf("missing org/repo in the repository url: %s", repoUrl)
+		return "", "", "", fmt.Errorf("missing org/repo in the repository url: %s", repoFullUrl)
 	}
-	return u.Host, path[1], path[2], nil
+	repo := path[len(path) - 1]
+	namespace := strings.Split(u.Path, repo)[0]
+	trimedNamespace := namespace[1:(len(namespace) - 1)]
+
+	return u.Host, trimedNamespace, repo, nil
 }
 
 func getClientAdapter(scmName string, accessToken string) (adapter.ClientAdapter, error) {

internal/scm-clients/clients/clients_test.go

@@ -0,0 +1,68 @@
+package clients
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+type RepoInfo struct {
+	BaseUrl   string
+	Namespace string
+	Project   string
+}
+
+func TestGetRepoInfo(t *testing.T) {
+
+	tests := []struct {
+		Name        string
+		RepoUrl     string
+		ExpectedErr error
+		Expected    RepoInfo
+	}{{
+		Name:        "missing url schema",
+		RepoUrl:     "gitlab.com/rootgroup/subgroup/secondsubgroup/test",
+		ExpectedErr: fmt.Errorf("error in parsing the host"),
+		Expected:    RepoInfo{BaseUrl: "", Namespace: "", Project: ""},
+	}, {
+		Name:        "invalid url",
+		RepoUrl:     "https://gitlab?com/rootgroup/subgroup/secondsubgroup/test",
+		ExpectedErr: fmt.Errorf("missing org/repo in the repository url: %s", "https://gitlab?com/rootgroup/subgroup/secondsubgroup/test"),
+		Expected:    RepoInfo{BaseUrl: "", Namespace: "", Project: ""},
+	}, {
+		Name:        "github repo",
+		RepoUrl:     "https://github.com/aquasecurity/chain-bench",
+		ExpectedErr: nil,
+		Expected:    RepoInfo{BaseUrl: "github.com", Namespace: "aquasecurity", Project: "chain-bench"},
+	}, {
+		Name:        "gitlab project under root group",
+		RepoUrl:     "https://gitlab.com/rootgroup/test",
+		ExpectedErr: nil,
+		Expected:    RepoInfo{BaseUrl: "gitlab.com", Namespace: "rootgroup", Project: "test"},
+	}, {
+		Name:        "gitlab project under sub group",
+		RepoUrl:     "https://gitlab.com/rootgroup/subgroup/secondsubgroup/test",
+		ExpectedErr: nil,
+		Expected:    RepoInfo{BaseUrl: "gitlab.com", Namespace: "rootgroup/subgroup/secondsubgroup", Project: "test"},
+	}}
+
+	for _, test := range tests {
+		test := test
+		t.Run(test.Name, func(t *testing.T) {
+			t.Parallel()
+
+			baseUrl, namespace, project, err := getRepoInfo(test.RepoUrl)
+
+			if test.ExpectedErr == nil {
+				assert.NoError(t, err)
+			} else {
+				assert.EqualError(t, err, test.ExpectedErr.Error())
+			}
+			assert.Equal(t, test.Expected.BaseUrl, baseUrl)
+			assert.Equal(t, test.Expected.Namespace, namespace)
+			assert.Equal(t, test.Expected.Project, project)
+		})
+	}
+
+}