mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-11-22 01:05:53 +03: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{}
67 lines
2.2 KiB
Go
67 lines
2.2 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 (
|
|
"fmt"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"golang.org/x/net/http/httpguts"
|
|
)
|
|
|
|
// ValidateRequest performs the same request validation logic found in the default
|
|
// net/http.Transport{}.roundTrip() function, but pulls it out into this separate
|
|
// function allowing validation errors to be wrapped under a single error type.
|
|
func ValidateRequest(r *http.Request) error {
|
|
switch {
|
|
case r.URL == nil:
|
|
return fmt.Errorf("%w: nil url", ErrInvalidRequest)
|
|
case r.Header == nil:
|
|
return fmt.Errorf("%w: nil header", ErrInvalidRequest)
|
|
case r.URL.Host == "":
|
|
return fmt.Errorf("%w: empty url host", ErrInvalidRequest)
|
|
case r.URL.Scheme != "http" && r.URL.Scheme != "https":
|
|
return fmt.Errorf("%w: unsupported protocol %q", ErrInvalidRequest, r.URL.Scheme)
|
|
case strings.IndexFunc(r.Method, isNotTokenRune) != -1:
|
|
return fmt.Errorf("%w: invalid method %q", ErrInvalidRequest, r.Method)
|
|
}
|
|
|
|
for key, values := range r.Header {
|
|
// Check field key name is valid
|
|
if !httpguts.ValidHeaderFieldName(key) {
|
|
return fmt.Errorf("%w: invalid header field name %q", ErrInvalidRequest, key)
|
|
}
|
|
|
|
// Check each field value is valid
|
|
for i := 0; i < len(values); i++ {
|
|
if !httpguts.ValidHeaderFieldValue(values[i]) {
|
|
return fmt.Errorf("%w: invalid header field value %q", ErrInvalidRequest, values[i])
|
|
}
|
|
}
|
|
}
|
|
|
|
// ps. kim wrote this
|
|
|
|
return nil
|
|
}
|
|
|
|
// isNotTokenRune wraps IsTokenRune to inverse result.
|
|
func isNotTokenRune(r rune) bool {
|
|
return !httpguts.IsTokenRune(r)
|
|
}
|