mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-11-30 12:15:18 +01:00
a483bd9e38
* add delivery worker type that pulls from queue to httpclient package * finish up some code commenting, bodge a vendored activity library change, integrate the deliverypool changes into transportcontroller * hook up queue deletion logic * support deleting queued http requests by target ID * don't index APRequest by hostname in the queue * use gorun * use the original context's values when wrapping msg type as delivery{} * actually log in the AP delivery worker ... * add uncommitted changes * use errors.AsV2() * use errorsv2.AsV2() * finish adding some code comments, add bad host handling to delivery workers * slightly tweak deliveryworkerpool API, use advanced sender multiplier * remove PopCtx() method, let others instead rely on Wait() * shuffle things around to move delivery stuff into transport/ subpkg * remove dead code * formatting * validate request before queueing for delivery * finish adding code comments, fix up backoff code * finish adding more code comments * clamp minimum no. senders to 1 * add start/stop logging to delivery worker, some slight changes * remove double logging * use worker ptrs * expose the embedded log fields in httpclient.Request{} * ensure request context values are preserved when updating ctx * add delivery worker tests * fix linter issues * ensure delivery worker gets inited in testrig * fix tests to delivering messages to check worker delivery queue * update error type to use ptr instead of value receiver * fix test calling Workers{}.Start() instead of testrig.StartWorkers() * update docs for advanced-sender-multiplier * update to the latest activity library version * add comment about not using httptest.Server{}
63 lines
2.0 KiB
Go
63 lines
2.0 KiB
Go
// GoToSocial
|
|
// Copyright (C) GoToSocial Authors admin@gotosocial.org
|
|
// SPDX-License-Identifier: AGPL-3.0-or-later
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package httpclient
|
|
|
|
import (
|
|
"net/http"
|
|
"time"
|
|
|
|
"codeberg.org/gruf/go-byteutil"
|
|
"github.com/superseriousbusiness/gotosocial/internal/gtscontext"
|
|
)
|
|
|
|
// SignFunc is a function signature that provides request signing.
|
|
type SignFunc func(r *http.Request) error
|
|
|
|
// signingtransport wraps an http.Transport{}
|
|
// (RoundTripper implementer) to check request
|
|
// context for a signing function and using for
|
|
// all subsequent trips through RoundTrip().
|
|
type signingtransport struct{ http.Transport }
|
|
|
|
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 {
|
|
// Reset signing header fields
|
|
now := time.Now().UTC()
|
|
r.Header.Set("Date", now.Format("Mon, 02 Jan 2006 15:04:05")+" GMT")
|
|
r.Header.Del("Signature")
|
|
r.Header.Del("Digest")
|
|
|
|
// Rewind body reader and content-length if set.
|
|
if rc, ok := r.Body.(*byteutil.ReadNopCloser); ok {
|
|
rc.Rewind() // set len AFTER rewind
|
|
r.ContentLength = int64(rc.Len())
|
|
}
|
|
|
|
// Sign the outgoing request.
|
|
if err := sign(r); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
// Pass to underlying transport.
|
|
return t.Transport.RoundTrip(r)
|
|
}
|