feat: add xray to sca rules (#118)

allero-io · Oct 12, 2022 · 4a63ea5 · 4a63ea5
1 parent c72f028
commit 4a63ea5
Show file tree

Hide file tree

Showing 26 changed files with 736 additions and 82 deletions.
diff --git a/pkg/connectors/github/githubConnector.go b/pkg/connectors/github/githubConnector.go
@@ -86,8 +86,8 @@ func (gc *GithubConnector) addRepo(githubJsonObject map[string]*GithubOwner, rep
 		FullName:               *repo.FullName,
 		ID:                     int(*repo.ID),
 		ProgrammingLanguages:   languages,
-		GithubActionsWorkflows: make(map[string]*PipelineFile),
-		JfrogPipelines:         make(map[string]*PipelineFile),
+		GithubActionsWorkflows: make(map[string]*connectors.PipelineFile),
+		JfrogPipelines:         make(map[string]*connectors.PipelineFile),
 	}
 
 	return nil
@@ -153,8 +153,8 @@ func (gc *GithubConnector) processWorkflowFiles(githubJsonObject map[string]*Git
 	return processingError
 }
 
-func (gc *GithubConnector) getWorkflowFilesEntities(repo *github.Repository) (chan *PipelineFile, error) {
-	workflowFilesEntitiesChan := make(chan *PipelineFile)
+func (gc *GithubConnector) getWorkflowFilesEntities(repo *github.Repository) (chan *connectors.PipelineFile, error) {
+	workflowFilesEntitiesChan := make(chan *connectors.PipelineFile)
 
 	var getEntitiesErr error
 	go func() {
@@ -171,7 +171,7 @@ func (gc *GithubConnector) getWorkflowFilesEntities(repo *github.Repository) (ch
 			}
 			relevantFilesPaths := gc.matchedFiles(tree, cicdPlatform.RelevantFilesRegex)
 			for _, filePath := range relevantFilesPaths {
-				workflowFilesEntitiesChan <- &PipelineFile{
+				workflowFilesEntitiesChan <- &connectors.PipelineFile{
 					RelativePath: filePath,
 					Filename:     path.Base(filePath),
 					Origin:       cicdPlatform.Name,

diff --git a/pkg/connectors/github/githubJson.type.go b/pkg/connectors/github/githubJson.type.go
@@ -1,5 +1,7 @@
 package githubConnector
 
+import "github.com/allero-io/allero/pkg/connectors"
+
 type GithubOwner struct {
 	Name         string                       `json:"ownerName"`
 	Type         string                       `json:"ownerType"`
@@ -8,17 +10,10 @@ type GithubOwner struct {
 }
 
 type GithubRepository struct {
-	Name                   string                   `json:"name"`
-	FullName               string                   `json:"fullName"`
-	ID                     int                      `json:"id"`
-	ProgrammingLanguages   []string                 `json:"programmingLanguages"`
-	GithubActionsWorkflows map[string]*PipelineFile `json:"github-actions-workflows"`
-	JfrogPipelines         map[string]*PipelineFile `json:"jfrog-pipelines"`
-}
-
-type PipelineFile struct {
-	RelativePath string      `json:"relativePath"`
-	Filename     string      `json:"filename"`
-	Origin       string      `json:"origin"`
-	Content      interface{} `json:"content"`
+	Name                   string                              `json:"name"`
+	FullName               string                              `json:"fullName"`
+	ID                     int                                 `json:"id"`
+	ProgrammingLanguages   []string                            `json:"programmingLanguages"`
+	GithubActionsWorkflows map[string]*connectors.PipelineFile `json:"github-actions-workflows"`
+	JfrogPipelines         map[string]*connectors.PipelineFile `json:"jfrog-pipelines"`
 }
diff --git a/pkg/connectors/gitlab/gitlabConnector.go b/pkg/connectors/gitlab/gitlabConnector.go
@@ -105,8 +105,8 @@ func (gc *GitlabConnector) processPipelineFiles(gitlabJsonObject map[string]*Git
 	return processingError
 }
 
-func (gc *GitlabConnector) getPipelineFiles(project *gitlab.Project) (chan *PipelineFile, error) {
-	pipelineFilesChan := make(chan *PipelineFile)
+func (gc *GitlabConnector) getPipelineFiles(project *gitlab.Project) (chan *connectors.PipelineFile, error) {
+	pipelineFilesChan := make(chan *connectors.PipelineFile)
 
 	var getEntitiesErr error
 	go func() {
@@ -124,7 +124,7 @@ func (gc *GitlabConnector) getPipelineFiles(project *gitlab.Project) (chan *Pipe
 			}
 			relevantFilesPaths := gc.matchedFiles(treeNodes, cicdPlatform.RelevantFilesRegex)
 			for _, filePath := range relevantFilesPaths {
-				pipelineFilesChan <- &PipelineFile{
+				pipelineFilesChan <- &connectors.PipelineFile{
 					RelativePath: filePath,
 					Filename:     path.Base(filePath),
 					Origin:       cicdPlatform.Name,
@@ -173,8 +173,8 @@ func (gc *GitlabConnector) addProject(gitlabJsonObject map[string]*GitlabGroup,
 		Name:           projectName,
 		FullName:       fullName,
 		ID:             project.ID,
-		GitlabCi:       make(map[string]*PipelineFile),
-		JfrogPipelines: make(map[string]*PipelineFile),
+		GitlabCi:       make(map[string]*connectors.PipelineFile),
+		JfrogPipelines: make(map[string]*connectors.PipelineFile),
 	}
 
 	return nil

diff --git a/pkg/connectors/gitlab/gitlabJson.type.go b/pkg/connectors/gitlab/gitlabJson.type.go
@@ -1,22 +1,17 @@
 package gitlabConnector
 
+import "github.com/allero-io/allero/pkg/connectors"
+
 type GitlabGroup struct {
 	Name     string                    `json:"groupName"`
 	ID       int                       `json:"id"`
 	Projects map[string]*GitlabProject `json:"projects"`
 }
 
 type GitlabProject struct {
-	Name           string                   `json:"name"`
-	FullName       string                   `json:"fullName"`
-	ID             int                      `json:"id"`
-	GitlabCi       map[string]*PipelineFile `json:"gitlab-ci"`
-	JfrogPipelines map[string]*PipelineFile `json:"jfrog-pipelines"`
-}
-
-type PipelineFile struct {
-	RelativePath string                 `json:"relativePath"`
-	Filename     string                 `json:"filename"`
-	Origin       string                 `json:"origin"`
-	Content      map[string]interface{} `json:"content"`
+	Name           string                              `json:"name"`
+	FullName       string                              `json:"fullName"`
+	ID             int                                 `json:"id"`
+	GitlabCi       map[string]*connectors.PipelineFile `json:"gitlab-ci"`
+	JfrogPipelines map[string]*connectors.PipelineFile `json:"jfrog-pipelines"`
 }
diff --git a/pkg/connectors/local/localGithubConnector.go b/pkg/connectors/local/localGithubConnector.go
@@ -42,8 +42,8 @@ func (lc *LocalConnector) addRootPathAsNewRepo(githubJsonObject map[string]*gith
 		FullName:               escapedRepoName,
 		ID:                     0,
 		ProgrammingLanguages:   nil,
-		GithubActionsWorkflows: make(map[string]*githubConnector.PipelineFile),
-		JfrogPipelines:         make(map[string]*githubConnector.PipelineFile),
+		GithubActionsWorkflows: make(map[string]*connectors.PipelineFile),
+		JfrogPipelines:         make(map[string]*connectors.PipelineFile),
 	}
 
 	return nil
@@ -90,8 +90,8 @@ func (lc *LocalConnector) processGithubWorkflowFiles(githubJsonObject map[string
 	return processingError
 }
 
-func (lc *LocalConnector) getWorkflowFilesEntities(repoName string) (chan *githubConnector.PipelineFile, error) {
-	workflowFilesEntitiesChan := make(chan *githubConnector.PipelineFile)
+func (lc *LocalConnector) getWorkflowFilesEntities(repoName string) (chan *connectors.PipelineFile, error) {
+	workflowFilesEntitiesChan := make(chan *connectors.PipelineFile)
 
 	var getEntitiesErr error
 	go func() {
@@ -106,7 +106,7 @@ func (lc *LocalConnector) getWorkflowFilesEntities(repoName string) (chan *githu
 				return
 			}
 			for _, filePath := range relevantFilesPaths {
-				workflowFilesEntitiesChan <- &githubConnector.PipelineFile{
+				workflowFilesEntitiesChan <- &connectors.PipelineFile{
 					RelativePath: filePath,
 					Filename:     path.Base(filePath),
 					Origin:       cicdPlatform.Name,

diff --git a/pkg/connectors/local/localGitlabConnector.go b/pkg/connectors/local/localGitlabConnector.go
@@ -40,8 +40,8 @@ func (lc *LocalConnector) addRootPathAsNewProject(gitlabJsonObject map[string]*g
 		Name:           escapedRepoName,
 		FullName:       escapedRepoName,
 		ID:             0,
-		GitlabCi:       make(map[string]*gitlabConnector.PipelineFile),
-		JfrogPipelines: make(map[string]*gitlabConnector.PipelineFile),
+		GitlabCi:       make(map[string]*connectors.PipelineFile),
+		JfrogPipelines: make(map[string]*connectors.PipelineFile),
 	}
 
 	return nil
@@ -88,8 +88,8 @@ func (lc *LocalConnector) processGitlabWorkflowFiles(gitlabJsonObject map[string
 	return processingError
 }
 
-func (lc *LocalConnector) getGitlabWorkflowFilesEntities(repoName string) (chan *gitlabConnector.PipelineFile, error) {
-	workflowFilesEntitiesChan := make(chan *gitlabConnector.PipelineFile)
+func (lc *LocalConnector) getGitlabWorkflowFilesEntities(repoName string) (chan *connectors.PipelineFile, error) {
+	workflowFilesEntitiesChan := make(chan *connectors.PipelineFile)
 
 	var getEntitiesErr error
 	go func() {
@@ -108,7 +108,7 @@ func (lc *LocalConnector) getGitlabWorkflowFilesEntities(repoName string) (chan
 				return
 			}
 			for _, filePath := range relevantFilesPaths {
-				workflowFilesEntitiesChan <- &gitlabConnector.PipelineFile{
+				workflowFilesEntitiesChan <- &connectors.PipelineFile{
 					RelativePath: filePath,
 					Filename:     path.Base(filePath),
 					Origin:       cicdPlatform.Name,

diff --git a/pkg/connectors/shared.go b/pkg/connectors/shared.go
@@ -19,6 +19,13 @@ type CICDPlatform struct {
 	GitlabValid        bool
 }
 
+type PipelineFile struct {
+	RelativePath string                 `json:"relativePath"`
+	Filename     string                 `json:"filename"`
+	Origin       string                 `json:"origin"`
+	Content      map[string]interface{} `json:"content"`
+}
+
 var SUPPORTED_CICD_PLATFORMS = []CICDPlatform{
 	{
 		Name:               "github_actions",