Skip to content

Commit 378b707

Browse files
authored
Merge pull request XmirrorSecurity#281 from luotianqi777/report_log
feat: task report log
2 parents 72c6ccc + 86c8ebe commit 378b707

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

cmd/detail/detail.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,10 @@ func SearchDetail(detailRoot *DepDetailGraph) (err error) {
228228
c := config.Conf().Origin
229229
if c.Url != "" && c.Token != "" {
230230
// vulnerability
231+
logs.Info("get server vuln")
231232
serverVulns, err = GetServerVuln(ds)
232233
// license
234+
logs.Info("get server license")
233235
serverLicenses, _ := GetServerLicense(ds)
234236
for i, lics := range serverLicenses {
235237
if len(lics) > 0 {
@@ -268,6 +270,7 @@ func SearchDetail(detailRoot *DepDetailGraph) (err error) {
268270
}
269271

270272
// 统计关联/间接漏洞
273+
logs.Info("calculate indirect vuln")
271274
var deps []*DepDetailGraph
272275
detailRoot.ForEach(func(n *DepDetailGraph) bool {
273276
deps = append(deps, n)

main.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ func taskReport(r opensca.TaskResult) format.Report {
208208
absPath, _ := filepath.Abs(path)
209209
appName := filepath.Base(absPath)
210210

211+
logs.Info("prepare report")
212+
211213
report := format.Report{}
212214
report.TaskInfo.ToolVersion = version
213215
report.TaskInfo.AppName = appName
@@ -230,11 +232,13 @@ func taskReport(r opensca.TaskResult) format.Report {
230232

231233
// 组件去重
232234
if optional.Dedup {
235+
logs.Info("remove dup component")
233236
report.RemoveDedup()
234237
}
235238

236239
// 去掉dev组件
237240
if !optional.SaveDev {
241+
logs.Info("remove dev component")
238242
report.RemoveDev()
239243
}
240244

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

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

0 commit comments

Comments
 (0)