oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-07-02 16:38:37 +00:00
Code Wiki Activity

Show correct User Agent in input placeholders

Browse source
This commit is contained in:
Frédéric Guillot 2020-12-16 21:16:04 -08:00 • committed by fguillot
parent e589a35c67
commit 2cf9bde1af
15 changed files with 37 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

16
http/client/client.go
View file

@ -22,7 +22,6 @@ import (
"miniflux.app/logger"
"miniflux.app/timer"
url_helper "miniflux.app/url"
"miniflux.app/version"
)
const (
@ -31,9 +30,6 @@ const (
)
var (
// DefaultUserAgent sets the User-Agent header used for any requests by miniflux.
DefaultUserAgent = "Mozilla/5.0 (compatible; Miniflux/" + version.Version + "; +https://miniflux.app)"
errInvalidCertificate = "Invalid SSL certificate (original error: %q)"
errTemporaryNetworkOperation = "This website is temporarily unreachable (original error: %q)"
errPermanentNetworkOperation = "This website is permanently unreachable (original error: %q)"
@ -64,7 +60,6 @@ type Client struct {
func New(url string) *Client {
return &Client{
inputURL: url,
requestUserAgent: DefaultUserAgent,
ClientTimeout: defaultHTTPClientTimeout,
ClientMaxBodySize: defaultHTTPClientMaxBodySize,
}
@ -72,13 +67,9 @@ func New(url string) *Client {
// NewClientWithConfig initializes a new HTTP client with application config options.
func NewClientWithConfig(url string, opts *config.Options) *Client {
userAgent := opts.HTTPClientUserAgent()
if userAgent == "" {
userAgent = DefaultUserAgent
}
return &Client{
inputURL: url,
requestUserAgent: userAgent,
requestUserAgent: opts.HTTPClientUserAgent(),
ClientTimeout: opts.HTTPClientTimeout(),
ClientMaxBodySize: opts.HTTPClientMaxBodySize(),
ClientProxyURL: opts.HTTPClientProxy(),
@ -321,9 +312,12 @@ func (c *Client) buildClient() http.Client {
func (c *Client) buildHeaders() http.Header {
headers := make(http.Header)
headers.Add("User-Agent", c.requestUserAgent)
headers.Add("Accept", "*/*")
if c.requestUserAgent != "" {
headers.Add("User-Agent", c.requestUserAgent)
}
if c.requestEtagHeader != "" {
headers.Add("If-None-Match", c.requestEtagHeader)
}

21
http/client/client_test.go
View file

@ -5,10 +5,7 @@
package client // import "miniflux.app/http/client"
import (
"os"
"testing"
"miniflux.app/config"
)
func TestClientWithDelay(t *testing.T) {
@ -54,21 +51,3 @@ func TestClientWithBasicAuth(t *testing.T) {
t.Fatalf(`The client should be authenticated successfully: %v`, err)
}
}
func TestClientRequestUserAgent(t *testing.T) {
clt := New("http://httpbin.org")
if clt.requestUserAgent != DefaultUserAgent {
t.Errorf(`The client had default User-Agent %q, wanted %q`, clt.requestUserAgent, DefaultUserAgent)
}
userAgent := "Custom User Agent"
os.Setenv("HTTP_CLIENT_USER_AGENT", userAgent)
opts, err := config.NewParser().ParseEnvironmentVariables()
if err != nil {
t.Fatalf(`Parsing config failed: %v`, err)
}
clt = NewClientWithConfig("http://httpbin.org", opts)
if clt.requestUserAgent != userAgent {
t.Errorf(`The client had User-Agent %q, wanted %q`, clt.requestUserAgent, userAgent)
}
}