External/nuclei
1
0
Fork 0
mirror of https://github.com/projectdiscovery/nuclei.git synced 2025-12-17 23:15:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

removing go 1.20 helpers

Browse Source
This commit is contained in:
Mzack9999 2023-02-07 10:16:37 +01:00
parent cc343c6eda
commit 02df1f2879
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v2/go.mod
View File

@ -43,7 +43,7 @@ require (
github.com/valyala/fasttemplate v1.2.2 github.com/valyala/fasttemplate v1.2.2
github.com/weppos/publicsuffix-go v0.15.1-0.20220724114530-e087fba66a37 github.com/weppos/publicsuffix-go v0.15.1-0.20220724114530-e087fba66a37
github.com/xanzy/go-gitlab v0.79.0 github.com/xanzy/go-gitlab v0.79.0
go.uber.org/multierr v1.9.0 // indirect go.uber.org/multierr v1.9.0
golang.org/x/net v0.5.0 golang.org/x/net v0.5.0
golang.org/x/oauth2 v0.4.0 golang.org/x/oauth2 v0.4.0
golang.org/x/text v0.6.0 golang.org/x/text v0.6.0

19
v2/pkg/reporting/reporting.go
View File

@ -4,6 +4,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"go.uber.org/multierr"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"errors" "errors"
@ -98,7 +99,7 @@ func New(options *Options, db string) (Client, error) {
options.GitHub.HttpClient = options.HttpClient options.GitHub.HttpClient = options.HttpClient
tracker, err := github.New(options.GitHub) tracker, err := github.New(options.GitHub)
if err != nil { if err != nil {
return nil, errors.Join(err, ErrReportingClientCreation) return nil, errorutil.NewWithErr(err).Wrap(ErrReportingClientCreation)
} }
client.trackers = append(client.trackers, tracker) client.trackers = append(client.trackers, tracker)
} }
@ -106,7 +107,7 @@ func New(options *Options, db string) (Client, error) {
options.GitLab.HttpClient = options.HttpClient options.GitLab.HttpClient = options.HttpClient
tracker, err := gitlab.New(options.GitLab) tracker, err := gitlab.New(options.GitLab)
if err != nil { if err != nil {
return nil, errors.Join(err, ErrReportingClientCreation) return nil, errorutil.NewWithErr(err).Wrap(ErrReportingClientCreation)
} }
client.trackers = append(client.trackers, tracker) client.trackers = append(client.trackers, tracker)
} }
@ -114,21 +115,21 @@ func New(options *Options, db string) (Client, error) {
options.Jira.HttpClient = options.HttpClient options.Jira.HttpClient = options.HttpClient
tracker, err := jira.New(options.Jira) tracker, err := jira.New(options.Jira)
if err != nil { if err != nil {
return nil, errors.Join(err, ErrReportingClientCreation) return nil, errorutil.NewWithErr(err).Wrap(ErrReportingClientCreation)
} }
client.trackers = append(client.trackers, tracker) client.trackers = append(client.trackers, tracker)
} }
if options.MarkdownExporter != nil { if options.MarkdownExporter != nil {
exporter, err := markdown.New(options.MarkdownExporter) exporter, err := markdown.New(options.MarkdownExporter)
if err != nil { if err != nil {
return nil, errors.Join(err, ErrExportClientCreation) return nil, errorutil.NewWithErr(err).Wrap(ErrExportClientCreation)
} }
client.exporters = append(client.exporters, exporter) client.exporters = append(client.exporters, exporter)
} }
if options.SarifExporter != nil { if options.SarifExporter != nil {
exporter, err := sarif.New(options.SarifExporter) exporter, err := sarif.New(options.SarifExporter)
if err != nil { if err != nil {
return nil, errors.Join(err, ErrExportClientCreation) return nil, errorutil.NewWithErr(err).Wrap(ErrExportClientCreation)
} }
client.exporters = append(client.exporters, exporter) client.exporters = append(client.exporters, exporter)
} }
@ -136,7 +137,7 @@ func New(options *Options, db string) (Client, error) {
options.ElasticsearchExporter.HttpClient = options.HttpClient options.ElasticsearchExporter.HttpClient = options.HttpClient
exporter, err := es.New(options.ElasticsearchExporter) exporter, err := es.New(options.ElasticsearchExporter)
if err != nil { if err != nil {
return nil, errors.Join(err, ErrExportClientCreation) return nil, errorutil.NewWithErr(err).Wrap(ErrExportClientCreation)
} }
client.exporters = append(client.exporters, exporter) client.exporters = append(client.exporters, exporter)
} }
@ -144,7 +145,7 @@ func New(options *Options, db string) (Client, error) {
options.SplunkExporter.HttpClient = options.HttpClient options.SplunkExporter.HttpClient = options.HttpClient
exporter, err := splunk.New(options.SplunkExporter) exporter, err := splunk.New(options.SplunkExporter)
if err != nil { if err != nil {
return nil, errors.Join(err, ErrExportClientCreation) return nil, errorutil.NewWithErr(err).Wrap(ErrExportClientCreation)
} }
client.exporters = append(client.exporters, exporter) client.exporters = append(client.exporters, exporter)
} }
@ -222,12 +223,12 @@ func (c *ReportingClient) CreateIssue(event *output.ResultEvent) error {
if unique { if unique {
for _, tracker := range c.trackers { for _, tracker := range c.trackers {
if trackerErr := tracker.CreateIssue(event); trackerErr != nil { if trackerErr := tracker.CreateIssue(event); trackerErr != nil {
err = errors.Join(err, trackerErr) err = multierr.Append(err, trackerErr)
} }
} }
for _, exporter := range c.exporters { for _, exporter := range c.exporters {
if exportErr := exporter.Export(event); exportErr != nil { if exportErr := exporter.Export(event); exportErr != nil {
err = errors.Join(err, exportErr) err = multierr.Append(err, exportErr)
} }
} }
} }