aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.eu>2020-05-04 00:28:49 +0200
committerRené 'Necoro' Neumann <necoro@necoro.eu>2020-05-04 00:28:49 +0200
commit1e62523249b9837233367bfc37a82b03243c5b9f (patch)
tree24925264270a42f5f01ecbadd417262ab05049e1
parent864194f470bdd7f74e39d0fe0cdd0ca215693560 (diff)
downloadfeed2imap-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
-rw-r--r--internal/feed/mail.go7
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)
:15:04 +0200'>2008-07-08Documented the plugin moduleRené 'Necoro' Neumann2-32/+229 2008-07-04Ported remaining pluginsRené 'Necoro' Neumann6-89/+100 2008-07-04Removed lxml version in error stringRené 'Necoro' Neumann1-2/+1 2008-07-04Removed lxml version in error stringRené 'Necoro' Neumann1-3/+1 2008-07-04Ignore errors on plugin loadingRené 'Necoro' Neumann1-0/+6 2008-07-04Added ability to install missing plugin depsRené 'Necoro' Neumann3-95/+126 2008-07-04Fixed find_best_match for <portage-2.1.5René 'Necoro' Neumann1-2/+2 2008-07-04Some more dependency awarenessRené 'Necoro' Neumann5-23/+59 2008-07-03Some window refinementRené 'Necoro' Neumann1-109/+126 2008-07-03Removed XSD_LOCATION -- as there is no more xsd ;)René 'Necoro' Neumann2-5/+1 2008-07-03Updated setup.py to install the correct set of pluginsRené 'Necoro' Neumann1-3/+2 2008-07-03Ported etc-proposals pluginRené 'Necoro' Neumann3-50/+43 2008-07-03Ported gpytage pluginRené 'Necoro' Neumann2-16/+14 2008-07-03Ported Notify pluginRené 'Necoro' Neumann4-37/+51 2008-07-03Remove xsd and -x cmdline optionRené 'Necoro' Neumann2-107/+1 2008-07-03Ported completelyRené 'Necoro' Neumann3-548/+54 2008-07-03Should show dependencies nowRené 'Necoro' Neumann2-82/+128 2008-07-03Use __slots__ for the PkgData class to save memoryRené 'Necoro' Neumann1-2/+3 2008-07-03New plugin system - first hackRené 'Necoro' Neumann2-420/+683 2008-06-30Now the new design is able to do the same as the old oneRené 'Necoro' Neumann3-168/+182 2008-06-30First draft of the new plugin windowRené 'Necoro' Neumann1-8/+172 2008-06-30Added stuff to plugin.pyRené 'Necoro' Neumann1-2/+24 2008-06-30Beautified some dialogsRené 'Necoro' Neumann1-6/+8 2008-06-30Only add a package to mergequeue if everything went fineRené 'Necoro' Neumann1-1/+1 2008-06-26Removed '__find_resolved_unresolved' as it is quite useless.René 'Necoro' Neumann3-53/+29 2008-06-26Added very basic set queryingRené 'Necoro' Neumann3-0/+27 2008-06-25Now load 22 versions when running the correct portageRené 'Necoro' Neumann4-8/+18 2008-06-25Added Package_22 and System_22René 'Necoro' Neumann4-5/+63