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

Remove local LAN address ICE candidates in proxy-go answer

Browse source 
Trac: 19026
This commit is contained in:
Arlo Breault 2020-03-26 14:04:29 -04:00
parent 670e4ba438
commit 1867f89562
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
proxy-go/snowflake.go
View file

@ -70,8 +70,9 @@ func remoteIPFromSDP(sdp string) net.IP {
} }
type Broker struct { type Broker struct {
url *url.URL url *url.URL
transport http.RoundTripper transport http.RoundTripper
keepLocalAddresses bool
} }
type webRTCConn struct { type webRTCConn struct {
@ -209,7 +210,14 @@ func (b *Broker) pollOffer(sid string) *webrtc.SessionDescription {
func (b *Broker) sendAnswer(sid string, pc *webrtc.PeerConnection) error { func (b *Broker) sendAnswer(sid string, pc *webrtc.PeerConnection) error {
brokerPath := b.url.ResolveReference(&url.URL{Path: "answer"}) brokerPath := b.url.ResolveReference(&url.URL{Path: "answer"})
answer := string([]byte(util.SerializeSessionDescription(pc.LocalDescription()))) ld := pc.LocalDescription()
if !b.keepLocalAddresses {
ld = &webrtc.SessionDescription{
Type: ld.Type,
SDP: util.StripLocalAddresses(ld.SDP),
}
}
answer := string([]byte(util.SerializeSessionDescription(ld)))
body, err := messages.EncodeAnswerRequest(answer, sid) body, err := messages.EncodeAnswerRequest(answer, sid)
if err != nil { if err != nil {
return err return err
@ -409,6 +417,7 @@ func main() {
var logFilename string var logFilename string
var rawBrokerURL string var rawBrokerURL string
var unsafeLogging bool var unsafeLogging bool
var keepLocalAddresses bool
flag.UintVar(&capacity, "capacity", 10, "maximum concurrent clients") flag.UintVar(&capacity, "capacity", 10, "maximum concurrent clients")
flag.StringVar(&rawBrokerURL, "broker", defaultBrokerURL, "broker URL") flag.StringVar(&rawBrokerURL, "broker", defaultBrokerURL, "broker URL")
@ -416,6 +425,7 @@ func main() {
flag.StringVar(&stunURL, "stun", defaultSTUNURL, "stun URL") flag.StringVar(&stunURL, "stun", defaultSTUNURL, "stun URL")
flag.StringVar(&logFilename, "log", "", "log filename") flag.StringVar(&logFilename, "log", "", "log filename")
flag.BoolVar(&unsafeLogging, "unsafe-logging", false, "prevent logs from being scrubbed") flag.BoolVar(&unsafeLogging, "unsafe-logging", false, "prevent logs from being scrubbed")
flag.BoolVar(&keepLocalAddresses, "keep-local-addresses", false, "keep local LAN address ICE candidates")
flag.Parse() flag.Parse()
var logOutput io.Writer = os.Stderr var logOutput io.Writer = os.Stderr
@ -439,6 +449,7 @@ func main() {
var err error var err error
broker = new(Broker) broker = new(Broker)
broker.keepLocalAddresses = keepLocalAddresses
broker.url, err = url.Parse(rawBrokerURL) broker.url, err = url.Parse(rawBrokerURL)
if err != nil { if err != nil {
log.Fatalf("invalid broker url: %s", err) log.Fatalf("invalid broker url: %s", err)