Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(torsf): update domain fronting #1531

Merged
merged 5 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion internal/experiment/torsf/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
)

func TestRunWithExistingTor(t *testing.T) {
t.Skip("TODO(https://github.com/ooni/probe/issues/2692)")
if testing.Short() {
t.Skip("skip test in short mode")
}
Expand Down
2 changes: 1 addition & 1 deletion internal/experiment/torsf/torsf.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
// We may want to have a single implementation for both nettests in the future.

// testVersion is the experiment version.
const testVersion = "0.5.0"
const testVersion = "0.5.1"

// Config contains the experiment config.
type Config struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/experiment/torsf/torsf_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestExperimentNameAndVersion(t *testing.T) {
if m.ExperimentName() != "torsf" {
t.Fatal("invalid experiment name")
}
if m.ExperimentVersion() != "0.5.0" {
if m.ExperimentVersion() != "0.5.1" {
t.Fatal("invalid experiment version")
}
}
Expand Down
4 changes: 2 additions & 2 deletions internal/ptx/snowflake.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ func (d *snowflakeRendezvousMethodDomainFronting) AMPCacheURL() string {
}

func (d *snowflakeRendezvousMethodDomainFronting) BrokerURL() string {
return "https://snowflake-broker.torproject.net.global.prod.fastly.net/"
return "https://1098762253.rsc.cdn77.org/"
}

func (d *snowflakeRendezvousMethodDomainFronting) FrontDomain() string {
return "foursquare.com"
return "www.phpmyadmin.net"
}

// NewSnowflakeRendezvousMethodAMP is a rendezvous method that
Expand Down
4 changes: 2 additions & 2 deletions internal/ptx/snowflake_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ func TestSnowflakeMethodDomainFronting(t *testing.T) {
if meth.AMPCacheURL() != "" {
t.Fatal("invalid amp cache URL")
}
const brokerURL = "https://snowflake-broker.torproject.net.global.prod.fastly.net/"
const brokerURL = "https://1098762253.rsc.cdn77.org/"
if meth.BrokerURL() != brokerURL {
t.Fatal("invalid broker URL")
}
const frontDomain = "foursquare.com"
const frontDomain = "www.phpmyadmin.net"
if meth.FrontDomain() != frontDomain {
t.Fatal("invalid front domain")
}
Expand Down
Loading