c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ptx): use another obfs4 bridge (#415)

Browse Source 
See discussion at https://github.com/ooni/probe-cli/pull/413#issuecomment-871552943.
This commit is contained in:
Simone Basso 2021-07-01 15:13:01 +02:00 committed by GitHub
parent 4dc2907472
commit f59e98fd05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/ptx/obfs4.go
View File

@ -19,15 +19,14 @@ import (
// not wise to use this bridge in general. But, feel free to // not wise to use this bridge in general. But, feel free to
// use this bridge for integration testing of this code. // use this bridge for integration testing of this code.
func DefaultTestingOBFS4Bridge() *OBFS4Dialer { func DefaultTestingOBFS4Bridge() *OBFS4Dialer {
// TODO(bassosimone): this is a public working bridge we have found // See https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/blob/master/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
// with @hellais. We should ask @cohosh whether there's some obfs4 bridge // for publicly available bridges used by Tor Browser.
// dedicated to integration testing that we should use instead.
return &OBFS4Dialer{ return &OBFS4Dialer{
Address: "192.95.36.142:443", Address: "209.148.46.65:443",
Cert: "qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ", Cert: "ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw",
DataDir: "testdata", DataDir: "testdata",
Fingerprint: "CDF2E852BF539B82BD10E27E9115A31734E378C2", Fingerprint: "74FAD13168806246602538555B5521A0383A1875",
IATMode: "1", IATMode: "0",
} }
} }

2
internal/ptx/obfs4_test.go
View File

@ -26,7 +26,7 @@ func TestOBFS4DialerWorks(t *testing.T) {
t.Fatal("unexpected value returned by Name") t.Fatal("unexpected value returned by Name")
} }
bridgearg := o4d.AsBridgeArgument() bridgearg := o4d.AsBridgeArgument()
expectedbridge := "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1" expectedbridge := "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"
if bridgearg != expectedbridge { if bridgearg != expectedbridge {
t.Fatal("unexpected AsBridgeArgument value", bridgearg) t.Fatal("unexpected AsBridgeArgument value", bridgearg)
} }