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 util.{Serialize,Deserialize}SessionDescription return an error

Browse source 
https://bugs.torproject.org/33897#comment:4
This commit is contained in:
David Fifield 2020-04-27 18:45:10 -06:00
parent 76732155e7
commit b48fb781ee
3 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/lib/lib_test.go
View file

@ -231,7 +231,8 @@ func TestSnowflakeClient(t *testing.T) {
So(err, ShouldBeNil)
c.offerChannel <- nil
answer := util.DeserializeSessionDescription(sampleAnswer)
answer, err := util.DeserializeSessionDescription(sampleAnswer)
So(err, ShouldBeNil)
So(answer, ShouldNotBeNil)
c.answerChannel <- answer
err = c.exchangeSDP()
@ -256,7 +257,8 @@ func TestSnowflakeClient(t *testing.T) {
ctx.So(err, ShouldBeNil)
wg.Done()
}()
answer := util.DeserializeSessionDescription(sampleAnswer)
answer, err := util.DeserializeSessionDescription(sampleAnswer)
So(err, ShouldBeNil)
c.answerChannel <- answer
wg.Wait()
})
@ -286,7 +288,10 @@ func TestSnowflakeClient(t *testing.T) {
http.StatusOK,
[]byte(`{"type":"answer","sdp":"fake"}`),
}
fakeOffer := util.DeserializeSessionDescription(`{"type":"offer","sdp":"test"}`)
fakeOffer, err := util.DeserializeSessionDescription(`{"type":"offer","sdp":"test"}`)
if err != nil {
panic(err)
}
Convey("Construct BrokerChannel with no front domain", func() {
b, err := NewBrokerChannel("test.broker", "", transport, false)

9
client/lib/rendezvous.go
View file

@ -96,7 +96,11 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) (
SDP: util.StripLocalAddresses(offer.SDP),
}
}
data := bytes.NewReader([]byte(util.SerializeSessionDescription(offer)))
offerSDP, err := util.SerializeSessionDescription(offer)
if err != nil {
return nil, err
}
data := bytes.NewReader([]byte(offerSDP))
// Suffix with broker's client registration handler.
clientURL := bc.url.ResolveReference(&url.URL{Path: "client"})
request, err := http.NewRequest("POST", clientURL.String(), data)
@ -119,8 +123,7 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) (
if nil != err {
return nil, err
}
answer := util.DeserializeSessionDescription(string(body))
return answer, nil
return util.DeserializeSessionDescription(string(body))
case http.StatusServiceUnavailable:
return nil, errors.New(BrokerError503)
case http.StatusBadRequest: