fix(netxlite): ensure HTTP errors are always wrapped (#584)
1. introduce implementations of HTTPTransport and HTTPClient that apply an error wrapping policy using the constructor for a generic top-level error wrapper 2. make sure we use the implementations in point 1 when we are constructing HTTPTransport and HTTPClient 3. make sure we apply error wrapping using the constructor for a generic top-level error wrapper when reading bodies 4. acknowledge that error wrapping would be broken if we do not return the same classification _and_ operation when we wrap an already wrapped error, so fix the to code to do that 5. acknowledge that the classifiers already deal with preserving the error string and explain why this is a quirk and why we cannot remove it right now and what needs to happen to safely remove this quirk from the codebase Closes https://github.com/ooni/probe/issues/1860
This commit is contained in:
@@ -244,7 +244,7 @@ var ErrHTTPTooManyRedirects = errors.New("stopped after 10 redirects")
|
||||
|
||||
func newHTTPClient(db WritableDB, cookiejar http.CookieJar,
|
||||
txp HTTPTransport, defaultErr error) HTTPClient {
|
||||
return &httpClientErrWrapper{&http.Client{
|
||||
return netxlite.WrapHTTPClient(&http.Client{
|
||||
Transport: txp,
|
||||
Jar: cookiejar,
|
||||
CheckRedirect: func(req *http.Request, via []*http.Request) error {
|
||||
@@ -260,19 +260,7 @@ func newHTTPClient(db WritableDB, cookiejar http.CookieJar,
|
||||
})
|
||||
return err
|
||||
},
|
||||
}}
|
||||
}
|
||||
|
||||
type httpClientErrWrapper struct {
|
||||
HTTPClient
|
||||
}
|
||||
|
||||
func (c *httpClientErrWrapper) Do(req *http.Request) (*http.Response, error) {
|
||||
resp, err := c.HTTPClient.Do(req)
|
||||
if err != nil {
|
||||
err = netxlite.NewTopLevelGenericErrWrapper(err)
|
||||
}
|
||||
return resp, err
|
||||
})
|
||||
}
|
||||
|
||||
// NewCookieJar is a convenience factory for creating an http.CookieJar
|
||||
|
||||
Reference in New Issue
Block a user