99b28c1d95
* refactor: start building an Android package Part of https://github.com/ooni/probe/issues/1335. This seems also a good moment to move some packages out of the engine, e.g., oonimkall. This package, for example, is a consumer of the engine, so it makes sense it's not _inside_ it. * fix: committed some stuff I didn't need to commit * fix: oonimkall needs to be public to build The side effect is that we will probably need to bump the major version number every time we change one of these APIs. (We can also of course choose to violate the basic guidelines of Go software, but I believe this is bad form.) I have no problem in bumping the major quite frequently and in any case this monorepo solution is convinving me more than continuing to keep a split between engine and cli. The need to embed assets to make the probe more reliable trumps the negative effects of having to ~frequently bump major because we expose a public API. * fix: let's not forget about libooniffi Honestly, I don't know what to do with this library. I added it to provide a drop in replacement for MK but I have no idea whether it's used and useful. I would not feel comfortable exposing it, unlike oonimkall, since we're not using it. It may be that the right thing to do here is just to delete the package and reduce the amount of code we're maintaining? * woops, we're still missing the publish android script * fix(publish-android.bash): add proper API key * ouch fix another place where the name changed
87 lines
2.4 KiB
Go
87 lines
2.4 KiB
Go
// Package uncensored contains code used by Jafar to evade its own
|
|
// censorship efforts by taking alternate routes.
|
|
package uncensored
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
"net/http"
|
|
|
|
"github.com/apex/log"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/runtimex"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx"
|
|
)
|
|
|
|
// Client is DNS, HTTP, and TCP client.
|
|
type Client struct {
|
|
dnsClient *netx.DNSClient
|
|
httpTransport netx.HTTPRoundTripper
|
|
dialer netx.Dialer
|
|
}
|
|
|
|
// NewClient creates a new Client.
|
|
func NewClient(resolverURL string) (*Client, error) {
|
|
configuration, err := urlgetter.Configurer{
|
|
Config: urlgetter.Config{
|
|
ResolverURL: resolverURL,
|
|
},
|
|
Logger: log.Log,
|
|
}.NewConfiguration()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &Client{
|
|
dnsClient: &configuration.DNSClient,
|
|
httpTransport: netx.NewHTTPTransport(configuration.HTTPConfig),
|
|
dialer: netx.NewDialer(configuration.HTTPConfig),
|
|
}, nil
|
|
}
|
|
|
|
// Must panics if it's not possible to create a Client. Usually you should
|
|
// use it like `uncensored.Must(uncensored.NewClient(URL))`.
|
|
func Must(client *Client, err error) *Client {
|
|
runtimex.PanicOnError(err, "cannot create uncensored client")
|
|
return client
|
|
}
|
|
|
|
// DefaultClient is the default client for DNS, HTTP, and TCP.
|
|
var DefaultClient = Must(NewClient(""))
|
|
|
|
var _ netx.Resolver = DefaultClient
|
|
|
|
// Address implements netx.Resolver.Address
|
|
func (c *Client) Address() string {
|
|
return c.dnsClient.Address()
|
|
}
|
|
|
|
// LookupHost implements netx.Resolver.LookupHost
|
|
func (c *Client) LookupHost(ctx context.Context, domain string) ([]string, error) {
|
|
return c.dnsClient.LookupHost(ctx, domain)
|
|
}
|
|
|
|
// Network implements netx.Resolver.Network
|
|
func (c *Client) Network() string {
|
|
return c.dnsClient.Network()
|
|
}
|
|
|
|
var _ netx.Dialer = DefaultClient
|
|
|
|
// DialContext implements netx.Dialer.DialContext
|
|
func (c *Client) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
|
return c.dialer.DialContext(ctx, network, address)
|
|
}
|
|
|
|
var _ netx.HTTPRoundTripper = DefaultClient
|
|
|
|
// CloseIdleConnections implement netx.HTTPRoundTripper.CloseIdleConnections
|
|
func (c *Client) CloseIdleConnections() {
|
|
c.dnsClient.CloseIdleConnections()
|
|
c.httpTransport.CloseIdleConnections()
|
|
}
|
|
|
|
// RoundTrip implement netx.HTTPRoundTripper.RoundTrip
|
|
func (c *Client) RoundTrip(req *http.Request) (*http.Response, error) {
|
|
return c.httpTransport.RoundTrip(req)
|
|
}
|