chore: merge probe-engine into probe-cli (#201)
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
This commit is contained in:
Simone Basso
GitHub
parent
b1ce300c8d
commit
d57c78bc71
535 changed files with 66182 additions and 23 deletions
287
internal/engine/experiment/urlgetter/runner_test.go
Normal file
287
internal/engine/experiment/urlgetter/runner_test.go
Normal file
|
|
@ -0,0 +1,287 @@
|
|||
package urlgetter_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/atomicx"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
|
||||
)
|
||||
|
||||
func TestRunnerWithInvalidURLScheme(t *testing.T) {
|
||||
r := urlgetter.Runner{Target: "antani://www.google.com"}
|
||||
err := r.Run(context.Background())
|
||||
if err == nil || err.Error() != "unknown targetURL scheme" {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerHTTPWithContextCanceled(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
cancel()
|
||||
r := urlgetter.Runner{Target: "https://www.google.com"}
|
||||
err := r.Run(ctx)
|
||||
if !errors.Is(err, context.Canceled) {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerDNSLookupWithContextCanceled(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
cancel()
|
||||
r := urlgetter.Runner{Target: "dnslookup://www.google.com"}
|
||||
err := r.Run(ctx)
|
||||
if err == nil || err.Error() != "interrupted" {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerTLSHandshakeWithContextCanceled(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
cancel()
|
||||
r := urlgetter.Runner{Target: "tlshandshake://www.google.com:443"}
|
||||
err := r.Run(ctx)
|
||||
if err == nil || err.Error() != "interrupted" {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerTCPConnectWithContextCanceled(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
cancel()
|
||||
r := urlgetter.Runner{Target: "tcpconnect://www.google.com:443"}
|
||||
err := r.Run(ctx)
|
||||
if err == nil || err.Error() != "interrupted" {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerWithInvalidURL(t *testing.T) {
|
||||
r := urlgetter.Runner{Target: "\t"}
|
||||
err := r.Run(context.Background())
|
||||
if err == nil || !strings.HasSuffix(err.Error(), "invalid control character in URL") {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerWithEmptyHostname(t *testing.T) {
|
||||
r := urlgetter.Runner{Target: "http:///foo.txt"}
|
||||
err := r.Run(context.Background())
|
||||
if err == nil || !strings.HasSuffix(err.Error(), "no Host in request URL") {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerTLSHandshakeSuccess(t *testing.T) {
|
||||
if testing.Short() {
|
||||
t.Skip("skip test in short mode")
|
||||
}
|
||||
r := urlgetter.Runner{Target: "tlshandshake://www.google.com:443"}
|
||||
err := r.Run(context.Background())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerTCPConnectSuccess(t *testing.T) {
|
||||
if testing.Short() {
|
||||
t.Skip("skip test in short mode")
|
||||
}
|
||||
r := urlgetter.Runner{Target: "tcpconnect://www.google.com:443"}
|
||||
err := r.Run(context.Background())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerDNSLookupSuccess(t *testing.T) {
|
||||
if testing.Short() {
|
||||
t.Skip("skip test in short mode")
|
||||
}
|
||||
r := urlgetter.Runner{Target: "dnslookup://www.google.com"}
|
||||
err := r.Run(context.Background())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerHTTPSSuccess(t *testing.T) {
|
||||
if testing.Short() {
|
||||
t.Skip("skip test in short mode")
|
||||
}
|
||||
r := urlgetter.Runner{Target: "https://www.google.com"}
|
||||
err := r.Run(context.Background())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerHTTPSetHostHeader(t *testing.T) {
|
||||
var host string
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
host = r.Host
|
||||
w.WriteHeader(200)
|
||||
}))
|
||||
defer server.Close()
|
||||
r := urlgetter.Runner{
|
||||
Config: urlgetter.Config{
|
||||
HTTPHost: "x.org",
|
||||
},
|
||||
Target: server.URL,
|
||||
}
|
||||
err := r.Run(context.Background())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if host != "x.org" {
|
||||
t.Fatal("not the host we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerHTTPNoRedirect(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Add("Location", "http:///") // cause failure if we redirect
|
||||
w.WriteHeader(302)
|
||||
}))
|
||||
defer server.Close()
|
||||
r := urlgetter.Runner{
|
||||
Config: urlgetter.Config{
|
||||
NoFollowRedirects: true,
|
||||
},
|
||||
Target: server.URL,
|
||||
}
|
||||
err := r.Run(context.Background())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerHTTPCannotReadBody(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
hijacker, ok := w.(http.Hijacker)
|
||||
if !ok {
|
||||
panic("hijacking not supported by this server")
|
||||
}
|
||||
conn, _, _ := hijacker.Hijack()
|
||||
conn.Write([]byte("HTTP/1.1 200 Ok\r\n"))
|
||||
conn.Write([]byte("Content-Length: 1024\r\n"))
|
||||
conn.Write([]byte("\r\n"))
|
||||
conn.Write([]byte("123456789"))
|
||||
conn.Close()
|
||||
}))
|
||||
defer server.Close()
|
||||
r := urlgetter.Runner{
|
||||
Config: urlgetter.Config{
|
||||
NoFollowRedirects: true,
|
||||
},
|
||||
Target: server.URL,
|
||||
}
|
||||
err := r.Run(context.Background())
|
||||
if !errors.Is(err, io.EOF) {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerHTTPWeHandle400Correctly(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.WriteHeader(400)
|
||||
}))
|
||||
defer server.Close()
|
||||
r := urlgetter.Runner{
|
||||
Config: urlgetter.Config{
|
||||
FailOnHTTPError: true,
|
||||
NoFollowRedirects: true,
|
||||
},
|
||||
Target: server.URL,
|
||||
}
|
||||
err := r.Run(context.Background())
|
||||
if !errors.Is(err, urlgetter.ErrHTTPRequestFailed) {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerHTTPCannotReadBodyWinsOver400(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
hijacker, ok := w.(http.Hijacker)
|
||||
if !ok {
|
||||
panic("hijacking not supported by this server")
|
||||
}
|
||||
conn, _, _ := hijacker.Hijack()
|
||||
conn.Write([]byte("HTTP/1.1 400 Bad Request\r\n"))
|
||||
conn.Write([]byte("Content-Length: 1024\r\n"))
|
||||
conn.Write([]byte("\r\n"))
|
||||
conn.Write([]byte("123456789"))
|
||||
conn.Close()
|
||||
}))
|
||||
defer server.Close()
|
||||
r := urlgetter.Runner{
|
||||
Config: urlgetter.Config{
|
||||
FailOnHTTPError: true,
|
||||
NoFollowRedirects: true,
|
||||
},
|
||||
Target: server.URL,
|
||||
}
|
||||
err := r.Run(context.Background())
|
||||
if !errors.Is(err, io.EOF) {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerWeCanForceUserAgent(t *testing.T) {
|
||||
expected := "antani/1.23.4-dev"
|
||||
found := atomicx.NewInt64()
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Header.Get("User-Agent") == expected {
|
||||
found.Add(1)
|
||||
}
|
||||
w.WriteHeader(200)
|
||||
}))
|
||||
defer server.Close()
|
||||
r := urlgetter.Runner{
|
||||
Config: urlgetter.Config{
|
||||
FailOnHTTPError: true,
|
||||
NoFollowRedirects: true,
|
||||
UserAgent: expected,
|
||||
},
|
||||
Target: server.URL,
|
||||
}
|
||||
err := r.Run(context.Background())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if found.Load() != 1 {
|
||||
t.Fatal("we didn't override the user agent")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerDefaultUserAgent(t *testing.T) {
|
||||
expected := httpheader.UserAgent()
|
||||
found := atomicx.NewInt64()
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Header.Get("User-Agent") == expected {
|
||||
found.Add(1)
|
||||
}
|
||||
w.WriteHeader(200)
|
||||
}))
|
||||
defer server.Close()
|
||||
r := urlgetter.Runner{
|
||||
Config: urlgetter.Config{
|
||||
FailOnHTTPError: true,
|
||||
NoFollowRedirects: true,
|
||||
},
|
||||
Target: server.URL,
|
||||
}
|
||||
err := r.Run(context.Background())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if found.Load() != 1 {
|
||||
t.Fatal("we didn't override the user agent")
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue