diff --git a/config/config.go b/config/config.go index 252f5171..a30da1d1 100644 --- a/config/config.go +++ b/config/config.go @@ -76,7 +76,6 @@ type Config struct { ToS3 bool `json:"toS3,omitempty"` ToAzureBlob bool `json:"toAzureBlob,omitempty"` ToHTTP bool `json:"toHTTP,omitempty"` - FormatXML bool `json:"formatXML,omitempty"` FormatJSON bool `json:"formatJSON,omitempty"` FormatOneEMail bool `json:"formatOneEMail,omitempty"` FormatOneLineText bool `json:"formatOneLineText,omitempty"` diff --git a/report/azureblob.go b/report/azureblob.go index 23150485..f2b9d4e8 100644 --- a/report/azureblob.go +++ b/report/azureblob.go @@ -3,7 +3,6 @@ package report import ( "bytes" "encoding/json" - "encoding/xml" "fmt" "time" @@ -66,18 +65,6 @@ func (w AzureBlobWriter) Write(rs ...models.ScanResult) (err error) { return err } } - - if c.Conf.FormatXML { - k := key + ".xml" - var b []byte - if b, err = xml.Marshal(r); err != nil { - return xerrors.Errorf("Failed to Marshal to XML: %w", err) - } - allBytes := bytes.Join([][]byte{[]byte(xml.Header + vulsOpenTag), b, []byte(vulsCloseTag)}, []byte{}) - if err := createBlockBlob(cli, k, allBytes); err != nil { - return err - } - } } return } diff --git a/report/localfile.go b/report/localfile.go index 94fb9373..545a129b 100644 --- a/report/localfile.go +++ b/report/localfile.go @@ -1,9 +1,7 @@ package report import ( - "bytes" "encoding/json" - "encoding/xml" "io/ioutil" "os" "path/filepath" @@ -79,24 +77,6 @@ func (w LocalFileWriter) Write(rs ...models.ScanResult) (err error) { } } - if c.Conf.FormatXML { - var p string - if c.Conf.Diff { - p = path + "_diff.xml" - } else { - p = path + ".xml" - } - - var b []byte - if b, err = xml.Marshal(r); err != nil { - return xerrors.Errorf("Failed to Marshal to XML: %w", err) - } - allBytes := bytes.Join([][]byte{[]byte(xml.Header + vulsOpenTag), b, []byte(vulsCloseTag)}, []byte{}) - if err := writeFile(p, allBytes, 0600); err != nil { - return xerrors.Errorf("Failed to write XML. path: %s, err: %w", p, err) - } - } - if c.Conf.FormatCsvList { p := path + "_short.csv" if c.Conf.Diff { diff --git a/report/s3.go b/report/s3.go index 7041d1e7..c87b87b5 100644 --- a/report/s3.go +++ b/report/s3.go @@ -3,7 +3,6 @@ package report import ( "bytes" "encoding/json" - "encoding/xml" "fmt" "path" "time" @@ -92,18 +91,6 @@ func (w S3Writer) Write(rs ...models.ScanResult) (err error) { return err } } - - if c.Conf.FormatXML { - k := key + ".xml" - var b []byte - if b, err = xml.Marshal(r); err != nil { - return xerrors.Errorf("Failed to Marshal to XML: %w", err) - } - allBytes := bytes.Join([][]byte{[]byte(xml.Header + vulsOpenTag), b, []byte(vulsCloseTag)}, []byte{}) - if err := putObject(svc, k, allBytes); err != nil { - return err - } - } } return nil } diff --git a/scan/freebsd.go b/scan/freebsd.go index 8abfc51a..a80c86da 100644 --- a/scan/freebsd.go +++ b/scan/freebsd.go @@ -70,7 +70,8 @@ func (o *bsd) checkDeps() error { func (o *bsd) preCure() error { if err := o.detectIPAddr(); err != nil { - o.log.Debugf("Failed to detect IP addresses: %s", err) + o.log.Warnf("Failed to detect IP addresses: %s", err) + o.warns = append(o.warns, err) } // Ignore this error as it just failed to detect the IP addresses return nil diff --git a/subcmds/report.go b/subcmds/report.go index 3b1c3721..8b64a507 100644 --- a/subcmds/report.go +++ b/subcmds/report.go @@ -56,7 +56,6 @@ func (*ReportCmd) Usage() string { [-to-s3] [-to-azure-blob] [-format-json] - [-format-xml] [-format-one-email] [-format-one-line-text] [-format-list] @@ -116,7 +115,6 @@ func (p *ReportCmd) SetFlags(f *flag.FlagSet) { "http://proxy-url:port (default: empty)") f.BoolVar(&c.Conf.FormatJSON, "format-json", false, "JSON format") - f.BoolVar(&c.Conf.FormatXML, "format-xml", false, "XML format") f.BoolVar(&c.Conf.FormatCsvList, "format-csv", false, "CSV format") f.BoolVar(&c.Conf.FormatOneEMail, "format-one-email", false, "Send all the host report via only one EMail (Specify with -to-email)") @@ -133,10 +131,10 @@ func (p *ReportCmd) SetFlags(f *flag.FlagSet) { f.BoolVar(&c.Conf.ToSyslog, "to-syslog", false, "Send report via Syslog") f.BoolVar(&c.Conf.ToLocalFile, "to-localfile", false, "Write report to localfile") f.BoolVar(&c.Conf.ToS3, "to-s3", false, - "Write report to S3 (bucket/yyyyMMdd_HHmm/servername.json/xml/txt)") + "Write report to S3 (bucket/yyyyMMdd_HHmm/servername.json/txt)") f.BoolVar(&c.Conf.ToHTTP, "to-http", false, "Send report via HTTP POST") f.BoolVar(&c.Conf.ToAzureBlob, "to-azure-blob", false, - "Write report to Azure Storage blob (container/yyyyMMdd_HHmm/servername.json/xml/txt)") + "Write report to Azure Storage blob (container/yyyyMMdd_HHmm/servername.json/txt)") f.BoolVar(&c.Conf.GZIP, "gzip", false, "gzip compression") f.BoolVar(&c.Conf.Pipe, "pipe", false, "Use args passed via PIPE") @@ -174,7 +172,7 @@ func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{} } if !(c.Conf.FormatJSON || c.Conf.FormatOneLineText || - c.Conf.FormatList || c.Conf.FormatFullText || c.Conf.FormatXML || c.Conf.FormatCsvList) { + c.Conf.FormatList || c.Conf.FormatFullText || c.Conf.FormatCsvList) { c.Conf.FormatList = true }