fix(report): fill cert alerts from NVD and JVN feeds (#899)

* fix(report): fill cert alerts from NVD and JVN feeds

* fix import alias cve to cvemodels

* fix import alias cve to cvemodels

* remove unnecessary func

models/scanresults.go

@@ -24,8 +24,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/future-architect/vuls/alert"
-
 	"github.com/future-architect/vuls/config"
 	"github.com/future-architect/vuls/cwe"
 	"github.com/future-architect/vuls/util"
@@ -118,12 +116,6 @@ type CweDictEntry struct {
 	OwaspTopTen2017 string   `json:"owaspTopTen2017"`
 }
 
-// GetAlertsByCveID return alerts fetched by cveID
-func GetAlertsByCveID(cveID string, lang string) (alerts []alert.Alert) {
-	alerts = alert.GenerateAlertDict(cveID, lang)
-	return alerts
-}
-
 // Kernel has the Release, version and whether need restart
 type Kernel struct {
 	Release        string `json:"release"`

models/vulninfos.go

@@ -24,8 +24,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/future-architect/vuls/alert"
-
 	"github.com/future-architect/vuls/config"
 	exploitmodels "github.com/mozqnet/go-exploitdb/models"
 )
@@ -177,6 +175,13 @@ type VulnInfo struct {
 	VulnType string `json:"vulnType,omitempty"`
 }
 
+// Alert has XCERT alert information
+type Alert struct {
+	URL   string `json:"url,omitempty"`
+	Title string `json:"title,omitempty"`
+	Team  string `json:"team,omitempty"`
+}
+
 // GitHubSecurityAlerts is a list of GitHubSecurityAlert
 type GitHubSecurityAlerts []GitHubSecurityAlert
 
@@ -785,13 +790,8 @@ type Exploit struct {
 
 // AlertDict has target cve's JPCERT and USCERT alert data
 type AlertDict struct {
-	Ja []alert.Alert `json:"ja"`
-	En []alert.Alert `json:"en"`
-}
-
-// HasAlert returns whether or not it has En or Ja entries.
-func (a AlertDict) HasAlert() bool {
-	return len(a.En) != 0 || len(a.Ja) != 0
+	Ja []Alert `json:"ja"`
+	En []Alert `json:"en"`
 }
 
 // FormatSource returns which source has this alert