0d4323ae66
* chore: update dependencies * chore: update user agent for measurements * chore: we're now at v3.6.0 * chore: update assets * chore: update bundled CA * fix: address some goreportcard.com warnings * fix(debian/changelog): zap release that breaks out build scripts We're forcing the content of changelog with `dch`, so it's fine to not have any specific new release in there. * fix: make sure tests are passing locally Notably, I removed a chunk of code where we were checking for network activity. Now we don't fetch the databases and it's not important. Before, it was important because the databases are ~large. * fix: temporarily comment out riseupvn integration tests See https://github.com/ooni/probe/issues/1354 for work aimed at reducing the rate of false positives (thanks @cyBerta!)
76 lines
1.8 KiB
Go
76 lines
1.8 KiB
Go
package dialer
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/dialid"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/errorx"
|
|
)
|
|
|
|
// ErrorWrapperDialer is a dialer that performs err wrapping
|
|
type ErrorWrapperDialer struct {
|
|
Dialer
|
|
}
|
|
|
|
// DialContext implements Dialer.DialContext
|
|
func (d ErrorWrapperDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
|
dialID := dialid.ContextDialID(ctx)
|
|
conn, err := d.Dialer.DialContext(ctx, network, address)
|
|
err = errorx.SafeErrWrapperBuilder{
|
|
// ConnID does not make any sense if we've failed and the error
|
|
// does not make any sense (and is nil) if we succeeded.
|
|
DialID: dialID,
|
|
Error: err,
|
|
Operation: errorx.ConnectOperation,
|
|
}.MaybeBuild()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &ErrorWrapperConn{
|
|
Conn: conn, ConnID: safeConnID(network, conn), DialID: dialID}, nil
|
|
}
|
|
|
|
// ErrorWrapperConn is a net.Conn that performs error wrapping.
|
|
type ErrorWrapperConn struct {
|
|
net.Conn
|
|
ConnID int64
|
|
DialID int64
|
|
}
|
|
|
|
// Read implements net.Conn.Read
|
|
func (c ErrorWrapperConn) Read(b []byte) (n int, err error) {
|
|
n, err = c.Conn.Read(b)
|
|
err = errorx.SafeErrWrapperBuilder{
|
|
ConnID: c.ConnID,
|
|
DialID: c.DialID,
|
|
Error: err,
|
|
Operation: errorx.ReadOperation,
|
|
}.MaybeBuild()
|
|
return
|
|
}
|
|
|
|
// Write implements net.Conn.Write
|
|
func (c ErrorWrapperConn) Write(b []byte) (n int, err error) {
|
|
n, err = c.Conn.Write(b)
|
|
err = errorx.SafeErrWrapperBuilder{
|
|
ConnID: c.ConnID,
|
|
DialID: c.DialID,
|
|
Error: err,
|
|
Operation: errorx.WriteOperation,
|
|
}.MaybeBuild()
|
|
return
|
|
}
|
|
|
|
// Close implements net.Conn.Close
|
|
func (c ErrorWrapperConn) Close() (err error) {
|
|
err = c.Conn.Close()
|
|
err = errorx.SafeErrWrapperBuilder{
|
|
ConnID: c.ConnID,
|
|
DialID: c.DialID,
|
|
Error: err,
|
|
Operation: errorx.CloseOperation,
|
|
}.MaybeBuild()
|
|
return
|
|
}
|