Skip to content

Commit 5f8a767

Browse files
fix(torsf): update domain fronting (#1531)
This diff updates snowflake's domain fronting such that `torsf` is working as intended again. I adapted this diff from #1529, written by @Lanius-collaris (thank you so much! 🥰 🙌). The original diff contained extra functionality that it would be very nice to have. I have chosen to drop this functionality, because I'd like to quickly merge a Snowflake fix. I will take care of the additional changes in a subsequent diff. Part of ooni/probe#2692. --------- Co-authored-by: Lanius-collaris <[email protected]>
1 parent 3ab3f89 commit 5f8a767

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

internal/experiment/torsf/integration_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
)
1414

1515
func TestRunWithExistingTor(t *testing.T) {
16-
t.Skip("TODO(https://github.com/ooni/probe/issues/2692)")
1716
if testing.Short() {
1817
t.Skip("skip test in short mode")
1918
}

internal/experiment/torsf/torsf.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
// We may want to have a single implementation for both nettests in the future.
2626

2727
// testVersion is the experiment version.
28-
const testVersion = "0.5.0"
28+
const testVersion = "0.5.1"
2929

3030
// Config contains the experiment config.
3131
type Config struct {

internal/experiment/torsf/torsf_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestExperimentNameAndVersion(t *testing.T) {
2525
if m.ExperimentName() != "torsf" {
2626
t.Fatal("invalid experiment name")
2727
}
28-
if m.ExperimentVersion() != "0.5.0" {
28+
if m.ExperimentVersion() != "0.5.1" {
2929
t.Fatal("invalid experiment version")
3030
}
3131
}

internal/ptx/snowflake.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ func (d *snowflakeRendezvousMethodDomainFronting) AMPCacheURL() string {
4141
}
4242

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

4747
func (d *snowflakeRendezvousMethodDomainFronting) FrontDomain() string {
48-
return "foursquare.com"
48+
return "www.phpmyadmin.net"
4949
}
5050

5151
// NewSnowflakeRendezvousMethodAMP is a rendezvous method that

internal/ptx/snowflake_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ func TestSnowflakeMethodDomainFronting(t *testing.T) {
1616
if meth.AMPCacheURL() != "" {
1717
t.Fatal("invalid amp cache URL")
1818
}
19-
const brokerURL = "https://snowflake-broker.torproject.net.global.prod.fastly.net/"
19+
const brokerURL = "https://1098762253.rsc.cdn77.org/"
2020
if meth.BrokerURL() != brokerURL {
2121
t.Fatal("invalid broker URL")
2222
}
23-
const frontDomain = "foursquare.com"
23+
const frontDomain = "www.phpmyadmin.net"
2424
if meth.FrontDomain() != frontDomain {
2525
t.Fatal("invalid front domain")
2626
}

0 commit comments

Comments
 (0)