archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-13 20:11:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Filter out non stun: server addresses in ParseIceServers

Browse source
This commit is contained in:
itchyonion 2023-01-04 15:25:52 -08:00
parent 66269c07d8
commit 990fcb4127
No known key found for this signature in database
GPG key ID: 4B87B720348500EA
2 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
client/lib/lib_test.go
View file

@ -190,22 +190,13 @@ func TestICEServerParser(t *testing.T) {
length int
}{
{
[]string{"stun:stun.l.google.com:19302"},
[][]string{[]string{"stun:stun.l.google.com:19302"}},
1,
},
{
[]string{"stun:stun.l.google.com", "stuns:stun.ekiga.net"},
[][]string{[]string{"stun:stun.l.google.com:3478"}, []string{"stuns:stun.ekiga.net:5349"}},
[]string{"stun:stun.l.google.com:19302", "stun:stun.ekiga.net"},
[][]string{[]string{"stun:stun.l.google.com:19302"}, []string{"stun:stun.ekiga.net:3478"}},
2,
},
{
[]string{"stuns:stun.l.google.com:19302", "turn:relay.metered.ca:80"},
[][]string{[]string{"stuns:stun.l.google.com:19302"}, []string{"turn:relay.metered.ca:80?transport=udp"}},
2,
},
{
[]string{"stun:stun1.l.google.com:19302", "stun.ekiga.net", "stun:stun.example.com:1234/path?query", "https://example.com"},
[]string{"stun:stun1.l.google.com:19302", "stun.ekiga.net", "stun:stun.example.com:1234/path?query",
"https://example.com", "turn:relay.metered.ca:80?transport=udp"},
[][]string{[]string{"stun:stun1.l.google.com:19302"}},
1,
},

21
client/lib/snowflake.go
View file

@ -31,6 +31,7 @@ import (
"log"
"math/rand"
"net"
"net/url"
"strings"
"time"
@ -268,13 +269,25 @@ func parseIceServers(addresses []string) []webrtc.ICEServer {
if len(addresses) == 0 {
return nil
}
for _, url := range addresses {
url = strings.TrimSpace(url)
for _, address := range addresses {
address = strings.TrimSpace(address)
// ice.ParseURL recognizes many types of ICE servers,
// but we only support stun over UDP currently
u, err := url.Parse(address)
if err != nil {
log.Printf("Warning: Parsing ICE server %v resulted in error: %v, skipping", address, err)
continue
}
if u.Scheme != "stun" {
log.Printf("Warning: Only stun: (STUN over UDP) servers are supported currently, skipping %v", address)
continue
}
// add default port, other sanity checks
parsedURL, err := ice.ParseURL(url)
parsedURL, err := ice.ParseURL(address)
if err != nil {
log.Printf("Warning: Parsing ICE server %v resulted in error: %v, skipping", url, err)
log.Printf("Warning: Parsing ICE server %v resulted in error: %v, skipping", address, err)
continue
}