peter/websub-hub
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Don't overwrite the real request

Browse Source
This commit is contained in:
Peter Stuifzand 2018-04-08 00:36:24 +02:00
parent 27f8c9611d
commit 961a653160
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/hubserver/main.go
View File

@ -66,15 +66,16 @@ func (handler *subscriptionHandler) handlePublish(w http.ResponseWriter, r *http
if subs, e := handler.Subscribers[topic]; e { if subs, e := handler.Subscribers[topic]; e {
for _, sub := range subs { for _, sub := range subs {
handler.incStat(fmt.Sprintf("publish.post.%s.%s", topic, sub.Callback)) handler.incStat(fmt.Sprintf("publish.post.%s.%s", topic, sub.Callback))
log.Printf("publish: creating post to %s\n", sub.Callback) log.Printf("publish: creating post to %s\n", sub.Callback)
req, err := http.NewRequest("POST", sub.Callback, strings.NewReader(string(feedContent))) postReq, err := http.NewRequest("POST", sub.Callback, strings.NewReader(string(feedContent)))
if err != nil { if err != nil {
log.Printf("While creating request to %s: %s", sub.Callback, err) log.Printf("While creating request to %s: %s", sub.Callback, err)
continue continue
} }
req.Header.Add("Content-Type", res.Header.Get("Content-Type")) postReq.Header.Add("Content-Type", res.Header.Get("Content-Type"))
req.Header.Add("Link", postReq.Header.Add("Link",
fmt.Sprintf( fmt.Sprintf(
"<%s>; rel=hub, <%s>; rel=self", "<%s>; rel=hub, <%s>; rel=self",
"https://hub.stuifzandapp.com/", "https://hub.stuifzandapp.com/",
@ -84,16 +85,16 @@ func (handler *subscriptionHandler) handlePublish(w http.ResponseWriter, r *http
mac := hmac.New(sha1.New, []byte(sub.Secret)) mac := hmac.New(sha1.New, []byte(sub.Secret))
mac.Write(feedContent) mac.Write(feedContent)
signature := mac.Sum(nil) signature := mac.Sum(nil)
req.Header.Add("X-Hub-Signature", fmt.Sprintf("sha1=%x", signature)) postReq.Header.Add("X-Hub-Signature", fmt.Sprintf("sha1=%x", signature))
} }
res, err = client.Do(req) postRes, err = client.Do(postReq)
if err != nil { if err != nil {
log.Printf("While POSTing to %s: %s", sub.Callback, err) log.Printf("While POSTing to %s: %s", sub.Callback, err)
continue continue
} }
log.Printf("publish: post send to %s\n", sub.Callback) log.Printf("publish: post send to %s\n", sub.Callback)
log.Println("Response:") log.Println("Response:")
res.Write(os.Stdout) postRes.Write(os.Stdout)
} }
} else { } else {