From f29dbba1acb1b4df477353172b12b5f0e3a88169 Mon Sep 17 00:00:00 2001 From: Cecylia Bocovich Date: Fri, 6 Oct 2023 04:38:58 -0400 Subject: [PATCH] fix: update Snowflake domain front (#1337) We're doing this due to problems with `cdn.sstatic.net`: - https://lists.torproject.org/pipermail/anti-censorship-team/2023-September/000315.html - https://forum.torproject.org/t/problems-with-snowflake-since-2023-09-20-broker-failure-unexpected-error-no-answer/9346 The reference issue is https://github.com/ooni/probe/issues/2540. While there, fix a typo in a test name. --------- Co-authored-by: Simone Basso --- internal/experiment/torsf/integration_test.go | 1 - internal/ptx/snowflake.go | 2 +- internal/ptx/snowflake_test.go | 2 +- pkg/oonimkall/taskrunner_test.go | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/internal/experiment/torsf/integration_test.go b/internal/experiment/torsf/integration_test.go index 3907661b09..c52735a2b5 100644 --- a/internal/experiment/torsf/integration_test.go +++ b/internal/experiment/torsf/integration_test.go @@ -13,7 +13,6 @@ import ( ) func TestRunWithExistingTor(t *testing.T) { - t.Skip("https://github.com/ooni/probe/issues/2540") if testing.Short() { t.Skip("skip test in short mode") } diff --git a/internal/ptx/snowflake.go b/internal/ptx/snowflake.go index f4d61bdaec..cf6cd0c352 100644 --- a/internal/ptx/snowflake.go +++ b/internal/ptx/snowflake.go @@ -45,7 +45,7 @@ func (d *snowflakeRendezvousMethodDomainFronting) BrokerURL() string { } func (d *snowflakeRendezvousMethodDomainFronting) FrontDomain() string { - return "cdn.sstatic.net" + return "foursquare.com" } // NewSnowflakeRendezvousMethodAMP is a rendezvous method that diff --git a/internal/ptx/snowflake_test.go b/internal/ptx/snowflake_test.go index 9d1e80ca15..0c2d8a6f26 100644 --- a/internal/ptx/snowflake_test.go +++ b/internal/ptx/snowflake_test.go @@ -20,7 +20,7 @@ func TestSnowflakeMethodDomainFronting(t *testing.T) { if meth.BrokerURL() != brokerURL { t.Fatal("invalid broker URL") } - const frontDomain = "cdn.sstatic.net" + const frontDomain = "foursquare.com" if meth.FrontDomain() != frontDomain { t.Fatal("invalid front domain") } diff --git a/pkg/oonimkall/taskrunner_test.go b/pkg/oonimkall/taskrunner_test.go index a1dd5b3318..3374ef62ff 100644 --- a/pkg/oonimkall/taskrunner_test.go +++ b/pkg/oonimkall/taskrunner_test.go @@ -663,7 +663,7 @@ func TestTaskRunnerRun(t *testing.T) { assertReducedEventsLike(t, expect, reduced) }) - t.Run("with succes and max runtime", func(t *testing.T) { + t.Run("with success and max runtime", func(t *testing.T) { runner, emitter := newRunnerForTesting() runner.settings.Inputs = []string{"a", "b", "c", "d"} runner.settings.Options.MaxRuntime = 2