aboutsummaryrefslogtreecommitdiffhomepage
path: root/reader
diff options
context:
space:
mode:
authorGravatar Frédéric Guillot <fred@miniflux.net>2017-12-02 19:32:14 -0800
committerGravatar Frédéric Guillot <fred@miniflux.net>2017-12-02 19:32:14 -0800
commit2356ddad28d50aacc8bbb3e020792d3b92f2fb4d (patch)
treea881d13d2fcc2e0d0fef2f7d26cfd2d6b044209f /reader
parent2f1367a8d4c33e7c6ba459cfc6756e079c7a1af4 (diff)
Add Pinboard integration
Diffstat (limited to 'reader')
-rw-r--r--reader/http/client.go53
1 files changed, 34 insertions, 19 deletions
diff --git a/reader/http/client.go b/reader/http/client.go
index de0558c..3b4488f 100644
--- a/reader/http/client.go
+++ b/reader/http/client.go
@@ -23,22 +23,17 @@ type Client struct {
url string
etagHeader string
lastModifiedHeader string
+ username string
+ password string
Insecure bool
}
// Get execute a GET HTTP request.
-func (h *Client) Get() (*Response, error) {
- defer helper.ExecutionTime(time.Now(), fmt.Sprintf("[HttpClient:Get] url=%s", h.url))
- u, _ := url.Parse(h.url)
+func (c *Client) Get() (*Response, error) {
+ defer helper.ExecutionTime(time.Now(), fmt.Sprintf("[HttpClient:Get] url=%s", c.url))
- req := &http.Request{
- URL: u,
- Method: http.MethodGet,
- Header: h.buildHeaders(),
- }
-
- client := h.buildClient()
- resp, err := client.Do(req)
+ client := c.buildClient()
+ resp, err := client.Do(c.buildRequest())
if err != nil {
return nil, err
}
@@ -53,7 +48,7 @@ func (h *Client) Get() (*Response, error) {
}
log.Println("[HttpClient:Get]",
- "OriginalURL:", h.url,
+ "OriginalURL:", c.url,
"StatusCode:", response.StatusCode,
"ETag:", response.ETag,
"LastModified:", response.LastModified,
@@ -63,9 +58,24 @@ func (h *Client) Get() (*Response, error) {
return response, err
}
-func (h *Client) buildClient() http.Client {
+func (c *Client) buildRequest() *http.Request {
+ link, _ := url.Parse(c.url)
+ request := &http.Request{
+ URL: link,
+ Method: http.MethodGet,
+ Header: c.buildHeaders(),
+ }
+
+ if c.username != "" && c.password != "" {
+ request.SetBasicAuth(c.username, c.password)
+ }
+
+ return request
+}
+
+func (c *Client) buildClient() http.Client {
client := http.Client{Timeout: time.Duration(requestTimeout * time.Second)}
- if h.Insecure {
+ if c.Insecure {
client.Transport = &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
@@ -74,16 +84,16 @@ func (h *Client) buildClient() http.Client {
return client
}
-func (h *Client) buildHeaders() http.Header {
+func (c *Client) buildHeaders() http.Header {
headers := make(http.Header)
headers.Add("User-Agent", userAgent)
- if h.etagHeader != "" {
- headers.Add("If-None-Match", h.etagHeader)
+ if c.etagHeader != "" {
+ headers.Add("If-None-Match", c.etagHeader)
}
- if h.lastModifiedHeader != "" {
- headers.Add("If-Modified-Since", h.lastModifiedHeader)
+ if c.lastModifiedHeader != "" {
+ headers.Add("If-Modified-Since", c.lastModifiedHeader)
}
return headers
@@ -94,6 +104,11 @@ func NewClient(url string) *Client {
return &Client{url: url, Insecure: false}
}
+// NewClientWithCredentials returns a new HTTP client that require authentication.
+func NewClientWithCredentials(url, username, password string) *Client {
+ return &Client{url: url, Insecure: false, username: username, password: password}
+}
+
// NewClientWithCacheHeaders returns a new HTTP client that send cache headers.
func NewClientWithCacheHeaders(url, etagHeader, lastModifiedHeader string) *Client {
return &Client{url: url, etagHeader: etagHeader, lastModifiedHeader: lastModifiedHeader, Insecure: false}