c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix({simplequic,tls}ping): default SNI to URL's hostname (#753)

Browse source 
See https://github.com/ooni/probe/issues/2111
This commit is contained in:
Simone Basso 2022-05-24 16:29:13 +02:00 • committed by GitHub
commit b68b8e1e8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 122 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
internal/engine/experiment/tlsping/tlsping.go
View file

@ -8,6 +8,7 @@ import (
"crypto/tls"
"errors"
"fmt"
"net"
"net/url"
"strings"
"time"
@ -58,6 +59,17 @@ func (c *Config) repetitions() int64 {
return 10
}
func (c *Config) sni(address string) string {
if c.SNI != "" {
return c.SNI
}
addr, _, err := net.SplitHostPort(address)
if err != nil {
return ""
}
return addr
}
// TestKeys contains the experiment results.
type TestKeys struct {
Pings []*SinglePing `json:"pings"`
@ -119,9 +131,6 @@ func (m *Measurer) Run(
if parsed.Port() == "" {
return errMissingPort
}
if m.config.SNI == "" {
sess.Logger().Warn("no -O SNI=<SNI> specified from command line")
}
tk := new(TestKeys)
measurement.TestKeys = tk
out := make(chan *measurex.EndpointMeasurement)
@ -165,7 +174,7 @@ func (m *Measurer) tlsConnectAndHandshake(ctx context.Context, mxmx *measurex.Me
return mxmx.TLSConnectAndHandshake(ctx, address, &tls.Config{
NextProtos: strings.Split(m.config.alpn(), " "),
RootCAs: netxlite.NewDefaultCertPool(),
ServerName: m.config.SNI,
ServerName: m.config.sni(address),
})
}