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

Have broker pass client NAT type to proxy

Browse source 
This will allow browser-based proxies that are unable to determine their
NAT type to conservatively label themselves as restricted NATs if they
fail to work with clients that have restricted NATs.
This commit is contained in:
Cecylia Bocovich 2020-06-22 14:04:29 -04:00
parent 0052c0e10c
commit 046dab865f
7 changed files with 61 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

16
common/messages/proxy_test.go
View file

@ -109,7 +109,7 @@ func TestDecodeProxyPollResponse(t *testing.T) {
}{
{
"fake offer",
`{"Status":"client match","Offer":"fake offer"}`,
`{"Status":"client match","Offer":"fake offer","NAT":"unknown"}`,
nil,
},
{
@ -128,9 +128,9 @@ func TestDecodeProxyPollResponse(t *testing.T) {
fmt.Errorf(""),
},
} {
offer, err := DecodePollResponse([]byte(test.data))
So(offer, ShouldResemble, test.offer)
offer, _, err := DecodePollResponse([]byte(test.data))
So(err, ShouldHaveSameTypeAs, test.err)
So(offer, ShouldResemble, test.offer)
}
})
@ -138,16 +138,18 @@ func TestDecodeProxyPollResponse(t *testing.T) {
func TestEncodeProxyPollResponse(t *testing.T) {
Convey("Context", t, func() {
b, err := EncodePollResponse("fake offer", true)
b, err := EncodePollResponse("fake offer", true, "restricted")
So(err, ShouldEqual, nil)
offer, err := DecodePollResponse(b)
offer, natType, err := DecodePollResponse(b)
So(offer, ShouldEqual, "fake offer")
So(natType, ShouldEqual, "restricted")
So(err, ShouldEqual, nil)
b, err = EncodePollResponse("", false)
b, err = EncodePollResponse("", false, "unknown")
So(err, ShouldEqual, nil)
offer, err = DecodePollResponse(b)
offer, natType, err = DecodePollResponse(b)
So(offer, ShouldEqual, "")
So(natType, ShouldEqual, "unknown")
So(err, ShouldEqual, nil)
})
}