mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-10-29 06:32:26 -05:00
[performance] Don't retry/backoff invalid http requests that will never succeed (#609)
* add httpguts (ew) * add ValidateRequest err wrapping logic * don't retry on unrecoverable errors * i am very clever
This commit is contained in:
parent
0f01f72db0
commit
1cdc163276
8 changed files with 487 additions and 4 deletions
|
|
@ -28,6 +28,9 @@ import (
|
|||
"time"
|
||||
)
|
||||
|
||||
// ErrInvalidRequest is returned if a given HTTP request is invalid and cannot be performed.
|
||||
var ErrInvalidRequest = errors.New("invalid http request")
|
||||
|
||||
// ErrReservedAddr is returned if a dialed address resolves to an IP within a blocked or reserved net.
|
||||
var ErrReservedAddr = errors.New("dial within blocked / reserved IP range")
|
||||
|
||||
|
|
@ -164,6 +167,11 @@ func (c *Client) Do(req *http.Request) (*http.Response, error) {
|
|||
defer func() { <-c.queue }()
|
||||
}
|
||||
|
||||
// Firstly, ensure this is a valid request
|
||||
if err := ValidateRequest(req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Perform the HTTP request
|
||||
rsp, err := c.client.Do(req)
|
||||
if err != nil {
|
||||
|
|
|
|||
63
internal/httpclient/request.go
Normal file
63
internal/httpclient/request.go
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
/*
|
||||
GoToSocial
|
||||
Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
|
||||
|
||||
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, func(r rune) bool { return !httpguts.IsTokenRune(r) }) != -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
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue