Skip to content

Commit 0ab851a

Browse files
committed
Use a default user agent
1 parent 257c316 commit 0ab851a

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

cmd/csaf_aggregator/config.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,11 @@ func (c *config) httpClient(p *provider) util.Client {
301301
Client: client,
302302
Header: c.ExtraHeader,
303303
}
304+
default:
305+
client = &util.HeaderClient{
306+
Client: client,
307+
Header: http.Header{},
308+
}
304309
}
305310

306311
if c.Verbose {

cmd/csaf_checker/processor.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -435,11 +435,9 @@ func (p *processor) fullClient() util.Client {
435435
client := util.Client(&hClient)
436436

437437
// Add extra headers.
438-
if len(p.cfg.ExtraHeader) > 0 {
439-
client = &util.HeaderClient{
440-
Client: client,
441-
Header: p.cfg.ExtraHeader,
442-
}
438+
client = &util.HeaderClient{
439+
Client: client,
440+
Header: p.cfg.ExtraHeader,
443441
}
444442

445443
// Add optional URL logging.

cmd/csaf_downloader/downloader.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,9 @@ func (d *downloader) httpClient() util.Client {
126126
client := util.Client(&hClient)
127127

128128
// Add extra headers.
129-
if len(d.cfg.ExtraHeader) > 0 {
130-
client = &util.HeaderClient{
131-
Client: client,
132-
Header: d.cfg.ExtraHeader,
133-
}
129+
client = &util.HeaderClient{
130+
Client: client,
131+
Header: d.cfg.ExtraHeader,
134132
}
135133

136134
// Add optional URL logging.

cmd/csaf_downloader/forwarder.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,9 @@ func (f *forwarder) httpClient() util.Client {
111111
client := util.Client(&hClient)
112112

113113
// Add extra headers.
114-
if len(f.cfg.ForwardHeader) > 0 {
115-
client = &util.HeaderClient{
116-
Client: client,
117-
Header: f.cfg.ForwardHeader,
118-
}
114+
client = &util.HeaderClient{
115+
Client: client,
116+
Header: f.cfg.ForwardHeader,
119117
}
120118

121119
// Add optional URL logging.

util/client.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ func (hc *HeaderClient) Do(req *http.Request) (*http.Response, error) {
6161
req.Header.Add(key, v)
6262
}
6363
}
64+
65+
// Use default user agent if none is set
66+
if userAgent := hc.Header.Get("User-Agent"); userAgent == "" {
67+
req.Header.Add("User-Agent", "csaf-distribution/"+SemVersion)
68+
}
6469
return hc.Client.Do(req)
6570
}
6671

0 commit comments

Comments
 (0)