Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5713e6e181 |
No files matched your search
@@ -435,13 +435,10 @@ The lists:
|
|||||||
[Private Internet Access](https://serverlist.piaservers.net/vpninfo/servers/v6),
|
[Private Internet Access](https://serverlist.piaservers.net/vpninfo/servers/v6),
|
||||||
downloaded once a day.
|
downloaded once a day.
|
||||||
- `protonvpn`: the /24 networks that hold ProtonVPN servers. The whole /24 is
|
- `protonvpn`: the /24 networks that hold ProtonVPN servers. The whole /24 is
|
||||||
listed because the ProtonVPN-IPs README says traffic leaves from unpublished
|
listed because ProtonVPN traffic can leave from an address Proton does not
|
||||||
addresses in it. From the public
|
publish. From the public
|
||||||
[ProtonVPN-IPs](https://github.com/tn3w/ProtonVPN-IPs) mirror of Proton's
|
[ProtonVPN-IPs](https://github.com/tn3w/ProtonVPN-IPs) mirror of Proton's
|
||||||
server list, downloaded once a day.
|
server list, downloaded once a day.
|
||||||
- `protonvpn_entry`: the IPv4 and IPv6 addresses of ProtonVPN servers. From the
|
|
||||||
same [ProtonVPN-IPs](https://github.com/tn3w/ProtonVPN-IPs) mirror, downloaded
|
|
||||||
once a day.
|
|
||||||
- `spamhaus_drop` and `spamhaus_dropv6`: IPv4 and IPv6 networks hijacked or
|
- `spamhaus_drop` and `spamhaus_dropv6`: IPv4 and IPv6 networks hijacked or
|
||||||
leased by spammers or cyber criminals, according to Spamhaus. From
|
leased by spammers or cyber criminals, according to Spamhaus. From
|
||||||
[Spamhaus DROP](https://www.spamhaus.org/blocklists/do-not-route-or-peer/),
|
[Spamhaus DROP](https://www.spamhaus.org/blocklists/do-not-route-or-peer/),
|
||||||
|
|||||||
@@ -52,8 +52,8 @@ const (
|
|||||||
// and openvpn gateways have their addresses in host and v2ray.
|
// and openvpn gateways have their addresses in host and v2ray.
|
||||||
FormatIVPNJSON
|
FormatIVPNJSON
|
||||||
|
|
||||||
// FormatProtonVPN has one address or network per line, with comment lines
|
// FormatProtonVPN has one network per line, with comment lines that start
|
||||||
// that start with #. Unlike FormatLines, a file with no networks fails.
|
// with #. Unlike FormatLines, a file with no networks fails.
|
||||||
FormatProtonVPN
|
FormatProtonVPN
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -76,13 +76,6 @@ const protonVPNBody = "#\n# protonvpn_ip_ranges.txt\n" +
|
|||||||
"# The /24 block of every advertised IPv4.\n#\n" +
|
"# The /24 block of every advertised IPv4.\n#\n" +
|
||||||
"192.0.2.0/24\n198.51.100.0/24\n"
|
"192.0.2.0/24\n198.51.100.0/24\n"
|
||||||
|
|
||||||
// protonVPNEntryBody is a small file in the format of the ProtonVPN-IPs list
|
|
||||||
// of server addresses.
|
|
||||||
const protonVPNEntryBody = "#\n# protonvpn_entry_ips.txt\n" +
|
|
||||||
"# https://github.com/tn3w/ProtonVPN-IPs\n#\n" +
|
|
||||||
"# Entry IPs clients connect to, resolved from ProtonVPN hostnames.\n#\n" +
|
|
||||||
"192.0.2.80\n2001:db8::80\n"
|
|
||||||
|
|
||||||
// errorPage is a file that is no list, as a publisher's error page is.
|
// errorPage is a file that is no list, as a publisher's error page is.
|
||||||
const errorPage = "<!DOCTYPE html>\n<html></html>\n"
|
const errorPage = "<!DOCTYPE html>\n<html></html>\n"
|
||||||
|
|
||||||
@@ -287,13 +280,6 @@ func TestLookupFindsVPNServers(t *testing.T) {
|
|||||||
listed: []string{"192.0.2.0", "192.0.2.255", "198.51.100.7"},
|
listed: []string{"192.0.2.0", "192.0.2.255", "198.51.100.7"},
|
||||||
unlisted: []string{"192.0.3.1", "2001:db8::90"},
|
unlisted: []string{"192.0.3.1", "2001:db8::90"},
|
||||||
},
|
},
|
||||||
{
|
|
||||||
name: "ProtonVPN server addresses",
|
|
||||||
format: FormatProtonVPN,
|
|
||||||
body: protonVPNEntryBody,
|
|
||||||
listed: []string{"192.0.2.80", "2001:db8::80"},
|
|
||||||
unlisted: []string{"192.0.2.81", "2001:db8::81"},
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -576,8 +562,7 @@ func TestPublicListsMarkTheVPNLists(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
want := []string{
|
want := []string{
|
||||||
"ivpn", "mullvad", "nordvpn", "pia", "protonvpn", "protonvpn_entry",
|
"ivpn", "mullvad", "nordvpn", "pia", "protonvpn", "x4bnet", "x4bnet_v6",
|
||||||
"x4bnet", "x4bnet_v6",
|
|
||||||
}
|
}
|
||||||
if !slices.Equal(got, want) {
|
if !slices.Equal(got, want) {
|
||||||
t.Errorf("VPN lists %v, want %v", got, want)
|
t.Errorf("VPN lists %v, want %v", got, want)
|
||||||
|
|||||||
@@ -161,15 +161,6 @@ func vpnLists() []List {
|
|||||||
Format: FormatProtonVPN,
|
Format: FormatProtonVPN,
|
||||||
VPN: true,
|
VPN: true,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
Name: "protonvpn_entry",
|
|
||||||
Description: "A server of the ProtonVPN service",
|
|
||||||
URL: "https://raw.githubusercontent.com/tn3w/ProtonVPN-IPs/master/" +
|
|
||||||
"protonvpn_entry_ips.txt",
|
|
||||||
Interval: vpnListInterval,
|
|
||||||
Format: FormatProtonVPN,
|
|
||||||
VPN: true,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
Name: "x4bnet",
|
Name: "x4bnet",
|
||||||
Description: "In an IPv4 network of a VPN service, according to " +
|
Description: "In an IPv4 network of a VPN service, according to " +
|
||||||
|
|||||||
Reference in new issue
Block a user