mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-30 19:52:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[bugfix] Set the Host header within the signing transport (#2799)

Browse source
This commit is contained in:
kim 2024-04-02 13:28:36 +01:00 • committed by GitHub
commit e664d0918b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/httpclient/sign.go
View file

@ -37,6 +37,9 @@ type signingtransport struct {
} }
func (t *signingtransport) RoundTrip(r *http.Request) (*http.Response, error) { func (t *signingtransport) RoundTrip(r *http.Request) (*http.Response, error) {
// Ensure updated host always set.
r.Header.Set("Host", r.URL.Host)
if sign := gtscontext.HTTPClientSignFunc(r.Context()); sign != nil { if sign := gtscontext.HTTPClientSignFunc(r.Context()); sign != nil {
// Reset signing header fields // Reset signing header fields
now := time.Now().UTC() now := time.Now().UTC()

1
internal/processing/admin/debug_apurl.go
View file

@ -97,7 +97,6 @@ func (p *Processor) DebugAPUrl(
req.Header.Add("Accept", string(apiutil.AppActivityLDJSON)+","+string(apiutil.AppActivityJSON)) req.Header.Add("Accept", string(apiutil.AppActivityLDJSON)+","+string(apiutil.AppActivityJSON))
req.Header.Add("Accept-Charset", "utf-8") req.Header.Add("Accept-Charset", "utf-8")
req.Header.Set("Host", url.Host)
// Perform the HTTP request, // Perform the HTTP request,
// and return everything. // and return everything.

1
internal/transport/deliver.go
View file

@ -120,7 +120,6 @@ func (t *transport) deliver(ctx context.Context, b []byte, to *url.URL) error {
req.Header.Add("Content-Type", string(apiutil.AppActivityLDJSON)) req.Header.Add("Content-Type", string(apiutil.AppActivityLDJSON))
req.Header.Add("Accept-Charset", "utf-8") req.Header.Add("Accept-Charset", "utf-8")
req.Header.Set("Host", to.Host)
rsp, err := t.POST(req, b) rsp, err := t.POST(req, b)
if err != nil { if err != nil {

1
internal/transport/dereference.go
View file

@ -54,7 +54,6 @@ func (t *transport) Dereference(ctx context.Context, iri *url.URL) (*http.Respon
req.Header.Add("Accept", string(apiutil.AppActivityLDJSON)+","+string(apiutil.AppActivityJSON)) req.Header.Add("Accept", string(apiutil.AppActivityLDJSON)+","+string(apiutil.AppActivityJSON))
req.Header.Add("Accept-Charset", "utf-8") req.Header.Add("Accept-Charset", "utf-8")
req.Header.Set("Host", iri.Host)
// Perform the HTTP request // Perform the HTTP request
rsp, err := t.GET(req) rsp, err := t.GET(req)

3
internal/transport/derefinstance.go
View file

@ -93,7 +93,6 @@ func dereferenceByAPIV1Instance(ctx context.Context, t *transport, iri *url.URL)
} }
req.Header.Add("Accept", string(apiutil.AppJSON)) req.Header.Add("Accept", string(apiutil.AppJSON))
req.Header.Set("Host", cleanIRI.Host)
resp, err := t.GET(req) resp, err := t.GET(req)
if err != nil { if err != nil {
@ -250,7 +249,6 @@ func callNodeInfoWellKnown(ctx context.Context, t *transport, iri *url.URL) (*ur
return nil, err return nil, err
} }
req.Header.Add("Accept", string(apiutil.AppJSON)) req.Header.Add("Accept", string(apiutil.AppJSON))
req.Header.Set("Host", cleanIRI.Host)
resp, err := t.GET(req) resp, err := t.GET(req)
if err != nil { if err != nil {
@ -308,7 +306,6 @@ func callNodeInfo(ctx context.Context, t *transport, iri *url.URL) (*apimodel.No
return nil, err return nil, err
} }
req.Header.Add("Accept", string(apiutil.AppJSON)) req.Header.Add("Accept", string(apiutil.AppJSON))
req.Header.Set("Host", iri.Host)
resp, err := t.GET(req) resp, err := t.GET(req)
if err != nil { if err != nil {

1
internal/transport/derefmedia.go
View file

@ -36,7 +36,6 @@ func (t *transport) DereferenceMedia(ctx context.Context, iri *url.URL) (io.Read
return nil, 0, err return nil, 0, err
} }
req.Header.Add("Accept", "*/*") // we don't know what kind of media we're going to get here req.Header.Add("Accept", "*/*") // we don't know what kind of media we're going to get here
req.Header.Set("Host", iri.Host)
// Perform the HTTP request // Perform the HTTP request
rsp, err := t.GET(req) rsp, err := t.GET(req)

2
internal/transport/finger.go
View file

@ -68,7 +68,6 @@ func prepWebfingerReq(ctx context.Context, loc, domain, username string) (*http.
// including Gin itself. So concat the accept header with a comma // including Gin itself. So concat the accept header with a comma
// instead which seems to work reliably // instead which seems to work reliably
req.Header.Add("Accept", string(apiutil.AppJRDJSON)+","+string(apiutil.AppJSON)) req.Header.Add("Accept", string(apiutil.AppJRDJSON)+","+string(apiutil.AppJSON))
req.Header.Set("Host", req.URL.Host)
return req, nil return req, nil
} }
@ -187,7 +186,6 @@ func (t *transport) webfingerFromHostMeta(ctx context.Context, targetDomain stri
// We're doing XML // We're doing XML
req.Header.Add("Accept", string(apiutil.AppXML)) req.Header.Add("Accept", string(apiutil.AppXML))
req.Header.Add("Accept", "application/xrd+xml") req.Header.Add("Accept", "application/xrd+xml")
req.Header.Set("Host", req.URL.Host)
// Perform the HTTP request // Perform the HTTP request
rsp, err := t.GET(req) rsp, err := t.GET(req)