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.

Sign up for GitHub

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

Update signal test endpoints fixes probe/2627 #1389

Merged
merged 5 commits into from
Nov 21, 2023
Merged

Update signal test endpoints fixes probe/2627 #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d686b1
Update signal endpoints based on: https://github.com/ooni/probe/issue…
hellais Nov 13, 2023
1ee77e2
Drop endpoint that does not speak TLS
hellais Nov 13, 2023
c7e7cb7
Bump test version
hellais Nov 13, 2023
64f0cdf
fix: bump version number also in tests
bassosimone Nov 21, 2023
6090166
fix: remove redundant return statement
bassosimone Nov 21, 2023
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
50 changes: 44 additions & 6 deletions internal/experiment/signal/signal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

const (
testName = "signal"
testVersion = "0.2.3"
testVersion = "0.2.4"

signalCA = `-----BEGIN CERTIFICATE-----
MIID7zCCAtegAwIBAgIJAIm6LatK5PNiMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
Expand Down Expand Up @@ -117,7 +117,6 @@ func (tk *TestKeys) Update(v urlgetter.MultiOutput) {
tk.SignalBackendFailure = v.TestKeys.Failure
return
}
return
}

// Measurer performs the measurement
Expand Down Expand Up @@ -164,33 +163,72 @@ func (m Measurer) Run(ctx context.Context, args *model.ExperimentArgs) error {
}

inputs := []urlgetter.MultiInput{

// Here we need to provide the method explicitly. See
// https://github.com/ooni/probe-engine/issues/827.
{Target: "https://textsecure-service.whispersystems.org/", Config: urlgetter.Config{
{Target: "https://api.backup.signal.org/", Config: urlgetter.Config{
Method: "GET",
FailOnHTTPError: false,
CertPool: certPool,
}},
{Target: "https://storage.signal.org/", Config: urlgetter.Config{
{Target: "https://cdn.signal.org/", Config: urlgetter.Config{
Method: "GET",
FailOnHTTPError: false,
CertPool: certPool,
}},
{Target: "https://cdn.signal.org/", Config: urlgetter.Config{
{Target: "https://cdn2.signal.org/", Config: urlgetter.Config{
Method: "GET",
FailOnHTTPError: false,
CertPool: certPool,
}},
{Target: "https://cdn2.signal.org/", Config: urlgetter.Config{
{Target: "https://cdsi.signal.org/", Config: urlgetter.Config{
Method: "GET",
FailOnHTTPError: false,
CertPool: certPool,
}},
{Target: "https://chat.signal.org/", Config: urlgetter.Config{
Method: "GET",
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,
CertPool: certPool,
}},
{Target: "https://storage.signal.org/", Config: urlgetter.Config{
Method: "GET",
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}
Expand Down
2 changes: 1 addition & 1 deletion internal/experiment/signal/signal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestNewExperimentMeasurer(t *testing.T) {
if measurer.ExperimentName() != "signal" {
t.Fatal("unexpected name")
}
if measurer.ExperimentVersion() != "0.2.3" {
if measurer.ExperimentVersion() != "0.2.4" {
t.Fatal("unexpected version")
}
}
Expand Down