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

feat: add fallback domain names for openvpn experiment #1654

Merged
merged 11 commits into from
Nov 21, 2024
Merged

feat: add fallback domain names for openvpn experiment #1654

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6790cdc
feat: add fallback domain names
ainghazal Oct 8, 2024
1bdabbb
adapt to latest dns resolution strategy
ainghazal Oct 16, 2024
8ca92e1
remove bogons
ainghazal Oct 16, 2024
dd895e9
remove unused test
ainghazal Oct 17, 2024
86202ed
sample a max of n targets
ainghazal Oct 17, 2024
ec9a637
add test for resolution
ainghazal Oct 17, 2024
1b70367
x
ainghazal Oct 17, 2024
bcab63d
x
ainghazal Oct 17, 2024
78ac661
add docs, simplify function, some marginal perf gain
ainghazal Oct 22, 2024
9695165
Merge branch 'master' into feat/add-alternative-endpoints
ainghazal Oct 24, 2024
ffbd670
update go.sum to use ooni/minivpn v0.0.7
DecFox Nov 21, 2024
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
Prev Previous commit
Next Next commit
x
  • Loading branch information
@ainghazal
ainghazal committed Oct 17, 2024
commit 1b703679cbbdcf567aadcd66b3e21f59dbf66dfc
26 changes: 16 additions & 10 deletions internal/experiment/openvpn/targets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ import (

// defaultOONIEndpoints is the array of hostnames that will return valid
// endpoints to be probed. Do note that this is a workaround for the lack
// of a backend service.
// of a backend service; if you maintain this experiment in the future please
// feel free to remove this workaround after the probe-services for distributing
// endpoints has been deployed to production.
var defaultOONIEndpoints = []string{
"a.composer-presenter.com",
"a.goodyear2dumpster.com",
Expand Down Expand Up @@ -96,35 +98,38 @@ func resolveOONIAddresses(logger model.Logger) ([]string, error) {
return valid, nil
}

// pickOONIOpenVPNTargets returns an array of input URIs from the list of available endpoints, up to max,
// for the given transport. By default, we use the first endpoint that resolves to an IP. If reverseOrder
// is specified, we reverse the list before attempting resolution.
// pickOONIOpenVPNTargets crafts targets from the passed array of IP addresses.
func pickOONIOpenVPNTargets(ipaddrList []string) ([]string, error) {

// Step 1. Create endpoint list.

endpoints := []endpoint{}
for _, ipAddr := range ipaddrList {
// 1. Probe the canonical 1194/udp and 1194/tcp ports
for _, ipaddr := range ipaddrList {

// Probe the canonical 1194/udp and 1194/tcp ports

endpoints = append(endpoints, endpoint{
Obfuscation: "none",
Port: "1194",
Protocol: "openvpn",
Provider: "oonivpn",
IPAddr: ipAddr,
IPAddr: ipaddr,
Transport: "tcp",
})
endpoints = append(endpoints, endpoint{
Obfuscation: "none",
Port: "1194",
Protocol: "openvpn",
Provider: "oonivpn",
IPAddr: ipAddr,
IPAddr: ipaddr,
Transport: "udp",
})

}

// Pick one IP and sample on non-standard ports
// to confirm if this one goes through.
// Pick one IP from the list and sample on non-standard ports
// to check if the standard port was filtered.

extra := ipaddrList[rand.Intn(len(ipaddrList))]
endpoints = append(endpoints, endpoint{
Obfuscation: "none",
Expand All @@ -144,6 +149,7 @@ func pickOONIOpenVPNTargets(ipaddrList []string) ([]string, error) {
})

// Step 2. Create targets for the selected endpoints.

targets := make([]string, 0)
for _, e := range endpoints {
targets = append(targets, e.AsInputURI())
Expand Down
Loading