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!)
35 lines
982 B
Go
35 lines
982 B
Go
package quicdialer
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
|
|
"github.com/lucas-clemente/quic-go"
|
|
"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 quic err wrapping
|
|
type ErrorWrapperDialer struct {
|
|
Dialer ContextDialer
|
|
}
|
|
|
|
// DialContext implements ContextDialer.DialContext
|
|
func (d ErrorWrapperDialer) DialContext(
|
|
ctx context.Context, network string, host string,
|
|
tlsCfg *tls.Config, cfg *quic.Config) (quic.EarlySession, error) {
|
|
dialID := dialid.ContextDialID(ctx)
|
|
sess, err := d.Dialer.DialContext(ctx, network, host, tlsCfg, cfg)
|
|
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.QUICHandshakeOperation,
|
|
}.MaybeBuild()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return sess, nil
|
|
}
|