Skip to content

feat: task report log #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luotianqi777 merged 1 commit into from
Feb 20, 2024
Merged

feat: task report log #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cmd/detail/detail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,10 @@ func SearchDetail(detailRoot *DepDetailGraph) (err error) {
c := config.Conf().Origin
if c.Url != "" && c.Token != "" {
// vulnerability
logs.Info("get server vuln")
serverVulns, err = GetServerVuln(ds)
// license
logs.Info("get server license")
serverLicenses, _ := GetServerLicense(ds)
for i, lics := range serverLicenses {
if len(lics) > 0 {
Expand Down Expand Up @@ -268,6 +270,7 @@ func SearchDetail(detailRoot *DepDetailGraph) (err error) {
}

// 统计关联/间接漏洞
logs.Info("calculate indirect vuln")
var deps []*DepDetailGraph
detailRoot.ForEach(func(n *DepDetailGraph) bool {
deps = append(deps, n)
Expand Down
5 changes: 5 additions & 0 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@ func taskReport(r opensca.TaskResult) format.Report {
absPath, _ := filepath.Abs(path)
appName := filepath.Base(absPath)

logs.Info("prepare report")

report := format.Report{}
report.TaskInfo.ToolVersion = version
report.TaskInfo.AppName = appName
Expand All @@ -230,11 +232,13 @@ func taskReport(r opensca.TaskResult) format.Report {

// 组件去重
if optional.Dedup {
logs.Info("remove dup component")
report.RemoveDedup()
}

// 去掉dev组件
if !optional.SaveDev {
logs.Info("remove dev component")
report.RemoveDev()
}

Expand All @@ -250,6 +254,7 @@ func taskReport(r opensca.TaskResult) format.Report {

// 仅保留漏洞组件
if optional.VulnOnly {
logs.Info("remove no-vuln component")
var deps []*detail.DepDetailGraph
report.ForEach(func(n *detail.DepDetailGraph) bool {
if len(n.Vulnerabilities) > 0 {
Expand Down