peter/ekster
1
0
Fork 0
Code Issues 3 Pull Requests Projects 3 Releases 1 Wiki Activity

fix: read twice from body
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Peter Stuifzand 2021-10-21 23:14:55 +02:00
parent 6e347bd493
commit 79b0d719ec
Signed by: peter
GPG Key ID: 374322D56E5209E8
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/eksterd/memory.go
View File

@ -7,6 +7,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"log" "log"
"net/http" "net/http"
"net/url" "net/url"
@ -589,8 +590,14 @@ func (b *memoryBackend) Events() (chan sse.Message, error) {
// ProcessSourcedItems processes items and adds the Source // ProcessSourcedItems processes items and adds the Source
func ProcessSourcedItems(fetcher fetch.FetcherFunc, fetchURL, contentType string, body io.Reader) ([]microsub.Item, error) { func ProcessSourcedItems(fetcher fetch.FetcherFunc, fetchURL, contentType string, body io.Reader) ([]microsub.Item, error) {
// When the source is available from the Header, we fill the Source of the item // When the source is available from the Header, we fill the Source of the item
bodyBytes, err := ioutil.ReadAll(body)
if err != nil {
return nil, err
}
var source *microsub.Source var source *microsub.Source
if header, err := fetch.FeedHeader(fetcher, fetchURL, contentType, body); err == nil { if header, err := fetch.FeedHeader(fetcher, fetchURL, contentType, bytes.NewBuffer(bodyBytes)); err == nil {
source = &microsub.Source{ source = &microsub.Source{
ID: header.URL, ID: header.URL,
URL: header.URL, URL: header.URL,
@ -604,7 +611,7 @@ func ProcessSourcedItems(fetcher fetch.FetcherFunc, fetchURL, contentType string
} }
} }
items, err := fetch.FeedItems(fetcher, fetchURL, contentType, body) items, err := fetch.FeedItems(fetcher, fetchURL, contentType, bytes.NewBuffer(bodyBytes))
if err != nil { if err != nil {
return nil, err return nil, err
} }