tdsds.com/gitea
tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-27 19:14:27 +00:00
Code Releases Activity

Use time.RFC1123 and make the http.Client proxy-aware

Browse Source
This commit is contained in:
Anthony Wang 2022-03-28 12:37:52 -05:00
parent 373a84a8e2
commit d1a53f7d6a
No known key found for this signature in database
GPG Key ID: BC96B00AEC5F2D76
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/activitypub/client.go
View File

@ -11,8 +11,10 @@ import (
"encoding/pem" "encoding/pem"
"fmt" "fmt"
"net/http" "net/http"
"time"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/proxy"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"github.com/go-fed/activity/pub" "github.com/go-fed/activity/pub"
@ -84,7 +86,11 @@ func NewClient(user *user_model.User, pubID string) (c *Client, err error) {
c = &Client{ c = &Client{
clock: clock, clock: clock,
client: &http.Client{}, client: &http.Client{
Transport: &http.Transport{
Proxy: proxy.Proxy(),
},
},
algs: algos, algs: algos,
digestAlg: httpsig.DigestAlgorithm(setting.Federation.DigestAlgorithm), digestAlg: httpsig.DigestAlgorithm(setting.Federation.DigestAlgorithm),
getHeaders: setting.Federation.GetHeaders, getHeaders: setting.Federation.GetHeaders,
@ -106,7 +112,7 @@ func (c *Client) NewRequest(b []byte, to string) (req *http.Request, err error)
} }
req.Header.Add("Content-Type", ActivityStreamsContentType) req.Header.Add("Content-Type", ActivityStreamsContentType)
req.Header.Add("Accept-Charset", "utf-8") req.Header.Add("Accept-Charset", "utf-8")
req.Header.Add("Date", fmt.Sprintf("%s GMT", c.clock.Now().UTC().Format("Mon, 02 Jan 2006 15:04:05"))) req.Header.Add("Date", fmt.Sprintf("%s GMT", c.clock.Now().UTC().Format(time.RFC1123)))
signer, _, err := httpsig.NewSigner(c.algs, c.digestAlg, c.postHeaders, httpsig.Signature, 60) signer, _, err := httpsig.NewSigner(c.algs, c.digestAlg, c.postHeaders, httpsig.Signature, 60)
if err != nil { if err != nil {