cleanup: remove httpapi and ooapi #1560
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This diff includes a first attempt at consolidating the patterns with which we invoke OONI and third-party API calls. I have refactored the code of httpx and httpapi into a new package called httpclientx, added some tests, started converting some parts of the tree, and explained myself in a design document. Part of ooni/probe#2700
bassosimone
added a commit
that referenced
this pull request
Apr 23, 2024
Closes ooni/probe#2713. We developed this diff in #1560, which is work in the ooni/probe#2700 context.
bassosimone
added a commit
that referenced
this pull request
Apr 23, 2024
Closes ooni/probe#2714 Extracted from #1560 Part of ooni/probe#2700
Spotted thanks to a very paranoid check inside ./internal/oonirun. Was not a problem before for `httpx` because of its usage pattern and may or may not be a problem for the `httpapi` package (did not check since this work is focused on replacing both `httpx` and `httpapi`).
Previously, we were gracefully handling this case, but honestly it is not the best approach to pretend there's an empty structure if the server breaks the API and returns `"null"` rather than an object. That said, it was still awesome to have this test in place because it helped us to figure out this extra condition of which httpclientx should be aware and that this problem needs to be dealt with systematically inside the httpclientx package.
Conflicts: internal/enginelocate/cloudflare.go internal/enginelocate/ubuntu.go
Conflicts: internal/oonirun/v2_test.go
As before, here I am going to ensure there's redundancy.
bassosimone
added a commit
that referenced
this pull request
May 3, 2024
This diff implements BuildErrorString, which we need in #1560 to construct `multierror` compatible error strings inside the `httpclientx` package. While there, recognize that `multierror` should now be considered legacy (i.e., minor changes and only bugfixes) because its implementation has `Unwrap() error` while not it would be better to use `Unwrap() []errors` but, if we were switching to the new callback, error wrapping would find syscall errors and use them as the result. Therefore, an error like: ``` httpapi: all endpoints failed: [ connection_reset; connection_reset; connection_reset; connection_reset;] ``` would be reduced to: ``` connection_reset ``` Because this behavior is subtle, I think it's best to move multierror inside `./internal/legacy` and document this. Part of ooni/probe#2729.
Conflicts: internal/httpapi/sequence.go
bassosimone
added a commit
that referenced
this pull request
May 3, 2024
While removing `httpapi` in #1560, I noticed that I actually liked limiting the max body size, which is particularly useful in case of gzip bombs. So, add tests for gzip bombs and allow configuring the maximum body size. We detect truncation by reading one more byte than needed and then checking the body length. Part of ooni/probe#2729.
Conflicts: internal/httpclientx/config_test.go internal/httpclientx/httpclientx_test.go
bassosimone
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This diff removes httpapi and ooapi. Closes ooni/probe#2729.