33de701263
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
78 lines
2.0 KiB
Go
78 lines
2.0 KiB
Go
package webconnectivity
|
|
|
|
import (
|
|
"net"
|
|
"net/url"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/runtimex"
|
|
)
|
|
|
|
// EndpointInfo describes a TCP/TLS endpoint.
|
|
type EndpointInfo struct {
|
|
String string // String representation
|
|
URLGetterURL string // URL for urlgetter
|
|
}
|
|
|
|
// EndpointsList is a list of EndpointInfo
|
|
type EndpointsList []EndpointInfo
|
|
|
|
// Endpoints returns a list of endpoints for TCP connect
|
|
func (el EndpointsList) Endpoints() (out []string) {
|
|
out = []string{}
|
|
for _, ei := range el {
|
|
out = append(out, ei.String)
|
|
}
|
|
return
|
|
}
|
|
|
|
// URLs returns a list of URLs for TCP urlgetter
|
|
func (el EndpointsList) URLs() (out []string) {
|
|
out = []string{}
|
|
for _, ei := range el {
|
|
out = append(out, ei.URLGetterURL)
|
|
}
|
|
return
|
|
}
|
|
|
|
// NewEndpoints creates a list of TCP/TLS endpoints to test from the
|
|
// target URL and the list of resolved IP addresses.
|
|
func NewEndpoints(URL *url.URL, addrs []string) (out EndpointsList) {
|
|
out = EndpointsList{}
|
|
port := NewEndpointPort(URL)
|
|
for _, addr := range addrs {
|
|
endpoint := net.JoinHostPort(addr, port.Port)
|
|
out = append(out, EndpointInfo{
|
|
String: endpoint,
|
|
URLGetterURL: (&url.URL{Scheme: port.URLGetterScheme, Host: endpoint}).String(),
|
|
})
|
|
}
|
|
return
|
|
}
|
|
|
|
// EndpointPort is the port to be used by a TCP/TLS endpoint.
|
|
type EndpointPort struct {
|
|
URLGetterScheme string
|
|
Port string
|
|
}
|
|
|
|
// NewEndpointPort creates an EndpointPort from the given URL. This function
|
|
// panic if the scheme is not `http` or `https` as well as if the host is not
|
|
// valid. The latter should not happen if you used url.Parse.
|
|
func NewEndpointPort(URL *url.URL) (out EndpointPort) {
|
|
if URL.Scheme != "http" && URL.Scheme != "https" {
|
|
panic("passed an unexpected scheme")
|
|
}
|
|
switch URL.Scheme {
|
|
case "http":
|
|
out.URLGetterScheme, out.Port = "tcpconnect", "80"
|
|
case "https":
|
|
out.URLGetterScheme, out.Port = "tlshandshake", "443"
|
|
}
|
|
if URL.Host != URL.Hostname() {
|
|
_, port, err := net.SplitHostPort(URL.Host)
|
|
runtimex.PanicOnError(err, "SplitHostPort should not fail here")
|
|
out.Port = port
|
|
}
|
|
return
|
|
}
|