diff --git a/internal/experiment/signal/signal.go b/internal/experiment/signal/signal.go index c991e03093..807d18403c 100644 --- a/internal/experiment/signal/signal.go +++ b/internal/experiment/signal/signal.go @@ -15,7 +15,7 @@ import ( const ( testName = "signal" - testVersion = "0.2.4" + testVersion = "0.2.5" signalCA = `-----BEGIN CERTIFICATE----- MIID7zCCAtegAwIBAgIJAIm6LatK5PNiMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD @@ -162,25 +162,11 @@ func (m Measurer) Run(ctx context.Context, args *model.ExperimentArgs) error { } } + // See https://github.com/ooni/probe/issues/2636 for information + // about which of the many available targets we should test inputs := []urlgetter.MultiInput{ - // Here we need to provide the method explicitly. See // https://github.com/ooni/probe-engine/issues/827. - {Target: "https://api.backup.signal.org/", Config: urlgetter.Config{ - Method: "GET", - FailOnHTTPError: false, - CertPool: certPool, - }}, - {Target: "https://cdn.signal.org/", Config: urlgetter.Config{ - Method: "GET", - FailOnHTTPError: false, - CertPool: certPool, - }}, - {Target: "https://cdn2.signal.org/", Config: urlgetter.Config{ - Method: "GET", - FailOnHTTPError: false, - CertPool: certPool, - }}, {Target: "https://cdsi.signal.org/", Config: urlgetter.Config{ Method: "GET", FailOnHTTPError: false, @@ -191,14 +177,6 @@ func (m Measurer) Run(ctx context.Context, args *model.ExperimentArgs) error { FailOnHTTPError: false, CertPool: certPool, }}, - /* - TODO: understand why this endpoint does not speak TLS - {Target: "https://contentproxy.signal.org/", Config: urlgetter.Config{ - Method: "GET", - FailOnHTTPError: false, - CertPool: certPool, - }}, - */ {Target: "https://sfu.voip.signal.org/", Config: urlgetter.Config{ Method: "GET", FailOnHTTPError: false, @@ -209,26 +187,6 @@ func (m Measurer) Run(ctx context.Context, args *model.ExperimentArgs) error { FailOnHTTPError: false, CertPool: certPool, }}, - {Target: "https://svr2.signal.org/", Config: urlgetter.Config{ - Method: "GET", - FailOnHTTPError: false, - CertPool: certPool, - }}, - {Target: "https://ud-chat.signal.org/", Config: urlgetter.Config{ - Method: "GET", - FailOnHTTPError: false, - CertPool: certPool, - }}, - {Target: "https://updates.signal.org/", Config: urlgetter.Config{ - Method: "GET", - FailOnHTTPError: false, - CertPool: certPool, - }}, - {Target: "https://updates2.signal.org/", Config: urlgetter.Config{ - Method: "GET", - FailOnHTTPError: false, - CertPool: certPool, - }}, {Target: "dnslookup://uptime.signal.org"}, } multi := urlgetter.Multi{Begin: time.Now(), Getter: m.Getter, Session: sess} diff --git a/internal/experiment/signal/signal_test.go b/internal/experiment/signal/signal_test.go index cbae88470d..c7608eaea7 100644 --- a/internal/experiment/signal/signal_test.go +++ b/internal/experiment/signal/signal_test.go @@ -17,7 +17,7 @@ func TestNewExperimentMeasurer(t *testing.T) { if measurer.ExperimentName() != "signal" { t.Fatal("unexpected name") } - if measurer.ExperimentVersion() != "0.2.4" { + if measurer.ExperimentVersion() != "0.2.5" { t.Fatal("unexpected version") } }