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

Refactor (De)SerializeSessionDescription as common utils

Browse source
This commit is contained in:
Arlo Breault 2020-03-17 15:18:25 -04:00
parent c11461d339
commit d10af300c1
6 changed files with 72 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

7
proxy-go/proxy-go_test.go
View file

@ -13,6 +13,7 @@ import (
"testing"
"git.torproject.org/pluggable-transports/snowflake.git/common/messages"
"git.torproject.org/pluggable-transports/snowflake.git/common/util"
"github.com/pion/webrtc/v2"
. "github.com/smartystreets/goconvey/convey"
)
@ -197,7 +198,7 @@ func TestSessionDescriptions(t *testing.T) {
},
},
} {
desc := deserializeSessionDescription(test.msg)
desc := util.DeserializeSessionDescription(test.msg)
So(desc, ShouldResemble, test.ret)
}
})
@ -214,7 +215,7 @@ func TestSessionDescriptions(t *testing.T) {
`{"type":"offer","sdp":"test"}`,
},
} {
msg := serializeSessionDescription(test.desc)
msg := util.SerializeSessionDescription(test.desc)
So(msg, ShouldResemble, test.ret)
}
})
@ -239,7 +240,7 @@ func TestBrokerInteractions(t *testing.T) {
},
}
pc, _ := webrtc.NewPeerConnection(config)
offer := deserializeSessionDescription(sampleOffer)
offer := util.DeserializeSessionDescription(sampleOffer)
pc.SetRemoteDescription(*offer)
answer, _ := pc.CreateAnswer(nil)
pc.SetLocalDescription(answer)

52
proxy-go/snowflake.go
View file

@ -4,7 +4,6 @@ import (
"bytes"
"crypto/rand"
"encoding/base64"
"encoding/json"
"flag"
"fmt"
"io"
@ -21,6 +20,7 @@ import (
"git.torproject.org/pluggable-transports/snowflake.git/common/messages"
"git.torproject.org/pluggable-transports/snowflake.git/common/safelog"
"git.torproject.org/pluggable-transports/snowflake.git/common/util"
"git.torproject.org/pluggable-transports/snowflake.git/common/websocketconn"
"github.com/gorilla/websocket"
"github.com/pion/webrtc/v2"
@ -199,7 +199,7 @@ func (b *Broker) pollOffer(sid string) *webrtc.SessionDescription {
return nil
}
if offer != "" {
return deserializeSessionDescription(offer)
return util.DeserializeSessionDescription(offer)
}
}
}
@ -209,7 +209,7 @@ func (b *Broker) pollOffer(sid string) *webrtc.SessionDescription {
func (b *Broker) sendAnswer(sid string, pc *webrtc.PeerConnection) error {
brokerPath := b.url.ResolveReference(&url.URL{Path: "answer"})
answer := string([]byte(serializeSessionDescription(pc.LocalDescription())))
answer := string([]byte(util.SerializeSessionDescription(pc.LocalDescription())))
body, err := messages.EncodeAnswerRequest(answer, sid)
if err != nil {
return err
@ -465,49 +465,3 @@ func main() {
runSession(sessionID)
}
}
func deserializeSessionDescription(msg string) *webrtc.SessionDescription {
var parsed map[string]interface{}
err := json.Unmarshal([]byte(msg), &parsed)
if nil != err {
log.Println(err)
return nil
}
if _, ok := parsed["type"]; !ok {
log.Println("Cannot deserialize SessionDescription without type field.")
return nil
}
if _, ok := parsed["sdp"]; !ok {
log.Println("Cannot deserialize SessionDescription without sdp field.")
return nil
}
var stype webrtc.SDPType
switch parsed["type"].(string) {
default:
log.Println("Unknown SDP type")
return nil
case "offer":
stype = webrtc.SDPTypeOffer
case "pranswer":
stype = webrtc.SDPTypePranswer
case "answer":
stype = webrtc.SDPTypeAnswer
case "rollback":
stype = webrtc.SDPTypeRollback
}
return &webrtc.SessionDescription{
Type: stype,
SDP: parsed["sdp"].(string),
}
}
func serializeSessionDescription(desc *webrtc.SessionDescription) string {
bytes, err := json.Marshal(*desc)
if nil != err {
log.Println(err)
return ""
}
return string(bytes)
}