diff options
| author | René 'Necoro' Neumann <necoro@necoro.eu> | 2020-05-04 00:28:49 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.eu> | 2020-05-04 00:28:49 +0200 |
| commit | 1e62523249b9837233367bfc37a82b03243c5b9f (patch) | |
| tree | 24925264270a42f5f01ecbadd417262ab05049e1 /internal | |
| parent | 864194f470bdd7f74e39d0fe0cdd0ca215693560 (diff) | |
| download | feed2imap-go-1e62523249b9837233367bfc37a82b03243c5b9f.tar.gz feed2imap-go-1e62523249b9837233367bfc37a82b03243c5b9f.tar.bz2 feed2imap-go-1e62523249b9837233367bfc37a82b03243c5b9f.zip | |
when tls verification is disabled for the feed, we should also disable this for the images
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/feed/mail.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/internal/feed/mail.go b/internal/feed/mail.go index 5e308e2..3cb442e 100644 --- a/internal/feed/mail.go +++ b/internal/feed/mail.go @@ -7,6 +7,7 @@ import ( "io" "io/ioutil" "mime" + "net/http" "net/url" "path" "strings" @@ -192,8 +193,8 @@ func (feed *Feed) Messages() (msg.Messages, error) { return mails, nil } -func getImage(src string) ([]byte, string, error) { - resp, err := stdHTTPClient.Get(src) +func getImage(src string, client *http.Client) ([]byte, string, error) { + resp, err := client.Get(src) if err != nil { return nil, "", fmt.Errorf("fetching from '%s': %w", src, err) } @@ -277,7 +278,7 @@ func (item *item) buildBody() { } imgUrl := feedUrl.ResolveReference(srcUrl) - img, mime, err := getImage(imgUrl.String()) + img, mime, err := getImage(imgUrl.String(), httpClient(feed.NoTLS)) if err != nil { log.Errorf("Feed %s: Item %s: Error fetching image: %s", feed.Name, item.Item.Link, err) |