feat: added MarshalYAML to severities array + issue tracker options f…

…ix (#5166) * feat: added MarshalYAML to severities array * fix issue with creation of reports
projectdiscovery · May 10, 2024 · 6067b78 · 6067b78
1 parent fed10a1
commit 6067b78
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 4 deletions.
diff --git a/pkg/model/types/severity/severities.go b/pkg/model/types/severity/severities.go
@@ -26,6 +26,14 @@ func (severities *Severities) Set(values string) error {
 	return nil
 }
 
+func (severities Severities) MarshalYAML() (interface{}, error) {
+	var stringSeverities = make([]string, 0, len(severities))
+	for _, severity := range severities {
+		stringSeverities = append(stringSeverities, severity.String())
+	}
+	return stringSeverities, nil
+}
+
 func (severities *Severities) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	var stringSliceValue stringslice.StringSlice
 	if err := unmarshal(&stringSliceValue); err != nil {

diff --git a/pkg/model/types/severity/severity_test.go b/pkg/model/types/severity/severity_test.go
@@ -74,3 +74,12 @@ func TestMarshalJSON(t *testing.T) {
 	}
 	require.Equal(t, "[\"low\",\"medium\"]", string(data), "could not marshal json")
 }
+
+func TestSeveritiesMarshalYaml(t *testing.T) {
+	unmarshalled := Severities{Low, Medium}
+	marshalled, err := yaml.Marshal(unmarshalled)
+	if err != nil {
+		panic(err)
+	}
+	require.Equal(t, "- low\n- medium\n", string(marshalled), "could not marshal yaml")
+}
diff --git a/pkg/reporting/reporting.go b/pkg/reporting/reporting.go
@@ -276,6 +276,7 @@ func (c *ReportingClient) CreateIssue(event *output.ResultEvent) error {
 			if tracker.ShouldFilter(event) {
 				continue
 			}
+
 			trackerName := tracker.Name()
 			stats, statsOk := c.stats[trackerName]
 

diff --git a/pkg/reporting/trackers/gitea/gitea.go b/pkg/reporting/trackers/gitea/gitea.go
@@ -140,7 +140,7 @@ func (i *Integration) CloseIssue(event *output.ResultEvent) error {
 // ShouldFilter determines if an issue should be logged to this tracker
 func (i *Integration) ShouldFilter(event *output.ResultEvent) bool {
 	if i.options.AllowList != nil && i.options.AllowList.GetMatch(event) {
-		return true
+		return false
 	}
 
 	if i.options.DenyList != nil && i.options.DenyList.GetMatch(event) {

diff --git a/pkg/reporting/trackers/github/github.go b/pkg/reporting/trackers/github/github.go
@@ -176,7 +176,7 @@ func (i *Integration) Name() string {
 // ShouldFilter determines if an issue should be logged to this tracker
 func (i *Integration) ShouldFilter(event *output.ResultEvent) bool {
 	if i.options.AllowList != nil && i.options.AllowList.GetMatch(event) {
-		return true
+		return false
 	}
 
 	if i.options.DenyList != nil && i.options.DenyList.GetMatch(event) {

diff --git a/pkg/reporting/trackers/gitlab/gitlab.go b/pkg/reporting/trackers/gitlab/gitlab.go
@@ -165,7 +165,7 @@ func (i *Integration) CloseIssue(event *output.ResultEvent) error {
 // ShouldFilter determines if an issue should be logged to this tracker
 func (i *Integration) ShouldFilter(event *output.ResultEvent) bool {
 	if i.options.AllowList != nil && i.options.AllowList.GetMatch(event) {
-		return true
+		return false
 	}
 
 	if i.options.DenyList != nil && i.options.DenyList.GetMatch(event) {

diff --git a/pkg/reporting/trackers/jira/jira.go b/pkg/reporting/trackers/jira/jira.go
@@ -315,7 +315,7 @@ func (i *Integration) FindExistingIssue(event *output.ResultEvent) (jira.Issue,
 // ShouldFilter determines if an issue should be logged to this tracker
 func (i *Integration) ShouldFilter(event *output.ResultEvent) bool {
 	if i.options.AllowList != nil && i.options.AllowList.GetMatch(event) {
-		return true
+		return false
 	}
 
 	if i.options.DenyList != nil && i.options.DenyList.GetMatch(event) {