@@ -44,7 +44,7 @@ func NewThreatBookCrawler() Grabber {
44
44
client .SetCommonHeader ("Accept-Language" , "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6" )
45
45
46
46
return & ThreatBookCrawler {
47
- log : golog .Child ("[ThreatBook-Vuln ]" ),
47
+ log : golog .Child ("[threatbook ]" ),
48
48
client : client ,
49
49
}
50
50
}
@@ -104,7 +104,6 @@ func (t *ThreatBookCrawler) getVulnInfoFromFeed(ctx context.Context, rss *gofeed
104
104
doc .Find (`td:contains('交互要求') + td` ).Text (),
105
105
doc .Find (`td:contains('威胁类型') + td` ).Text (),
106
106
}
107
- t .log .Debugf ("%+v" , vuln )
108
107
vuln .Creator = t
109
108
return & vuln , nil
110
109
}
@@ -118,24 +117,25 @@ func (t *ThreatBookCrawler) ProviderInfo() *Provider {
118
117
}
119
118
120
119
func (t * ThreatBookCrawler ) GetUpdate (ctx context.Context , pageLimit int ) ([]* VulnInfo , error ) {
121
- ctx , cancel := context .WithTimeout (ctx , 10 * time .Second ) // 增加超时
120
+ ctx , cancel := context .WithTimeout (ctx , 60 * time .Second ) // 增加超时
122
121
defer cancel ()
123
122
fp := gofeed .NewParser ()
124
123
feed , err := fp .ParseURLWithContext (ThreatbookUrl , ctx )
125
124
if err != nil {
126
- t .log .Errorf ("Error in Parsing URL: %v, please check it " , ThreatbookUrl )
125
+ t .log .Errorf ("error parsing %v " , ThreatbookUrl )
127
126
return nil , err
128
127
}
129
128
allVulns := getAllVulnItems (feed )
130
- numOfVuln := len (allVulns )
131
- t .log .Debugf ("===GET %d vulns===" , numOfVuln )
132
-
133
129
// 开始判断漏洞重要性,组装漏洞信息
134
130
var results []* VulnInfo
135
131
136
132
for _ , v := range allVulns {
137
- t .log .Debugf ("Parsing %v at %v" , v .Title , v .Link )
138
- vuln , _ := t .getVulnInfoFromFeed (ctx , v )
133
+ t .log .Debugf ("parsing %v at %v" , v .Title , v .Link )
134
+ vuln , err := t .getVulnInfoFromFeed (ctx , v )
135
+ if err != nil {
136
+ t .log .Error (err )
137
+ continue
138
+ }
139
139
results = append (results , vuln )
140
140
}
141
141
0 commit comments