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
		
			
				
	
	
		
			158 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			158 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package badproxy
 | |
| 
 | |
| import (
 | |
| 	"crypto/rsa"
 | |
| 	"crypto/tls"
 | |
| 	"crypto/x509"
 | |
| 	"errors"
 | |
| 	"net"
 | |
| 	"testing"
 | |
| 	"time"
 | |
| 
 | |
| 	"github.com/google/martian/v3/mitm"
 | |
| )
 | |
| 
 | |
| func TestCleartext(t *testing.T) {
 | |
| 	listener := newproxy(t)
 | |
| 	checkdial(t, listener.Addr().String(), nil, net.Dial)
 | |
| 	killproxy(t, listener)
 | |
| }
 | |
| 
 | |
| func TestTLS(t *testing.T) {
 | |
| 	listener := newproxytls(t)
 | |
| 	checkdial(t, listener.Addr().String(), nil,
 | |
| 		func(network, address string) (net.Conn, error) {
 | |
| 			conn, err := tls.Dial(network, address, &tls.Config{
 | |
| 				InsecureSkipVerify: true,
 | |
| 				ServerName:         "antani.local",
 | |
| 			})
 | |
| 			if err != nil {
 | |
| 				return nil, err
 | |
| 			}
 | |
| 			if err = conn.Handshake(); err != nil {
 | |
| 				conn.Close()
 | |
| 				return nil, err
 | |
| 			}
 | |
| 			return conn, nil
 | |
| 		})
 | |
| 	killproxy(t, listener)
 | |
| }
 | |
| 
 | |
| func TestListenError(t *testing.T) {
 | |
| 	proxy := NewCensoringProxy()
 | |
| 	listener, err := proxy.Start("8.8.8.8:80")
 | |
| 	if err == nil {
 | |
| 		t.Fatal("expected an error here")
 | |
| 	}
 | |
| 	if listener != nil {
 | |
| 		t.Fatal("expected nil listener here")
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestStarTLS(t *testing.T) {
 | |
| 	expected := errors.New("mocked error")
 | |
| 
 | |
| 	t.Run("when we cannot create a new authority", func(t *testing.T) {
 | |
| 		proxy := NewCensoringProxy()
 | |
| 		proxy.mitmNewAuthority = func(
 | |
| 			name string, organization string,
 | |
| 			validity time.Duration,
 | |
| 		) (*x509.Certificate, *rsa.PrivateKey, error) {
 | |
| 			return nil, nil, expected
 | |
| 		}
 | |
| 		cert, privkey, err := proxy.StartTLS("127.0.0.1:0")
 | |
| 		if !errors.Is(err, expected) {
 | |
| 			t.Fatal("not the error we expected")
 | |
| 		}
 | |
| 		if cert != nil {
 | |
| 			t.Fatal("expected nil cert")
 | |
| 		}
 | |
| 		if privkey != nil {
 | |
| 			t.Fatal("expected nil privkey")
 | |
| 		}
 | |
| 	})
 | |
| 
 | |
| 	t.Run("when we cannot create a new config", func(t *testing.T) {
 | |
| 		proxy := NewCensoringProxy()
 | |
| 		proxy.mitmNewConfig = func(
 | |
| 			ca *x509.Certificate, privateKey interface{},
 | |
| 		) (*mitm.Config, error) {
 | |
| 			return nil, expected
 | |
| 		}
 | |
| 		cert, privkey, err := proxy.StartTLS("127.0.0.1:0")
 | |
| 		if !errors.Is(err, expected) {
 | |
| 			t.Fatal("not the error we expected")
 | |
| 		}
 | |
| 		if cert != nil {
 | |
| 			t.Fatal("expected nil cert")
 | |
| 		}
 | |
| 		if privkey != nil {
 | |
| 			t.Fatal("expected nil privkey")
 | |
| 		}
 | |
| 	})
 | |
| 
 | |
| 	t.Run("when we cannot listen", func(t *testing.T) {
 | |
| 		proxy := NewCensoringProxy()
 | |
| 		proxy.tlsListen = func(
 | |
| 			network string, laddr string, config *tls.Config,
 | |
| 		) (net.Listener, error) {
 | |
| 			return nil, expected
 | |
| 		}
 | |
| 		cert, privkey, err := proxy.StartTLS("127.0.0.1:0")
 | |
| 		if !errors.Is(err, expected) {
 | |
| 			t.Fatal("not the error we expected")
 | |
| 		}
 | |
| 		if cert != nil {
 | |
| 			t.Fatal("expected nil cert")
 | |
| 		}
 | |
| 		if privkey != nil {
 | |
| 			t.Fatal("expected nil privkey")
 | |
| 		}
 | |
| 	})
 | |
| }
 | |
| 
 | |
| func newproxy(t *testing.T) net.Listener {
 | |
| 	proxy := NewCensoringProxy()
 | |
| 	listener, err := proxy.Start("127.0.0.1:0")
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 	return listener
 | |
| }
 | |
| 
 | |
| func newproxytls(t *testing.T) net.Listener {
 | |
| 	proxy := NewCensoringProxy()
 | |
| 	listener, _, err := proxy.StartTLS("127.0.0.1:0")
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 	return listener
 | |
| }
 | |
| 
 | |
| func killproxy(t *testing.T, listener net.Listener) {
 | |
| 	err := listener.Close()
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func checkdial(
 | |
| 	t *testing.T, proxyAddr string, expectErr error,
 | |
| 	dial func(network, address string) (net.Conn, error),
 | |
| ) {
 | |
| 	conn, err := dial("tcp", proxyAddr)
 | |
| 	if err != expectErr {
 | |
| 		t.Fatal("not the result we expected")
 | |
| 	}
 | |
| 	if conn == nil && expectErr == nil {
 | |
| 		t.Fatal("expected actionable conn")
 | |
| 	}
 | |
| 	if conn != nil && expectErr != nil {
 | |
| 		t.Fatal("expected nil conn")
 | |
| 	}
 | |
| 	if conn != nil {
 | |
| 		conn.Write([]byte("123454321"))
 | |
| 		conn.Close()
 | |
| 	}
 | |
| }
 |